From 3b71e1e8196d5db7e82a36edc3f0f0a8d3d46ee3 Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 15 Jan 2020 02:14:48 -0800
Subject: Implement core communication

---
 keyboards/ergodox_ez/ergodox_ez.c            | 24 ------------------------
 keyboards/ergodox_ez/keymaps/oryx/keymap.c   |  2 +-
 keyboards/ergodox_ez/keymaps/webusb/keymap.c |  4 ++--
 keyboards/planck/ez/ez.c                     | 23 +----------------------
 keyboards/planck/keymaps/oryx/keymap.c       |  2 +-
 keyboards/planck/keymaps/webusb/keymap.c     |  2 +-
 6 files changed, 6 insertions(+), 51 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index bd4a6fa78d..d003a19946 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -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
diff --git a/keyboards/ergodox_ez/keymaps/oryx/keymap.c b/keyboards/ergodox_ez/keymaps/oryx/keymap.c
index 58d281de6e..81c8b1b912 100644
--- a/keyboards/ergodox_ez/keymaps/oryx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/oryx/keymap.c
@@ -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);
 
diff --git a/keyboards/ergodox_ez/keymaps/webusb/keymap.c b/keyboards/ergodox_ez/keymaps/webusb/keymap.c
index 58d281de6e..15eb76c15e 100644
--- a/keyboards/ergodox_ez/keymaps/webusb/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/webusb/keymap.c
@@ -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();
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index aca2c4dd5d..2fd462548c 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -242,21 +242,11 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
 }
 
 
-uint32_t layer_state_set_kb(uint32_t state) {
+layer_state_t layer_state_set_kb(layer_state_t state) {
     planck_ez_left_led_off();
     planck_ez_right_led_off();
     state = layer_state_set_user(state);
     uint8_t layer = biton32(state);
-#ifdef ORXY_ENABLE
-    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));
-    }
-#endif
     switch (layer) {
         case 1:
             planck_ez_left_led_on();
@@ -275,17 +265,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
 }
 
 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) {
diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index a1e9ae4636..83b7b42767 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -129,6 +129,6 @@ bool music_mask_user(uint16_t keycode) {
         return true;
     }
 }
-uint32_t layer_state_set_user(uint32_t state) {
+layer_state_t layer_state_set_user(layer_state_t state) {
     return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
diff --git a/keyboards/planck/keymaps/webusb/keymap.c b/keyboards/planck/keymaps/webusb/keymap.c
index 9a7c2f4d85..f9d6998940 100644
--- a/keyboards/planck/keymaps/webusb/keymap.c
+++ b/keyboards/planck/keymaps/webusb/keymap.c
@@ -131,6 +131,6 @@ bool music_mask_user(uint16_t keycode) {
 }
 #endif
 
-uint32_t layer_state_set_user(uint32_t state) {
+layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
-- 
cgit v1.2.3