fix: Fixes from testing (#2)

* Update index.htm * Update server.ino * Fix font * Add favicon * Update favicon * Fix centering
MatiasG19 · Jul 1, 2023 · 60d0ab5 · 60d0ab5
1 parent 81380a5
commit 60d0ab5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/server/server.ino b/server/server.ino
@@ -16,7 +16,13 @@ bool powerOn, standBy, reset, kill;
 bool powerLed;
 
 void setup() {
+  // PINs and serial
+  pinMode(IN_PIN_POWER_LED, INPUT_PULLUP);
+  pinMode(OUT_PIN_POWER, OUTPUT);
+  pinMode(OUT_PIN_RESET, OUTPUT);
   Serial.begin(9600);
+
+  // Server
   Ethernet.begin(mac, ip);
   server.begin();
   Serial.print("Server started at ");
@@ -37,11 +43,6 @@ void setup() {
     return;
   }
   Serial.println("SUCCESS - Found file.");
-
-  // PINs
-  pinMode(IN_PIN_POWER_LED, INPUT_PULLUP);
-  pinMode(OUT_PIN_POWER, OUTPUT);
-  pinMode(OUT_PIN_RESET, OUTPUT);
 }
 
 void loop() {
@@ -104,7 +105,8 @@ void loop() {
     controlOutput(OUT_PIN_RESET, 500);
     reset = false;
   } else if(kill) {
-    controlOutput(OUT_PIN_POWER, 4500);
+    Serial.println("kill");
+    controlOutput(OUT_PIN_POWER, 5000);
     kill = false;
   }
 }
@@ -113,34 +115,37 @@ void sendResponse(String req, EthernetClient client) {
   client.println("HTTP/1.1 200 OK");
   if(req == "") req = "index.htm";
 
+  // Send file to client
   if(req.endsWith(".htm")) {
     client.println("Content-Type: text/html\n\r\n\r");
+    File webFile = SD.open(req);
+    if (webFile) {
+      while (webFile.available()) {
+        client.write(webFile.read());  
+      }
+      webFile.close();
+    } 
   }
-  else 
-    client.println("\n\r\n\r");
-
-  // Send file to client
-  File webFile = SD.open(req);
-  if (webFile) {
-    while (webFile.available()) {
-      client.write(webFile.read());  
-    }
-    webFile.close();
-  } 
   // Other actions
   else {
+    Serial.println("Other");
+    client.println("\n\r\n\r");
     if(req == "powerStatus") {
       if(powerLed) client.write("powerStatus:on");
       else client.write("powerStatus:off");
     }
-    else if(req == "powerOn") 
+    else if(req == "powerOn") {
       if (!powerLed) powerOn = true;
-    else if(req == "standBy") 
+    }
+    else if(req == "standBy") {
       if (powerLed) standBy = true;
-    else if(req == "reset") 
+    }
+    else if(req == "reset") {
       if (powerLed) reset = true;
-    else if(req == "kill") 
+    }
+    else if(req == "kill") {
       if (powerLed) kill = true;
+    }
     else 
       client.println("HTTP/1.1 404 Not Found\n\r"); 
   }

diff --git a/web/favicon.kra b/web/favicon.kra
diff --git a/web/src/favicon.png b/web/src/favicon.png
diff --git a/web/src/index.htm b/web/src/index.htm
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>STORINATOR Switch</title>
-    <!-- TODO icon -->
-    <link rel="icon" type="image/png" href="power.png" />
-    <link rel="stylesheet" href="style.css" />
+    <title>PC Switch</title>
+    <link rel="icon" type="image/png" href="favicon.png" />
   </head>
   <body>
-    <div class="heading">STORINATOR</div>
+    <div class="heading">PC SWITCH</div>
 
     <button id="powerStatus" type="button" class="statusButton" disabled>
       NO CONNECTION
@@ -52,7 +50,7 @@
     <style>
       html {
         height: 95%;
-        font-family: 'Lucida Console', 'Arial', monospace;
+        font-family: 'Tahoma', 'Arial', monospace;
       }
 
       body {
@@ -68,10 +66,8 @@
 
       button {
         position: relative;
-        display: inline-block;
         width: calc(100% - 2vw);
         min-width: 50px;
-        max-width: 200vh;
         height: 15%;
         min-height: 50px;
         border: none;
@@ -80,6 +76,7 @@
         font-size: 5vh;
         color: #cfcfcf;
         background-color: #313131;
+        font-family: 'Tahoma', 'Arial', monospace;
       }
 
       .statusButton {
@@ -156,11 +153,11 @@
         var xhttp = new XMLHttpRequest()
         xhttp.onreadystatechange = function () {
           if (this.readyState == 4 && this.status == 200) {
-            console.debug(`sendCommand:${request}:${this.responseText}`)
+            console.debug(`sendCommand:${type}:${this.responseText}`)
             alert('Action confirmed.')
           }
         }
-        xhttp.open('GET', request, true)
+        xhttp.open('GET', type, true)
         xhttp.send()
       }