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 /quantum/quantum.c | |
| 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 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 077e7d9d8f..7efe97ae52 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -258,7 +258,7 @@ bool process_record_quantum(keyrecord_t *record) { #endif #ifdef HAPTIC_ENABLE process_haptic(keycode, record) && -#endif // HAPTIC_ENABLE +#endif // HAPTIC_ENABLE #ifdef ORYX_ENABLE process_record_oryx(keycode, record) && #endif @@ -412,7 +412,6 @@ bool process_record_quantum(keyrecord_t *record) { } } - return process_action_kb(record); } @@ -442,21 +441,19 @@ void matrix_scan_quantum() { matrix_scan_kb(); } - #ifdef WEBUSB_ENABLE -__attribute__((weak)) bool webusb_receive_user(uint8_t *data, uint8_t length) { return false; } -__attribute__((weak)) bool webusb_receive_kb(uint8_t *data, uint8_t length) { return webusb_receive_user(data, length); } +__attribute__((weak)) bool webusb_receive_user(uint8_t *data, uint8_t length) { + return false; +} +__attribute__((weak)) bool webusb_receive_kb(uint8_t *data, uint8_t length) { + return webusb_receive_user(data, length); +} bool webusb_receive_quantum(uint8_t *data, uint8_t length) { -# ifdef ORYX_ENABLE - return webusb_receive_oryx(data, length); -# else return webusb_receive_kb(data, length); -# endif } #endif - //------------------------------------------------------------------------------ // Override these functions in your keymap file to play different tunes on // different events such as startup and bootloader jump @@ -465,7 +462,6 @@ __attribute__((weak)) void startup_user() {} __attribute__((weak)) void shutdown_user() {} - void suspend_power_down_quantum(void) { suspend_power_down_kb(); #ifndef NO_SUSPEND_POWER_DOWN |