DeskHop v0.62 (Minor Bugfixes)

- Fixed screen lock regression bug
  - Cleaned up trailing spaces

Due to MacOS having issues:
  - Moved screen lock shortcut to right control + L
  - Moved switch lock shortcut to right control + K

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 
 set(VERSION_MAJOR 00)
-set(VERSION_MINOR 139)
+set(VERSION_MINOR 147)
 
 set(PICO_SDK_FETCH_FROM_GIT off)
 set(PICO_BOARD=pico)

README.md

@@ -93,9 +93,14 @@ Ever tried to move that YT video slider to a specific position but your mouse mo
 
 ### Switch Lock
 
-If you want to lock yourself to one screen, use ```RIGHT CTRL + L```.
+If you want to lock yourself to one screen, use ```RIGHT CTRL + K```.
 This will make sure you won't accidentally leave your current screen. To turn off, press the same key combo again.
 
+### Lock Both Screens
+
+You can lock both computers at once by using ```RIGHT CTRL + L```. 
+To make use of this feature, first set up the OS for each output in config (since the shortcuts are different).
+
 ### Screensaver
 
 Supposedly built in to prevent computer from entering standby, but truth be told - it is just fun to watch. **Off by default**, will make your mouse pointer bounce around the screen like a Pong ball. When enabled, it activates after a period of inactivity defined in user config header and automatically switches off as soon as you send any output towards that screen. 
@@ -209,8 +214,8 @@ _Config_
 
 _Usage_
 - ```Right CTRL + Right ALT``` - Toggle slower mouse mode
-- ```Right CTRL + L``` - Lock/Unlock mouse desktop switching
+- ```Right CTRL + K``` - Lock/Unlock mouse desktop switching
-- ```Right ALT + Right Shift + L``` - Lock both outputs at once (set output OS before, see shortcuts below)
+- ```Right CTRL + L``` - Lock both outputs at once (set output OS before, see shortcuts below)
 - ```Caps Lock``` - Switch between outputs
 
 ### Switch cursor height calibration

src/handlers.c

@@ -79,14 +79,14 @@ void screenlock_hotkey_handler(device_t *state, hid_keyboard_report_t *report) {
                 lock_report.keycode[0] = HID_KEY_L;
                 break;
             case MACOS:
-                lock_report.modifier   = KEYBOARD_MODIFIER_LEFTCTRL | KEYBOARD_MODIFIER_LEFTALT;
+                lock_report.modifier   = KEYBOARD_MODIFIER_LEFTCTRL | KEYBOARD_MODIFIER_LEFTGUI;
                 lock_report.keycode[0] = HID_KEY_Q;
                 break;
             default:
                 break;
         }
 
-        if (global_state.active_output == out) {
+        if (BOARD_ROLE == out) {
             queue_kbd_report(&lock_report, state);
             release_all_keys(state);
         } else {

src/keyboard.c

@@ -39,13 +39,13 @@ hotkey_combo_t hotkeys[] = {
 
     /* Switch lock */
     {.modifier       = KEYBOARD_MODIFIER_RIGHTCTRL,
-     .keys           = {HID_KEY_L},
+     .keys           = {HID_KEY_K},
      .key_count      = 1,
      .acknowledge    = true,
      .action_handler = &switchlock_hotkey_handler},
 
     /* Screen lock */
-    {.modifier       = KEYBOARD_MODIFIER_RIGHTALT | KEYBOARD_MODIFIER_RIGHTSHIFT,
+    {.modifier       = KEYBOARD_MODIFIER_RIGHTCTRL,
      .keys           = {HID_KEY_L},
      .key_count      = 1,
      .acknowledge    = true,

src/ramdisk.c

@@ -116,4 +116,3 @@ int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, u
     tud_msc_set_sense(lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00);
     return -1;
 }
-