diff options
author | Florian Didron <fdidron@users.noreply.github.com> | 2022-05-31 19:03:21 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-31 19:03:21 +0900 |
commit | fc773ff0cf9c528773fa81be0fc8880ca5153d81 (patch) | |
tree | e917ed871290cc78cff818ee896b838d12ccc654 /keyboards/ergodox_ez | |
parent | 1fbd91aa106a4beb6ab84614dde14165a43f009a (diff) |
Reimplements Oryx's live training over raw hid (#345)
* feat: initial commit, random pairing sequence generation, host - board pairing handshakes
* feat: reimplements ory's live training over raw hid
* feat: adds planck / ergodox support
* chore: some code styling fixes
* fix: build smoke tests
* fix: code lint
* fix: disable console / command on moonlander, fixes build ci test
* fix: code lint
* fix: remove unused define(MATRIX_SIZE)
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.c | 8 | ||||
-rw-r--r-- | keyboards/ergodox_ez/keymaps/oryx/config.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index f415fa0255..8fa038cdda 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -424,13 +424,13 @@ void dynamic_macro_record_end_user(int8_t direction) { void matrix_scan_kb(void) { #ifdef ORYX_ENABLE - if(webusb_state.pairing == true) { + if(rawhid_state.pairing == true) { if(loops == 0) { ergodox_right_led_1_off(); ergodox_right_led_2_off(); ergodox_right_led_3_off(); } - if(loops % WEBUSB_BLINK_STEPS == 0) { + if(loops % PAIRING_BLINK_STEPS == 0) { if(is_on) { ergodox_right_led_2_off(); } else { @@ -438,8 +438,8 @@ void matrix_scan_kb(void) { } is_on ^= 1; } - if(loops > WEBUSB_BLINK_END) { - webusb_state.pairing = false; + if(loops > PAIRING_BLINK_END) { + rawhid_state.pairing = false; layer_state_set_user(layer_state); loops = 0; } diff --git a/keyboards/ergodox_ez/keymaps/oryx/config.h b/keyboards/ergodox_ez/keymaps/oryx/config.h index bad98d2c0e..1c7897be6c 100644 --- a/keyboards/ergodox_ez/keymaps/oryx/config.h +++ b/keyboards/ergodox_ez/keymaps/oryx/config.h @@ -1,3 +1,6 @@ #pragma once #define LAYER_STATE_8BIT +#define FIRMWARE_VERSION u8"default/latest" +#define RAW_USAGE_PAGE 0xFF60 +#define RAW_USAGE_ID 0x61 |