diff options
author | Dasky <32983009+daskygit@users.noreply.github.com> | 2023-02-14 03:05:44 +0000 |
---|---|---|
committer | Dasky <32983009+daskygit@users.noreply.github.com> | 2023-02-14 03:05:44 +0000 |
commit | 74770ac79b4f4e398e9737ccdc274bfe0a09a910 (patch) | |
tree | 6b225600cc21452351b468099109904036011c3c /keyboards | |
parent | e922b46a866aec40f34d9e0dfcb15932adeb0563 (diff) | |
parent | 7a099b7ea5b7c38d4ca781354533b3962750e2b7 (diff) |
Merge branch 'master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/bumblebee.c | 10 | ||||
-rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/config.h | 7 | ||||
-rw-r--r-- | keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk | 3 |
3 files changed, 8 insertions, 12 deletions
diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c index 613a1fa1b3..1199b90b1f 100644 --- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c +++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c @@ -21,18 +21,18 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) return false; if (clockwise) - tap_code16(KC_VOLU); + tap_code(KC_VOLU); else - tap_code16(KC_VOLD); + tap_code(KC_VOLD); return true; } // Initialize all RGB indicators to 'off' -__attribute__((weak)) -void keyboard_post_init_user(void) { +void keyboard_post_init_kb(void) { rgblight_setrgb_at(0, 0, 0, 0); // [..., 0] = top LED rgblight_setrgb_at(0, 0, 0, 1); // [..., 1] = middle LED rgblight_setrgb_at(0, 0, 0, 2); // [..., 2] = bottom LED + keyboard_post_init_user(); } // RGB Layer Indicators @@ -53,4 +53,4 @@ layer_state_t layer_state_set_kb(layer_state_t state) { rgblight_setrgb_at(0, 0, 0, 2); } return layer_state_set_user(state); -}
\ No newline at end of file +} diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h index 56acfbb2d0..f18b0fab89 100644 --- a/keyboards/handwired/swiftrax/bumblebee/config.h +++ b/keyboards/handwired/swiftrax/bumblebee/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 8 - // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS { B0, B1, B2, B3, F4, F5, F6, F7 } @@ -42,4 +37,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SOLENOID_PIN D2 /* Piezo Buzzer */ -#define AUDIO_PIN B7
\ No newline at end of file +#define AUDIO_PIN B7 diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk index e0ef178896..8c797e4309 100644 --- a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk +++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk @@ -1,4 +1,5 @@ VIA_ENABLE = yes #HAPTIC_ENABLE += SOLENOID AUDIO_ENABLE = yes -#either solenoid or audio not both can be enabled
\ No newline at end of file +#either solenoid or audio not both can be enabled +LTO_ENABLE = yes |