drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Move Bluetooth-related function calls up to host/keyboard level (#18274)

Browse source 
* Move Bluetooth-related function calls up to host/keyboard level

* Remove pointless set_output() call

* Move bluetooth (rn42) init to end of keyboard_init()

* Enable SPI/UART for ChibiOS targets

* Some more slight tweaks
This commit is contained in:
Ryan 2022-09-08 04:59:24 +10:00 • committed by GitHub
parent cf8cdd1992
commit f7d2b001bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 61 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

15
quantum/keyboard.c
View file

@ -107,6 +107,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef BLUETOOTH_ENABLE
# include "outputselect.h"
# ifdef BLUETOOTH_BLUEFRUIT_LE
# include "bluefruit_le.h"
# elif BLUETOOTH_RN42
# include "rn42.h"
# endif
#endif
#ifdef CAPS_WORD_ENABLE
# include "caps_word.h"
@ -346,9 +351,6 @@ void quantum_init(void) {
#ifdef HAPTIC_ENABLE
haptic_init();
#endif
#if defined(BLUETOOTH_ENABLE) && defined(OUTPUT_AUTO_ENABLE)
set_output(OUTPUT_AUTO);
#endif
}
/** \brief keyboard_init
@ -410,6 +412,9 @@ void keyboard_init(void) {
// init after split init
pointing_device_init();
#endif
#if defined(BLUETOOTH_RN42)
rn42_init();
#endif
#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
debug_enable = true;
@ -670,5 +675,9 @@ void keyboard_task(void) {
programmable_button_send();
#endif
#ifdef BLUETOOTH_BLUEFRUIT_LE
bluefruit_le_task();
#endif
led_task();
}