diff options
| author | dakkar <dakkar@thenautilus.net> | 2022-10-25 17:11:48 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2022-10-25 17:11:48 +0100 |
| commit | 0f01c20442dc1be35f699c7f9641c7b28ce1e0c3 (patch) | |
| tree | acf8eb6b9987c275ce5df150cce6089d7c73dcd4 | |
| parent | makefile target to update Kaleidoscope (diff) | |
| download | keyboardio-model01-master.tar.gz keyboardio-model01-master.tar.bz2 keyboardio-model01-master.zip | |
| -rw-r--r-- | Model01-dakkar-firmware.ino | 1 | ||||
| -rw-r--r-- | combos.h | 19 | ||||
| -rw-r--r-- | power-management.h | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/Model01-dakkar-firmware.ino b/Model01-dakkar-firmware.ino index dda1e9d..d759d4c 100644 --- a/Model01-dakkar-firmware.ino +++ b/Model01-dakkar-firmware.ino @@ -44,6 +44,7 @@ KALEIDOSCOPE_INIT_PLUGINS( void setup() { Kaleidoscope.setup(); DakkarColorDark.activate(); + HardwareTestMode.setActionKey(R3C6); // left Fn } void loop() { @@ -3,18 +3,31 @@ #include <Kaleidoscope-MagicCombo.h> #include <Kaleidoscope-USB-Quirks.h> +#include <Kaleidoscope-HardwareTestMode.h> +// probably unused enum { // Toggle between Boot (6-key rollover; for BIOSes and early boot) and NKRO // mode. - COMBO_TOGGLE_NKRO_MODE + COMBO_TOGGLE_NKRO_MODE, + COMBO_ENTER_TEST_MODE }; static void toggleKeyboardProtocol(uint8_t combo_index) { USBQuirks.toggleKeyboardProtocol(); } -USE_MAGIC_COMBOS({.action = toggleKeyboardProtocol, +static void enterHardwareTestMode(uint8_t combo_index) { + HardwareTestMode.runTests(); +} + +USE_MAGIC_COMBOS( + {.action = toggleKeyboardProtocol, // Left Fn + Esc + Shift .keys = { R3C6, R2C6, R3C7 } - }); + }, + {.action = enterHardwareTestMode, + // Left Fn + Prog + LED + .keys = {R3C6, R0C0, R0C6} + }, +); diff --git a/power-management.h b/power-management.h index a6baa8a..9faf5b0 100644 --- a/power-management.h +++ b/power-management.h @@ -7,13 +7,12 @@ void toggleLedsOnSuspendResume(kaleidoscope::plugin::HostPowerManagement::Event event) { switch (event) { case kaleidoscope::plugin::HostPowerManagement::Suspend: + case kaleidoscope::plugin::HostPowerManagement::Sleep: LEDControl.disable(); break; case kaleidoscope::plugin::HostPowerManagement::Resume: LEDControl.enable(); break; - case kaleidoscope::plugin::HostPowerManagement::Sleep: - break; } } |