RGB sync works now

Author: joric

keyboards/jorne_ble/jorne_ble.c

@@ -83,7 +83,7 @@ void nrfmicro_init(void) {
 
 void eeprom_update(void);
 
-// called everny matrix_scan_user
+// called every matrix_scan_user
 void nrfmicro_update(void) {
   check_ble_switch(false);
   eeprom_update();  // important

keyboards/jorne_ble/keymaps/default/keymap.c

@@ -440,9 +440,19 @@ void matrix_render_user(struct CharacterMatrix *matrix) {
     //matrix_write_ln(matrix, read_keylog());
 
     {
-    char str[32];
-    sprintf(str, "%s %s", is_master ? "Master" : "Slave", ble_connected() ? "Connected": "Not connected");
-    matrix_write_ln(matrix, str);
+    char str[64];
+
+#if (IS_LEFT_HAND)
+      sprintf (str, "Master: %s%s%s",
+        get_usb_enabled() && !get_ble_enabled() ? "USB mode":"",
+        get_ble_enabled() && ble_connected() ? "connected":"",
+        get_ble_enabled() && !ble_connected() ? "disconnected":""
+      );
+#else
+      sprintf(str, "Slave: %s", ble_connected() ? "connected" : "disconnected");
+#endif
+
+      matrix_write_ln(matrix, str);
     }
 
     matrix_write_ln(matrix, read_rgb_info());

keyboards/jorne_ble/lib/rgb_state_reader.c

@@ -7,9 +7,12 @@ extern rgblight_config_t rgblight_config;
 char rbf_info_str[24];
 const char *read_rgb_info(void) {
 
-  snprintf(rbf_info_str, sizeof(rbf_info_str), "RGB %s %02d hsv %02x%02x%02x",
-    rgblight_config.enable ? "1" : "-", rgblight_config.mode,
-    rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+  if (rgblight_config.enable)
+    snprintf(rbf_info_str, sizeof(rbf_info_str), "RGB: %-2d HSV: %02x%02x%02x",
+      rgblight_config.mode, rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+  else
+    snprintf(rbf_info_str, sizeof(rbf_info_str), "RGB: off");
+
   return rbf_info_str;
 }
 #endif

keyboards/jorne_ble/precompiled/master.uf2

@@ -61,6 +61,10 @@ void matrix_init_user(void) {
   } else if (row == 0b10) {
     bootloader_flag = true;
   }
+
+  eeconfig_update_rgblight_default();
+  rgblight_enable();
+  rgblight_mode(15);
 }
 
 void matrix_scan_user(void) {

keyboards/jorne_ble/precompiled/slave.uf2

@@ -31,6 +31,8 @@ __WEAK void ble_nus_packetrcv_handler(ble_switch_state_t* buf, uint8_t len);
 __WEAK void ble_nus_on_disconnect(void);
 
 uint32_t ble_nus_send_bytes(uint8_t* buf, uint16_t len);
+uint32_t ble_nus_recv_bytes(uint8_t* buf, uint16_t len);
+uint32_t ble_nus_send_bytes_to_slave(uint8_t* buf, uint16_t len);
 
 void ble_disconnect(void);
 void restart_advertising_wo_whitelist(void);

keyboards/jorne_ble/slave/slave.c

@@ -51,4 +51,6 @@ void advertising_init(void);
 void buttons_leds_init(bool * p_erase_bonds);
 void power_manage(void);
 
+uint32_t ble_nus_send_bytes_to_slave(uint8_t* buf, uint16_t len);
+
 #endif /* TMK_CORE_PROTOCOL_NRF_BLE_MAIN_H_ */

tmk_core/protocol/nrf/app_ble_func.h

@@ -21,5 +21,6 @@ void main_task_start(uint8_t interval_ms);
 void main_loop(void);
 
 uint32_t ble_nus_send_bytes(uint8_t* buf, uint16_t len);
+uint32_t ble_nus_recv_bytes(uint8_t* buf, uint16_t len);
 
 #endif //  _BLE_SLAVE_H_

tmk_core/protocol/nrf/ble_master.h

@@ -86,6 +86,13 @@ void raw_hid_task(void);
 void console_task(void);
 #endif
 
+#ifdef RGBLIGHT_ENABLE
+#include "rgblight.h"
+rgblight_syncinfo_t rgblight_sync;
+#endif
+
+uint32_t ble_nus_send_bytes_to_slave(uint8_t* buf, uint16_t len);
+
 void timer_tick(uint8_t interval);
 void main_tasks(void* p_context) {
   UNUSED_PARAMETER(p_context);
@@ -104,6 +111,13 @@ void main_tasks(void* p_context) {
 #endif
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_ANIMATIONS)
   rgblight_task();
+
+  if (rgblight_get_change_flags()) {
+    rgblight_get_syncinfo(&rgblight_sync);
+    ble_nus_send_bytes_to_slave((uint8_t*)&rgblight_sync, sizeof(rgblight_sync));
+    rgblight_clear_change_flags();
+  }
+
 #endif
 }