1
0
Fork 0

Merge branch 'master' into develop

This commit is contained in:
Dasky 2023-02-14 03:05:44 +00:00
commit 74770ac79b
16 changed files with 25 additions and 29 deletions

View file

@ -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);
}
}

View file

@ -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
#define AUDIO_PIN B7

View file

@ -1,4 +1,5 @@
VIA_ENABLE = yes
#HAPTIC_ENABLE += SOLENOID
AUDIO_ENABLE = yes
#either solenoid or audio not both can be enabled
#either solenoid or audio not both can be enabled
LTO_ENABLE = yes