add adafruit bluefruit le uart support

Signed-off-by: Joshua Rubin <[email protected]>
qmk · Apr 30, 2020 · 60f8c5a · 60f8c5a
1 parent 4bb5e83
commit 60f8c5a
Show file tree

Hide file tree

Showing 33 changed files with 3,036 additions and 22 deletions.
diff --git a/keyboards/bioi/g60ble/config.h b/keyboards/bioi/g60ble/config.h
@@ -48,3 +48,6 @@
 
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
+#define AdafruitBleBaud 76800
+// #define AdafruitBleBattery
+#define OUTPUT_AUTO_ENABLE
diff --git a/keyboards/bioi/g60ble/rules.mk b/keyboards/bioi/g60ble/rules.mk
@@ -16,7 +16,7 @@ BOOTLOADER = qmk-dfu
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = lite    # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes      # Mouse keys(+4700)
+# MOUSEKEY_ENABLE = yes    # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes      # Audio control and System control(+450)
 # CONSOLE_ENABLE = yes     # Console for debug(+400)
 COMMAND_ENABLE = yes       # Commands for debug and configuration
@@ -25,5 +25,6 @@ NKRO_ENABLE = yes          # USB Nkey Rollover - if this doesn't work, see here:
 BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes
 LTO_ENABLE = yes
+BLUETOOTH = AdafruitBLEUART
 
 LAYOUTS = 60_ansi 60_iso 60_hhkb 60_ansi_split_bs_rshift 60_tsangan_hhkb
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -137,7 +137,7 @@ enum planck_keycodes {
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
 #endif
-#ifndef MODULE_ADAFRUIT_BLE
+#ifndef MODULE_ADAFRUIT_BLE_SPI
   OUT_BT,
 #endif
   RGBDEMO,
@@ -1261,7 +1261,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void set_output_user(uint8_t output) {
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef MODULE_ADAFRUIT_BLE_SPI
   switch(output) {
     case OUTPUT_USB:
       led_set_output_usb();
@@ -1285,7 +1285,7 @@ void matrix_init_user() {
 #endif
 
   // auto detect output on init
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef MODULE_ADAFRUIT_BLE_SPI
   uint8_t output = auto_detect_output();
   if (output == OUTPUT_USB) {
     set_output(OUTPUT_USB);

diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -140,7 +140,7 @@ enum planck_keycodes {
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
 #endif
-#ifndef MODULE_ADAFRUIT_BLE
+#ifndef MODULE_ADAFRUIT_BLE_SPI
   OUT_BT,
 #endif
   RGBDEMO,
@@ -1264,7 +1264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void set_output_user(uint8_t output) {
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef MODULE_ADAFRUIT_BLE_SPI
   switch(output) {
     case OUTPUT_USB:
       led_set_output_usb();
@@ -1288,7 +1288,7 @@ void matrix_init_user() {
 #endif
 
   // auto detect output on init
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef MODULE_ADAFRUIT_BLE_SPI
   uint8_t output = auto_detect_output();
   if (output == OUTPUT_USB) {
     set_output(OUTPUT_USB);

diff --git a/quantum/rgblight.c b/quantum/rgblight.c
@@ -226,6 +226,14 @@ void rgblight_init(void) {
     is_rgblight_initialized = true;
 }
 
+void rgblight_restore_from_eeprom(void) {
+    if (!is_rgblight_initialized) return;
+    rgblight_config.raw = eeconfig_read_rgblight();
+    if (rgblight_config.enable) {
+        rgblight_mode_noeeprom(rgblight_config.mode);
+    }
+}
+
 uint32_t rgblight_read_dword(void) { return rgblight_config.raw; }
 
 void rgblight_update_dword(uint32_t dword) {

diff --git a/quantum/rgblight.h b/quantum/rgblight.h
@@ -16,6 +16,10 @@
 #ifndef RGBLIGHT_H
 #define RGBLIGHT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***** rgblight_mode(mode)/rgblight_mode_noeeprom(mode) ****
 
  old mode number (before 0.6.117) to new mode name table
@@ -317,6 +321,7 @@ uint8_t rgblight_get_val(void);
 
 /* === qmk_firmware (core)internal Functions === */
 void     rgblight_init(void);
+void     rgblight_restore_from_eeprom(void);
 uint32_t rgblight_read_dword(void);
 void     rgblight_update_dword(uint32_t dword);
 uint32_t eeconfig_read_rgblight(void);
@@ -396,4 +401,9 @@ void rgblight_effect_alternating(animation_status_t *anim);
 #    endif
 
 #endif  // #ifndef RGBLIGHT_H_DUMMY_DEFINE
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // RGBLIGHT_H
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
@@ -120,7 +120,13 @@ endif
 
 ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
 	TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-	TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE
+	TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE_SPI
+	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
+endif
+
+ifeq ($(strip $(BLUETOOTH)), AdafruitBLEUART)
+	TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
+	TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE_UART
 	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 

diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
@@ -292,6 +292,33 @@ static void print_eeconfig(void) {
     print("\n");
 #    endif /* BACKLIGHT_ENABLE */
 
+#   ifdef RGBLIGHT_ENABLE
+    rgblight_config_t rgb;
+    rgb.speed = 0;
+    rgb.raw = eeconfig_read_rgblight();
+    print("rgblight_config.raw: ");
+    print_hex8(rgb.raw);
+    print("\n");
+    print(".enable: ");
+    print_dec(rgb.enable);
+    print("\n");
+    print(".mode: ");
+    print_dec(rgb.mode);
+    print("\n");
+    print(".hue: ");
+    print_dec(rgb.hue);
+    print("\n");
+    print(".sat: ");
+    print_dec(rgb.sat);
+    print("\n");
+    print(".val: ");
+    print_dec(rgb.val);
+    print("\n");
+    print(".speed: ");
+    print_dec(rgb.speed);
+    print("\n");
+#   endif /* RGBLIGHT_ENABLE */
+
 #endif /* !NO_PRINT */
 }
 

diff --git a/tmk_core/common/uart.h b/tmk_core/common/uart.h
@@ -1,11 +1,19 @@
 #ifndef _uart_included_h_
 #define _uart_included_h_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 void    uart_init(uint32_t baud);
 void    uart_putchar(uint8_t c);
 uint8_t uart_getchar(void);
 uint8_t uart_available(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif