httpd: show canonical serial number on the status screen

esp32/max80/common.h

@@ -78,6 +78,7 @@ extern_c int reboot_delayed(void);
  * Main MAC address from efuses
  */
 extern_c uint8_t efuse_default_mac[6];
+extern_c char serial_number[16];
 
 /*
  * Time sync status

esp32/max80/max80.ino

@@ -23,14 +23,14 @@
 #define PIN_USB_PWR_SINK	8
 
 uint8_t efuse_default_mac[6];
+char serial_number[16];		// Canonical board serial number
 
 void setup_usb_ids()
 {
     uint8_t * const mac = efuse_default_mac;
-    char serial[16];
 
     esp_efuse_mac_get_default(mac);
-    snprintf(serial, sizeof serial, "%02X%02X%02X-%02X%02X%02X",
+    snprintf(serial_number, sizeof serial_number, "%02X%02X%02X-%02X%02X%02X",
 	     mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
     USB.VID(0x4680);
@@ -38,7 +38,7 @@ void setup_usb_ids()
     USB.firmwareVersion(1);	// Do something smarter here
     USB.productName("MAX80 Network Controller");
     USB.manufacturerName("Peter & Per");
-    USB.serialNumber(serial);
+    USB.serialNumber(serial_number);
 }
 
 static void heap_info()
@@ -60,8 +60,6 @@ static void dump_config()
     printf("--- End configuration and status\n");
 }
 
-uint8_t max80_board_version;
-
 static void init_hw()
 {
     // Start out with disabled shared I/O pins
@@ -84,22 +82,6 @@ static void init_hw()
     pinMode(PIN_USB_PWR_SINK, OUTPUT);		// IO8: USB_PWR_SINK
     digitalWrite(PIN_USB_PWR_SINK, 0);		// This is a power sink
 
- #if 0
-    pinMode(PIN_USB_PWR_EN, OUTPUT);
-    digitalWrite(PIN_USB_PWR_EN, 0);
-    delayMicroseconds(100);
-
-    pinMode(PIN_USB_PWR_EN, INPUT_PULLUP);
-    delayMicroseconds(50);
-
-    pinMode(PIN_USB_PWR_EN, INPUT);
-    delayMicroseconds(50);
-
-    max80_board_version = digitalRead(PIN_USB_PWR_EN) ? 1 : 2;
-#else
-    max80_board_version = 2;
-#endif
-
     pinMode(PIN_USB_PWR_EN, OUTPUT);
     digitalWrite(PIN_USB_PWR_EN, 0);
     delayMicroseconds(50);
@@ -123,6 +105,8 @@ void setup() {
     printf("[FW]   MAX80 firmware compiled on %s\n", fwdate);
     printf("[PCB]  MAX80 board version: %s\n", board_info.version_str);
     setenv_cond("status.max80.hw.ver", board_info.version_str);
+    printf("[PCB]  MAX80 serial number: %s\n", serial_number);
+    setenv_cond("status.max80.hw.serial", serial_number);
     Serial.println("MAX80 start");
 
     init_config();

esp32/www/lang/sv

@@ -29,7 +29,8 @@ button .hide=Göm
 .onerr .console=Se serieport för mer detaljerad status
 .wifi-sta legend=Wifi-klient (normal)
 .wifi-ap legend=Wifi-accesspunkt (backup)
-.hw .ver b, .hw legend=Hårdvaruversion
+.hw .serial b=Serienummer
+.hw .ver b, .hw legend.ver=Hårdvaruversion
 .hw .unlock b=Tillåt programmering
 .hw button=Programmera flash
 .hw .warnrev=Var försiktig: att programmera fel version kan hindra kortet från att starta, i vilket fall det måste programmeras om via USB eller serieport.

esp32/www/status.html

@@ -16,6 +16,10 @@
 	  <b>Hardware version</b>
 	  <input type="text" name="max80.hw.ver" />
 	</label>
+	<label class="serial">
+	  <b>Serial Number</b>
+	  <input type="text" name="max80.hw.serial" />
+	</label>
 	<label class="fpgaok">
 	  <b>FPGA online</b>
 	  <input type="checkbox" name="max80.fpga" />

esp32/www/update.html

@@ -11,7 +11,7 @@
     <form class="hw" id="boardid" action="sys/setboardrev" method="post"
 	  onsubmit="uploadform()" data-ref="1" data-ref-url="update.html">
       <fieldset>
-	<legend>Hardware Version</legend>
+	<legend class="ver">Hardware Version</legend>
 	<label class="unlock">
 	  <b>Unlock Programming</b>
 	  <input type="checkbox" name="unlock" id="unlock" onchange="bropen()">