jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement core communication

Browse Source
This commit is contained in:
Drashna Jael're
2020-01-15 02:14:48 -08:00
committed by Florian Didron
parent 5c1c41462a
commit 3b71e1e819
11 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/ergodox_ez/ergodox_ez.c
-24
View File
@@ -336,17 +336,6 @@ void keyboard_post_init_kb(void) {
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
#ifdef ORYX_ENABLE
if(is_oryx_live_training_enabled()) {
uint8_t event[5];
event[0] = WEBUSB_STATUS_OK;
event[1] = record->event.pressed ? ORYX_EVT_KEYDOWN : ORYX_EVT_KEYUP;
event[2] = record->event.key.col;
event[3] = record->event.key.row;
event[4] = WEBUSB_STOP_BIT;
webusb_send(event, sizeof(event));
}
#endif
switch (keycode) {
case LED_LEVEL:
if (record->event.pressed) {
@@ -433,17 +422,4 @@ void matrix_scan_kb(void) {
matrix_scan_user();
}
uint32_t layer_state_set_kb(uint32_t state) {
state = layer_state_set_user(state);
uint8_t layer = biton32(state);
if(is_oryx_live_training_enabled()) {
uint8_t event[4];
event[0] = WEBUSB_STATUS_OK;
event[1] = ORYX_EVT_LAYER;
event[2] = layer;
event[3] = WEBUSB_STOP_BIT;
webusb_send(event, sizeof(event));
}
return state;
}
#endif
keyboards/ergodox_ez/keymaps/oryx/keymap.c
+1 -1
View File
@@ -104,7 +104,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
uint8_t layer = biton32(state);
keyboards/ergodox_ez/keymaps/webusb/keymap.c
+2 -2
View File
@@ -104,9 +104,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
uint8_t layer = biton32(state);
uint8_t layer = get_highest_layer(state);
ergodox_board_led_off();
ergodox_right_led_1_off();