Skip to content

Commit 4b5ebb7

Browse files
waffle87waffle87
authored
Fixup latinpadble (#18736)
1 parent b5e26cc commit 4b5ebb7

File tree

6 files changed

+36
-105
lines changed

6 files changed

+36
-105
lines changed

‎keyboards/latincompass/latinpadble/config.h

+2-41
Original file line numberDiff line numberDiff line change
@@ -30,56 +30,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
3030

3131
#define DIODE_DIRECTION ROW2COL
3232

33-
#define SSD1306OLED
3433
#define RGB_DI_PIN B7
3534

3635
#define RGBLED_NUM 4
37-
#define DRIVER_LED_TOTAL RGBLED_NUM
3836

3937
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
4038
#define DEBOUNCE 5
4139

42-
4340
#define RGBLIGHT_VAL_STEP 25
44-
#define RGBLIGHT_LIMIT_VAL 255
41+
#define RGBLIGHT_EFFECT_KNIGHT
4542
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 20
46-
//#define RGBLIGHT_ANIMATIONS // Run RGB animations
47-
#undef ENABLE_RGB_MATRIX_ALPHAS_MODS
48-
#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
49-
#undef ENABLE_RGB_MATRIX_BREATHING
50-
#undef ENABLE_RGB_MATRIX_BAND_SAT
51-
#undef ENABLE_RGB_MATRIX_BAND_VAL
52-
#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
53-
#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
54-
#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
55-
#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
56-
#undef ENABLE_RGB_MATRIX_CYCLE_ALL
57-
#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
58-
#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
59-
#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
60-
#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
61-
#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
62-
#undef ENABLE_RGB_MATRIX_DUAL_BEACON
63-
#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
64-
#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
65-
#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
66-
#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
67-
#undef ENABLE_RGB_MATRIX_RAINDROPS
68-
#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
69-
#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
70-
#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
71-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
72-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
73-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
74-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
75-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
76-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
77-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
78-
#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
79-
#undef ENABLE_RGB_MATRIX_SPLASH
80-
#undef ENABLE_RGB_MATRIX_MULTISPLASH
81-
#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
82-
#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
43+
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
8344

8445
#define OLED_FONT_H "./lib/glcdfont.c"
8546

‎keyboards/latincompass/latinpadble/keymaps/default/keymap.c

+3-16
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616
#include QMK_KEYBOARD_H
17+
1718
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
1819
[0] = LAYOUT_pad(
1920
KC_PGUP,
20-
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
21+
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
2122
KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
2223
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
2324
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
2425
[1] = LAYOUT_pad(
2526
KC_NUMLOCK,
26-
RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
27+
RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
2728
RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
2829
RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
2930
RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
@@ -40,17 +41,3 @@ bool oled_task_user(void) {
4041
return false;
4142
}
4243
#endif
43-
44-
bool encoder_update_user(uint8_t index, bool clockwise) {
45-
if (index == 0) { /* First encoder */
46-
if (clockwise) {
47-
tap_code(KC_PGDN);
48-
} else {
49-
tap_code(KC_PGUP);
50-
}
51-
}
52-
return true;
53-
}
54-
55-
56-
void matrix_init_user(void) { render_logo(); }

‎keyboards/latincompass/latinpadble/keymaps/via/keymap.c

+21-47
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,37 @@
1313
* You should have received a copy of the GNU General Public License
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
16-
/* Keymap _0: (Base Layer) Default Layer
17-
18-
* .----.
19-
* |PGUP|
20-
* |-----------------------.
21-
* | 7 | 8 | 9 | MO1 |
22-
* |-----|-----|-----|-----|
23-
* | 4 | 5 | 6 | + |
24-
* |-----|-----|-----|-----|
25-
* | 1 | 2 | 3 | — |
26-
* |-----|-----|-----|-----|
27-
* | 0 | . | DEL |Enter|
28-
* .-----------------------.
29-
*/
30-
/* Keymap _1: (Second Layer) second Layer
31-
32-
* .--------.
33-
* |NUMLOCK|
34-
* |--------------------------------.
35-
* |RGB_TOG|RGB_MOD|RGB_M_K|RGB_M_X |
36-
* |-------|-------|-------|--------|
37-
* |RGB_SAI|RGB_SAD|RGB_HUI|RGB_HUD |
38-
* |-------|-------|-------|--------|
39-
* |RGB_VAI|RGB_VAD|RGB_SPI|RGB_SPD |
40-
* |-------|-------|-------|--------|
41-
* |RGB_SPI|RGB_SPD|RGB_TOG|KC_TRNS |
42-
* .--------------------------------.
43-
*/
44-
4516
#include QMK_KEYBOARD_H
17+
4618
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4719
[0] = LAYOUT_pad(
4820
KC_PGUP,
49-
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
21+
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
5022
KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
5123
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
52-
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
24+
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER
25+
),
5326
[1] = LAYOUT_pad(
5427
KC_NUMLOCK,
55-
RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
28+
RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_X,
5629
RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD,
5730
RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD,
58-
RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS),
31+
RGB_SPI, RGB_SPD, RGB_TOG, KC_TRNS
32+
),
33+
[2] = LAYOUT_pad(
34+
_______,
35+
_______, _______, _______, _______,
36+
_______, _______, _______, _______,
37+
_______, _______, _______, _______,
38+
_______, _______, _______, _______
39+
),
40+
[3] = LAYOUT_pad(
41+
_______,
42+
_______, _______, _______, _______,
43+
_______, _______, _______, _______,
44+
_______, _______, _______, _______,
45+
_______, _______, _______, _______
46+
)
5947
};
6048

6149
static void render_logo(void) {
@@ -69,17 +57,3 @@ bool oled_task_user(void) {
6957
return false;
7058
}
7159
#endif
72-
73-
bool encoder_update_user(uint8_t index, bool clockwise) {
74-
if (index == 0) { /* First encoder */
75-
if (clockwise) {
76-
tap_code(KC_PGDN);
77-
} else {
78-
tap_code(KC_PGUP);
79-
}
80-
}
81-
return true;
82-
}
83-
84-
85-
void matrix_init_user(void) { render_logo(); }

‎keyboards/latincompass/latinpadble/keymaps/via/rules.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
VIA_ENABLE = yes
2-
LTO_ENABLE = yes

‎keyboards/latincompass/latinpadble/latinpadble.c

+9
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,12 @@
1515
*/
1616
#include "latinpadble.h"
1717

18+
bool encoder_update_kb(uint8_t index, bool clockwise) {
19+
if (!encoder_update_user(index, clockwise)) { return false; }
20+
if (clockwise) {
21+
tap_code(KC_PGDN);
22+
} else {
23+
tap_code(KC_PGUP);
24+
}
25+
return true;
26+
}

‎keyboards/latincompass/latinpadble/rules.mk

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ NKRO_ENABLE = no # Enable N-Key Rollover
1919
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
2020
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
2121
AUDIO_ENABLE = no # Audio output
22+
LTO_ENABLE = yes
2223

2324
BLUETOOTH_ENABLE = yes
2425
BLUETOOTH_DRIVER = BluefruitLE

0 commit comments

Comments
 (0)