Various bugfixes and improvements

  - Firmware version and checksum were incorrectly parsed.
    Welp, this is embarassing - struct defined u32, but struct.pack in
    Python helper packed it as 16-bit.
           ->> Might require manual fw upgrade <<-
  - Fixed threshold issue setting for jumping between outputs (#192)
  - Fixed hotkey configuration clowntown (#197)

Author: Hrvoje Cavrak

disk/disk.img

@@ -11,10 +11,9 @@
 
 with open(elf_filename, 'r+b') as f:
     data = f.read()
-    
+
     data = data[:-FLASH_SECTOR_SIZE]
     crc32_value = binascii.crc32(data) & 0xFFFFFFFF
 
 with open(output_filename, 'wb') as f:
-    f.write(struct.pack('<HHI', MAGIC_VALUE, int(version), crc32_value))
-    
+    f.write(struct.pack('<IHI', MAGIC_VALUE, int(version), crc32_value))

misc/crc32.py

@@ -58,7 +58,7 @@ const config_t default_config = {
     .force_kbd_boot_protocol = ENFORCE_KEYBOARD_BOOT_PROTOCOL,
     .force_mouse_boot_mode = false,
     .enable_acceleration = ENABLE_ACCELERATION,
-    .hotkey_toggle = HID_KEY_F24,
+    .hotkey_toggle = HOTKEY_TOGGLE,
     .kbd_led_as_indicator = KBD_LED_AS_INDICATOR,
-    .jump_threshold = 0,
+    .jump_threshold = JUMP_THRESHOLD,
 };

src/defaults.c

@@ -33,20 +33,22 @@
  *
  * defined as HID_KEY_<something>
  *
- * In addition, keyboard.c defines right ctrl as a modifier key required to
- * activate this. So, the current shortcut is RIGHT CTRL + whatever is defined
- * here.
+ * In addition, there is an optional modifier you can use for the hotkey
+ * switching. Currently, it's set to LEFT CTRL, you can change it by
+ * redefining HOTKEY_MODIFIER here from KEYBOARD_MODIFIER_LEFTCTRL to something
+ * else (check file referenced below) or HID_KEY_NONE.
  *
  * If you do not want to use a key for switching outputs, you may be tempted
- * to select HID_KEY_NONE here; don't do that! That code appears in many HID
- * messages and the result will be a non-functional keyboard. Instead, choose
+ * to select HID_KEY_NONE here as well; don't do that! That code appears in many
+ * HID messages and the result will be a non-functional keyboard. Instead, choose
  * a key that is unlikely to ever appear on a keyboard that you will use.
  * HID_KEY_F24 is probably a good choice as keyboards with 24 function keys
  * are rare.
  *
  * */
 
-#define HOTKEY_TOGGLE HID_KEY_CAPS_LOCK
+#define HOTKEY_MODIFIER  KEYBOARD_MODIFIER_LEFTCTRL
+#define HOTKEY_TOGGLE    HID_KEY_CAPS_LOCK
 
 /**================================================== *
  * ==============  Mouse Speed Factor  ============== *

src/include/user_config.h

@@ -17,7 +17,7 @@
 
 hotkey_combo_t hotkeys[] = {
     /* Main keyboard switching hotkey */
-    {.modifier       = KEYBOARD_MODIFIER_LEFTCTRL,
+    {.modifier       = HOTKEY_MODIFIER,
      .keys           = {HOTKEY_TOGGLE},
      .key_count      = 1,
      .pass_to_os     = false,

src/keyboard.c

@@ -798,7 +798,7 @@ <h3>Output A</h3>
 <input class="range api" type="range" name="aRange12" data-type="int32" data-key="12"
   onchange="valueChangedHandler(this)"
 
-        min="" max="" oninput="this.form.aInput12.value=this.value" />
+        min="1" max="100" oninput="this.form.aInput12.value=this.value" />
     </form>
 
   </div>
@@ -832,7 +832,7 @@ <h3>Output A</h3>
 <input class="range api" type="range" name="aRange13" data-type="int32" data-key="13"
   onchange="valueChangedHandler(this)"
 
-        min="" max="" oninput="this.form.aInput13.value=this.value" />
+        min="1" max="100" oninput="this.form.aInput13.value=this.value" />
     </form>
 
   </div>
@@ -1146,7 +1146,7 @@ <h3>Output B</h3>
 <input class="range api" type="range" name="aRange42" data-type="int32" data-key="42"
   onchange="valueChangedHandler(this)"
 
-        min="" max="" oninput="this.form.aInput42.value=this.value" />
+        min="1" max="100" oninput="this.form.aInput42.value=this.value" />
     </form>
 
   </div>
@@ -1180,7 +1180,7 @@ <h3>Output B</h3>
 <input class="range api" type="range" name="aRange43" data-type="int32" data-key="43"
   onchange="valueChangedHandler(this)"
 
-        min="" max="" oninput="this.form.aInput43.value=this.value" />
+        min="1" max="100" oninput="this.form.aInput43.value=this.value" />
     </form>
 
   </div>
@@ -1522,7 +1522,7 @@ <h3>Common Config</h3>
   <div class="clearfix">
     <form>
 
-<label class="label-inline"> Jump Treshold=</label>
+<label class="label-inline"> Jump Threshold=</label>
 
 
 
@@ -1535,7 +1535,7 @@ <h3>Common Config</h3>
 <input class="range api" type="range" name="aRange77" data-type="uint16" data-key="77"
   onchange="valueChangedHandler(this)"
 
-        min="" max="" oninput="this.form.aInput77.value=this.value" />
+        min="0" max="3000" oninput="this.form.aInput77.value=this.value" />
     </form>
 
   </div>
@@ -1650,13 +1650,13 @@ <h3>Device Status</h3>
 
 
 
-    
-<label class="label-inline"> Running FW version:</label>
+      
+<label class=""> Running FW version</label>
 
-    
-<input class="content api" type="text" name="name78" data-type="uint16" data-key="78"
+      
+<input class="api" type="text" name="name78" data-type="uint16" data-key="78"
   onchange="valueChangedHandler(this)"
- data-hex readonly />
+  />
 
 
 

webconfig/config-unpacked.htm

@@ -22,15 +22,15 @@ class FormField:
     }
 
 STATUS_ = [
-    FormField(78, "Running FW version", None, {}, "uint16", elem="hex_info"),
+    FormField(78, "Running FW version", None, {}, "uint16", elem="uint16"),
     FormField(79, "Running FW checksum", None, {}, "uint32", elem="hex_info"),
 ]
 
 CONFIG_ = [
     FormField(1001, "Mouse", elem="label"),
     FormField(71, "Force Mouse Boot Mode", None, {}, "uint8", "checkbox"),
     FormField(75, "Enable Acceleration", None, {}, "uint8", "checkbox"),
-    FormField(77, "Jump Treshold", 0, {"min": 0, "max": 1024}, "uint16", "range"),
+    FormField(77, "Jump Threshold", 0, {"min": 0, "max": 3000}, "uint16", "range"),
 
     FormField(1002, "Keyboard", elem="label"),
     FormField(72, "Force KBD Boot Protocol", None, {}, "uint8", "checkbox"),

webconfig/config.htm

@@ -28,7 +28,7 @@
         readonly oninput="this.form.aRange{{ key }}.value=this.value" />
 
       {{ input(item, class='range api', type='range', name='aRange') }}
-        min="{{ item.values.min }}" max="{{ item.values.max }}" oninput="this.form.aInput{{key}}.value=this.value" />
+        min="{{ item['values'].min }}" max="{{ item['values'].max }}" oninput="this.form.aInput{{key}}.value=this.value" />
     </form>
 
   </div>
@@ -55,4 +55,4 @@
       {{ input(item) }}  />
 
   {% endif %}
-{% endblock %}
+{% endblock %}