diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2022-01-21 21:51:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 19:51:12 -0800 |
| commit | ad702096a97677eab5c1931d6f0d4a51e1a564a5 (patch) | |
| tree | 51ddb8df5f1f2c18ee86ba8e5045b4f955a9d112 /keyboards/rgbkb/mun | |
| parent | b45a037c7edcd9c1cfadceb69ed51e7d42aa58c1 (diff) | |
[Keyboard] Sol 3 Keyboard from RGBKB (#15687)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Franklyn Tackitt <franklyn@tackitt.net>
Diffstat (limited to 'keyboards/rgbkb/mun')
| -rw-r--r-- | keyboards/rgbkb/mun/config.h | 6 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/keymaps/via/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index af0876861e..eec3009d8c 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -21,8 +21,8 @@ /* Matrix Configuration - Rows are doubled up */ #define MATRIX_ROWS 14 -// B1, A2 reserved for encoder / touch encoder support -#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, B1, A2 } +// Last pins reserved for encoder / touch encoder support +#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN } #define MATRIX_COLS 7 #define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 } #define MATRIX_IO_DELAY 5 @@ -35,11 +35,11 @@ #define TOUCH_DEADZONE 50 // width of a "button", wider inputs will be interpreted as a swipe #define TOUCH_TERM 350 // time of a "button" touch, longer inputs will be a swipe #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster +#define TOUCH_SEGMENTS 3 /* Encoder Configuration */ #define ENCODERS_PAD_A { B8, B9 } #define ENCODERS_PAD_B { A14, A15 } -#define TOUCH_SEGMENTS 3 /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c index 866b8a0d15..bdc2ea9811 100644 --- a/keyboards/rgbkb/mun/keymaps/default/keymap.c +++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c @@ -226,8 +226,8 @@ static void render_leds(void) static void render_touch(void) { // Host Touch LED Status - oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH") : PSTR(" "), false); - oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); + oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH") : PSTR(" "), false); + oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); } bool oled_task_user(void) { diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c index 866b8a0d15..bdc2ea9811 100644 --- a/keyboards/rgbkb/mun/keymaps/via/keymap.c +++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c @@ -226,8 +226,8 @@ static void render_leds(void) static void render_touch(void) { // Host Touch LED Status - oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH") : PSTR(" "), false); - oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); + oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH") : PSTR(" "), false); + oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); } bool oled_task_user(void) { diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c index ae5c0c9b19..0b01d43eb2 100644 --- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c +++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c @@ -189,8 +189,8 @@ static void render_leds(void) static void render_touch(void) { // Host Touch LED Status - oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH") : PSTR(" "), false); - oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); + oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH") : PSTR(" "), false); + oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT") : PSTR(" "), false); } #else static uint32_t scan_counter = 0; |