- Add webconfig change to display the fw version properly.

- Update javascript to support swapped vendor IDs.
- Bump version.

Author: Hrvoje Cavrak

CMakeLists.txt

@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.6)
 
-## Version Configuration
-set(VERSION_MAJOR 00)
-set(VERSION_MINOR 170)
+## Version Configuration.
+## Define e.g. 0.72 as major 0 and minor 72
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 73)
 
 ## Release Type Selection
 option(DH_DEBUG "Build a debug version" OFF)
@@ -107,7 +108,9 @@ add_executable(${binary} ${DISK_ASM})
 
 target_sources(${binary} PUBLIC ${COMMON_SOURCES})
 target_compile_definitions(${binary} 
-    PRIVATE 
+    PRIVATE
+    VERSION_MAJOR=${VERSION_MAJOR}
+    VERSION_MINOR=${VERSION_MINOR}
     PIO_USB_USE_TINYUSB=${PIO_USE_TINYUSB}
     PIO_USB_DP_PIN_DEFAULT=${DP_PIN_DEFAULT}
     __disk_file_path__="${DISK_BIN}"
@@ -129,10 +132,13 @@ pico_set_linker_script(${binary} ${CMAKE_SOURCE_DIR}/misc/memory_map.ld)
 ## Build other file formats as well
 pico_add_extra_outputs(${binary})
 
+# For internal firmware use, to simplify comparison: 0.72 -> 172
+math(EXPR FIRMWARE_VERSION "${VERSION_MAJOR} * 1000 + ${VERSION_MINOR} + 100")
+
 ## Post-Build Commands
 add_custom_command(
     TARGET ${binary} POST_BUILD
-    COMMAND python3 ${CMAKE_SOURCE_DIR}/misc/crc32.py ${binary}.bin ${binary}.crc ${VERSION_MAJOR}${VERSION_MINOR}
+    COMMAND python3 ${CMAKE_SOURCE_DIR}/misc/crc32.py ${binary}.bin ${binary}.crc ${FIRMWARE_VERSION}
     COMMAND ${CMAKE_OBJCOPY} --update-section .section_metadata=${binary}.crc ${binary}.elf
     COMMAND ${CMAKE_OBJCOPY} -O binary ${binary}.elf ${binary}.bin
     COMMAND ${CMAKE_BINARY_DIR}/elf2uf2/elf2uf2 ${binary}.elf ${binary}.uf2

disk/disk.img

@@ -1650,13 +1650,13 @@ <h3>Device Status</h3>
 
 
 
-      
+    
 <label class=""> Running FW version</label>
 
-      
+    
 <input class="api" type="text" name="name78" data-type="uint16" data-key="78"
   onchange="valueChangedHandler(this)"
-  />
+ data-fw-ver readonly />
 
 
 
@@ -1780,7 +1780,7 @@ <h3>Device Status</h3>
     return;
 
   var devices = await navigator.hid.requestDevice({
-    filters: [{ vendorId: 0x1209, productId: 0xc000, usagePage: 0xff00, usage: 0x10 }]
+    filters: [{ vendorId: 0x2e8a, productId: 0x107c, usagePage: 0xff00, usage: 0x10 }]
   });
 
   device = devices[0];
@@ -1842,6 +1842,13 @@ <h3>Device Status</h3>
 
     if (element.hasAttribute('data-hex'))
       setValue(element, parseInt(value).toString(16));
+
+    if (element.hasAttribute('data-fw-ver')) {
+      /* u16 version = major * 1000 + minor + 100; */
+      const major = Math.floor((value - 100) / 1000);
+      const minor = (value - 100) % 1000;
+      setValue(element, `v${major}.${minor}`);
+    }
   }
 }
 

webconfig/config-unpacked.htm

@@ -22,7 +22,7 @@ class FormField:
     }
 
 STATUS_ = [
-    FormField(78, "Running FW version", None, {}, "uint16", elem="uint16"),
+    FormField(78, "Running FW version", None, {}, "uint16", elem="fw_version"),
     FormField(79, "Running FW checksum", None, {}, "uint32", elem="hex_info"),
 ]
 

webconfig/config.htm

@@ -16,6 +16,10 @@
     {{ label(item, add=':') }}
     {{ input(item, class='content api') }} data-hex readonly />
 
+  {% elif item.get("elem") == "fw_version" %}
+    {{ label(item, class='') }}
+    {{ input(item) }} data-fw-ver readonly />
+
   {% elif item.get("elem") == "label" %}
     {{ label(item, class='') }}
 

webconfig/form.py

@@ -87,7 +87,7 @@ async function connectHandler() {
     return;
 
   var devices = await navigator.hid.requestDevice({
-    filters: [{ vendorId: 0x1209, productId: 0xc000, usagePage: 0xff00, usage: 0x10 }]
+    filters: [{ vendorId: 0x2e8a, productId: 0x107c, usagePage: 0xff00, usage: 0x10 }]
   });
 
   device = devices[0];
@@ -149,6 +149,13 @@ function updateElement(key, event) {
 
     if (element.hasAttribute('data-hex'))
       setValue(element, parseInt(value).toString(16));
+
+    if (element.hasAttribute('data-fw-ver')) {
+      /* u16 version = major * 1000 + minor + 100; */
+      const major = Math.floor((value - 100) / 1000);
+      const minor = (value - 100) % 1000;
+      setValue(element, `v${major}.${minor}`);
+    }
   }
 }
 
@@ -212,4 +219,4 @@ async function saveHandler() {
 
 async function wipeConfigHandler() {
   await sendReport(packetType.wipeConfigMsg, [], true);
-}
+}