diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-28 10:56:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 10:56:35 -0700 |
| commit | c9424eb8d7586ccc2d72014df7b2223cb2645588 (patch) | |
| tree | 533212fe003d5b7529d5075e87cc12fb2a2beb56 /keyboards/crkbd/rev1 | |
| parent | bbdc82dd36a95c6bb8dafca6ca87c9e87d5bc315 (diff) | |
| download | qmk_firmware-c9424eb8d7586ccc2d72014df7b2223cb2645588.tar.gz qmk_firmware-c9424eb8d7586ccc2d72014df7b2223cb2645588.zip | |
[Keyboard] Fix up and clean Corne Keyboard code (#6284)
* Fix corne communication issues with LTO
* Fix up other issues with corne code
* Fix indentation
* Clang Format rev1 file for Corne
Diffstat (limited to 'keyboards/crkbd/rev1')
| -rw-r--r-- | keyboards/crkbd/rev1/config.h | 2 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/rev1.c | 23 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/rev1.h | 26 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/rules.mk | 6 |
4 files changed, 20 insertions, 37 deletions
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h index 4ea8ff38cd..200923db55 100644 --- a/keyboards/crkbd/rev1/config.h +++ b/keyboards/crkbd/rev1/config.h @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PRODUCT_ID 0x3060 #define DEVICE_VER 0x0001 #define MANUFACTURER foostan -#define PRODUCT Crkbd +#define PRODUCT Corne Keyboard (crkbd) #define DESCRIPTION A split keyboard with 3x6 vertically staggered keys and 3 thumb keys /* key matrix size */ diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index b969b5e286..24800358d5 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c @@ -1,11 +1,6 @@ #include "crkbd.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - #ifdef RGB_MATRIX_ENABLE // Logical Layout @@ -104,22 +99,4 @@ led_config_t g_led_config = { { 4, 4, 1, 1, 1 } }; #endif - #endif -void matrix_init_kb(void) { - - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - - matrix_init_user(); -}; - -void shutdown_kb(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h index cdd61d2bf9..9023248e28 100644 --- a/keyboards/crkbd/rev1/rev1.h +++ b/keyboards/crkbd/rev1/rev1.h @@ -1,23 +1,28 @@ #pragma once -#include "../crkbd.h" +#include "crkbd.h" -//void promicro_bootloader_jmp(bool program); +// void promicro_bootloader_jmp(bool program); #include "quantum.h" -#ifdef RGBLIGHT_ENABLE -//rgb led driver -#include "ws2812.h" +#ifdef PROTOCOL_LUFA + #include "lufa.h" + #include "split_util.h" #endif -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> +#ifdef SSD1306OLED + #include "ssd1306.h" #endif + +#ifdef USE_I2C + #include <stddef.h> + #ifdef __AVR__ + #include <avr/interrupt.h> + #include <avr/io.h> + #endif #endif +// clang-format off //void promicro_bootloader_jmp(bool program); #define LAYOUT( \ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ @@ -48,3 +53,4 @@ KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ KC_##L30, KC_##L31, KC_##L32, KC_##R30, KC_##R31, KC_##R32 \ ) +// clang-format on diff --git a/keyboards/crkbd/rev1/rules.mk b/keyboards/crkbd/rev1/rules.mk index f12849f989..3077863750 100644 --- a/keyboards/crkbd/rev1/rules.mk +++ b/keyboards/crkbd/rev1/rules.mk @@ -4,6 +4,6 @@ ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes) OPT_DEFS += -DRGB_MATRIX_SPLIT_RIGHT endif -SRC += rev1/matrix.c -SRC += rev1/split_util.c -SRC += rev1/split_scomm.c +SRC += matrix.c \ + split_util.c \ + split_scomm.c |