diff options
| -rw-r--r-- | keyboards/moonlander/moonlander.c | 5 | ||||
| -rw-r--r-- | keyboards/planck/ez/ez.c | 13 | ||||
| -rw-r--r-- | lib/python/qmk/cli/new/keyboard.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/constants.py | 4 | ||||
| -rw-r--r-- | quantum/audio/voices.c | 5 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 32 |
6 files changed, 2 insertions, 59 deletions
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index c1e858a00d..cb8a5abca0 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -85,11 +85,6 @@ void moonlander_led_task(void) { layer_state_set_kb(layer_state); } #endif -#if !defined(MOONLANDER_USER_LEDS) - else { - layer_state_set_kb(layer_state); - } -#endif } static THD_WORKING_AREA(waLEDThread, 128); diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c index 26dbc64d01..c29f3cfa00 100644 --- a/keyboards/planck/ez/ez.c +++ b/keyboards/planck/ez/ez.c @@ -106,23 +106,10 @@ led_config_t g_led_config = { { 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1 } }; -<<<<<<< HEAD -void suspend_power_down_kb(void) { - rgb_matrix_set_color_all(0, 0, 0); - rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); -} - - void suspend_wakeup_init_kb(void) { - rgb_matrix_set_suspend_state(false); - suspend_wakeup_init_user(); -} void keyboard_post_init_kb(void) { rgb_matrix_enable_noeeprom(); keyboard_post_init_user(); } -======= ->>>>>>> qmk/master #endif /* Left B9 Right B8 */ diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py index 1cdfe53206..3fe4684073 100644 --- a/lib/python/qmk/cli/new/keyboard.py +++ b/lib/python/qmk/cli/new/keyboard.py @@ -17,7 +17,7 @@ from qmk.json_encoders import InfoJSONEncoder from qmk.json_schema import deep_update from qmk.constants import MCU2BOOTLOADER -COMMUNITY = Path('layouts/default/') +COMMUNITY = Path('layouts/community/') TEMPLATE = Path('data/templates/keyboard/') # defaults diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py index 895fcc7d01..6956b70772 100644 --- a/lib/python/qmk/constants.py +++ b/lib/python/qmk/constants.py @@ -14,11 +14,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware' MAX_KEYBOARD_SUBFOLDERS = 5 # Supported processor types -<<<<<<< HEAD -CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443', 'GD32VF103', 'WB32F3G71' -======= CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71' ->>>>>>> qmk/master LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85' diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index 4b7d14171f..eb860a7ef4 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c @@ -36,10 +36,6 @@ void set_voice(voice_type v) { voice = v; } -<<<<<<< HEAD -void voice_iterate() { voice = (voice + 1) % number_of_voices; } -void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; } -======= void voice_iterate() { voice = (voice + 1) % number_of_voices; } @@ -47,7 +43,6 @@ void voice_iterate() { void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; } ->>>>>>> qmk/master #ifdef AUDIO_VOICES float mod(float a, int b) { diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 7075cb92d7..bf005d519f 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -882,39 +882,12 @@ static void send_system(uint16_t data) { static void send_consumer(uint16_t data) { #ifdef EXTRAKEY_ENABLE # ifdef BLUETOOTH_ENABLE -<<<<<<< HEAD - uint8_t where = where_to_send(); - - if (where == OUTPUT_BLUETOOTH || where == OUTPUT_USB_AND_BT) { -======= if (where_to_send() == OUTPUT_BLUETOOTH) { -<<<<<<< HEAD ->>>>>>> 0.12.52~1 -# ifdef MODULE_ADAFRUIT_BLE - adafruit_ble_send_consumer_key(data); -# elif MODULE_RN42 - static uint16_t last_data = 0; - if (data == last_data) return; - last_data = data; - uint16_t bitmap = CONSUMER2RN42(data); - serial_send(0xFD); - serial_send(0x03); - serial_send(0x03); - serial_send(bitmap & 0xFF); - serial_send((bitmap >> 8) & 0xFF); -======= # ifdef BLUETOOTH_BLUEFRUIT_LE bluefruit_le_send_consumer_key(data); # elif BLUETOOTH_RN42 rn42_send_consumer(data); ->>>>>>> qmk/master # endif -<<<<<<< HEAD - } - - if (where != OUTPUT_USB && where != OUTPUT_USB_AND_BT) { -======= ->>>>>>> 0.12.52~1 return; } # endif @@ -923,6 +896,7 @@ static void send_consumer(uint16_t data) { #endif } + static void send_programmable_button(uint32_t data) { #ifdef PROGRAMMABLE_BUTTON_ENABLE static report_programmable_button_t r; @@ -941,11 +915,7 @@ static void send_programmable_button(uint32_t data) { * FIXME: Needs doc */ int8_t sendchar(uint8_t c) { -<<<<<<< HEAD - // Not wait once timeouted. -======= // Do not wait if the previous write has timed_out. ->>>>>>> 0.12.52~1 // Because sendchar() is called so many times, waiting each call causes big lag. // The `timed_out` state is an approximation of the ideal `is_listener_disconnected?` state. static bool timed_out = false; |