Skip to content

Commit

Permalink
fix some rebase stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
1Conan committed Jul 22, 2024
1 parent b723235 commit cae7453
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
8 changes: 0 additions & 8 deletions tmk_core/protocol/chibios/chibios.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
#include "debug.h"
#include "print.h"

#ifdef BLUETOOTH_ITON_BT
# include "iton_bt.h"
#endif

#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
// Change this to be TRUE once we've migrated keyboards to the new init system
// Remember to change docs/platformdev_chibios_earlyinit.md as well.
Expand Down Expand Up @@ -146,10 +142,6 @@ void protocol_pre_init(void) {
usb_event_queue_init();
init_usb_driver(&USB_DRIVER);

#ifdef BLUETOOTH_ITON_BT
iton_bt_init();
#endif

#ifdef MIDI_ENABLE
setup_midi();
#endif
Expand Down
14 changes: 0 additions & 14 deletions tmk_core/protocol/chibios/usb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
extern keymap_config_t keymap_config;
#endif

#ifdef BLUETOOTH_ENABLE
# include "outputselect.h"
# ifdef BLUETOOTH_ITON_BT
# include "iton_bt.h"
# endif
#endif

/* ---------------------------------------------------------
* Global interface variables and declarations
* ---------------------------------------------------------
Expand Down Expand Up @@ -405,13 +398,6 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {

/* LED status */
uint8_t keyboard_leds(void) {
#ifdef BLUETOOTH_ENABLE
if (where_to_send() == OUTPUT_BLUETOOTH) {
# ifdef BLUETOOTH_ITON_BT
return iton_bt_led_state;
# endif
}
#endif
return keyboard_led_state;
}

Expand Down

0 comments on commit cae7453

Please sign in to comment.