Browse Source

Update root webpage

Per Mårtensson 7 months ago
parent
commit
42a4ff21ce

+ 18 - 18
sw/key800/include/abc800_config.h

@@ -3,30 +3,30 @@
 
 #include <Arduino.h>
 
-#define TRUE 1
-#define FALSE 0
+#define TRUE 								1
+#define FALSE 								0
 // Software config
-#define KEY800_FWVERSION    1
-#define KEY800_HWVERSION 	101
+#define KEY800_FWVERSION    				1
+#define KEY800_HWVERSION 					101
 
 // Serial port settings
-#define KEY800_SERIAL_BAUD_RATE 115200
-#define KEY800_SERIALKETBOARD_BAUD_RATE 625
+#define KEY800_SERIAL_BAUD_RATE 			115200
+#define KEY800_SERIALKEYBOARD_BAUD_RATE 	625
 
 //Logging
 #define KEY800_LOGGING_ENABLE_SERIAL
 #ifndef KEY800_LOGGING_SERIAL_PORT
-#define KEY800_LOGGING_SERIAL_PORT 		Serial
+#define KEY800_LOGGING_SERIAL_PORT 			Serial
 #endif
-#define KEY800_LOGGING_VERBOSE_LEVEL 	5
+#define KEY800_LOGGING_VERBOSE_LEVEL 		5
 
 //WIFI
 #ifndef ABC800_WIFI_RETRY_TIMEOUT
-#define ABC800_WIFI_RETRY_TIMEOUT 		00
+#define ABC800_WIFI_RETRY_TIMEOUT 			00
 #endif
 
 #ifndef ABC800_WIFI_TIMEOUT_MS 
-#define ABC800_WIFI_TIMEOUT_MS			10000 
+#define ABC800_WIFI_TIMEOUT_MS				10000 
 #endif 
 
 #ifndef ABC800_WIFI_RECOVER_TIME_MS 
@@ -36,16 +36,16 @@
 #define ABC800_REPLACE_CHAR 				0x00
 #define ABC800_REPLACE_FUNCTION 			0x01
 
-#define ABC800_KEY_OUT_BUFFER_SIZE		2048
-#define ABC800_KEY_IN_BUFFER_SIZE		256
-#define ABC800_KEY_REPEAT_TIME			100
-#define ABC800_KEY_CHECK_TIME			50
+#define ABC800_KEY_OUT_BUFFER_SIZE			2048
+#define ABC800_KEY_IN_BUFFER_SIZE			256
+#define ABC800_KEY_REPEAT_TIME				100
+#define ABC800_KEY_CHECK_TIME				50
 #define ABC800_KEY_REPEAT_TIME_DELAY		500
 
 #define ABC800_KEY_WIFI_SSID				"ABC800-KEY800"
-#define ABC800_KEY_WIFI_PSK				"key800!!!"
+#define ABC800_KEY_WIFI_PSK					"key800!!!"
 #define ABC800_KEY_WIFI_HOSTNAME			"ABC800-KEY800"
-#define ABC800_KEY_SPIFFS_CONFIG_PART  	"data"
+#define ABC800_KEY_SPIFFS_CONFIG_PART  		"data"
 
 #define ABC800_KEY_IN_ABC800				0x00
 #define ABC800_KEY_RESET					0x01
@@ -53,8 +53,8 @@
 #define ABC800_KEY_DELAY_LEGACY				50
 #define ABC800_KEY_DELAY					4		
 
-#define ABC800_KEY_SPIFFS_PATH			"/"
-#define ABC800_KEY_SPIFFS_PARTITION		"data"
+#define ABC800_KEY_SPIFFS_PATH				"/"
+#define ABC800_KEY_SPIFFS_PARTITION			"data"
 
 struct key800config
 {

+ 62 - 0
sw/key800/include/abc800_webcontent.h

@@ -1,6 +1,68 @@
 #ifndef __ABC800_WEBCONTENT_H
 #define __ABC800_WEBCONTENT_H
 #include <ArduinoOTA.h>
+const char rootweb[] PROGMEM = R"rawliteral(
+<!DOCTYPE HTML><html>
+<head>
+  <title>ABC800 keyboard controller</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" href="data:,">
+  <style>
+  html {
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: center;
+  }
+  h1 {
+    font-size: 1.8rem;
+    color: white;
+  }
+  h2{
+    font-size: 1.5rem;
+    font-weight: bold;
+    color: #143642;
+  }
+  .topnav {
+    overflow: hidden;
+    background-color: #143642;
+  }
+  body {
+    margin: 0;
+  }
+  .content {
+    padding: 30px;
+    max-width: 600px;
+    margin: 0 auto;
+  }
+  .card {
+    background-color: #F8F7F9;;
+    box-shadow: 2px 2px 12px 1px rgba(140,140,140,.5);
+    padding-top:10px;
+    padding-bottom:20px;
+  }
+  .state {
+     font-size: 1.5rem;
+     color:#8c8c8c;
+     font-weight: bold;
+   }
+  </style>
+<title>ABC800 Keyboard</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="icon" href="data:,">
+</head>
+<body>
+  <div class="topnav">
+    <h1>ABC800 KEY800</h1>
+  </div>
+  <div class="content">
+    <div class="card">
+      <h2>KEY800</h2>
+      <p><a href="/webserial">Keyboard</a></p>
+      <p><a href="/rgbtohdmi">RGBtoHDMI</a></p>
+      <p><a href="update">OTA</a></p>
+    </div>
+  </div>
+</body>
+</html>)rawliteral";
 const char rgbtohdmi[] PROGMEM = R"rawliteral(
 <!DOCTYPE HTML><html>
 <head>

+ 5 - 2
sw/key800/src/abc800_web.cpp

@@ -177,9 +177,12 @@ namespace abc800
 
         // Route for root / web pageweb
         server.on("/rgbtohdmi", HTTP_GET, [](AsyncWebServerRequest *request){
-            request->send_P(200, "text/html", rgbtohdmi);//, processor);
+            request->send_P(200, "text/html", rgbtohdmi);
+        });
+        // Route for root / web pageweb
+        server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
+            request->send_P(200, "text/html", rootweb);
         });
-
         // Start ElegantOTA
         
         // Start server

+ 2 - 8
sw/key800/src/main.cpp

@@ -21,8 +21,6 @@
 #define DEVICE_ADDRESS 2
 static const char TAG[] = __FILE__;
 
-//USBHostKeyboard port(2);
-//KeyboardReportParser keyparse;
 abc800::wifi abc800_wifi;
 abc800::std_abc800 abc800_std;
 abc800::callback abc800_callback;
@@ -56,13 +54,12 @@ String macaddr;
 QueueHandle_t abc800_key_queue_out = NULL;
 QueueHandle_t abc800_key_queue_in = NULL;
 
-
 portMUX_TYPE sync_isr = portMUX_INITIALIZER_UNLOCKED;
 void setup()
 {
   Serial.begin(KEY800_SERIAL_BAUD_RATE);
-  Serial1.begin(KEY800_SERIALKETBOARD_BAUD_RATE,SERIAL_8N2,A800_RXD,A800_TXD);
-  abc800_serial_keyboard.begin(KEY800_SERIALKETBOARD_BAUD_RATE,SWSERIAL_8N2,K800_RXD,K800_TXD,false);
+  Serial1.begin(KEY800_SERIALKEYBOARD_BAUD_RATE,SERIAL_8N2,A800_RXD,A800_TXD);
+  abc800_serial_keyboard.begin(KEY800_SERIALKEYBOARD_BAUD_RATE,SWSERIAL_8N2,K800_RXD,K800_TXD,false);
   abc800_littlefs.setup();
   abc800_littlefs.loadconfig();
   abc800_gpio.init();
@@ -76,9 +73,6 @@ void setup()
   digitalWrite(KEY800_LED,HIGH);
   abc800_keyboard.init();
   abc800_wifi.setup();
-  //digitalWrite(A800_RST,HIGH);
-
-
 }
 
 void loop()