locker98/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2023-11-12 05:31:01 +00:00
commit b7a1004b61
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
keyboards/snes_macropad/info.json
View File

@ -45,18 +45,18 @@
{"matrix": [2, 2], "x": 2, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2}, {"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 0], "x": 5.2, "y": 0, "w": 2, "h": 0.75},
{"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 1], "x": 10.65, "y": 0, "w": 2, "h": 0.75},
{"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 2], "x": 7.9, "y": 2.5, "w": 1, "h": 0.75},
{"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 3], "x": 8.9, "y": 2.5, "w": 1, "h": 0.75},
{"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 0], "x": 6, "y": 1, "w": 0.85, "h": 0.85},
{"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 1], "x": 6, "y": 3, "w": 0.85, "h": 0.85},
{"matrix": [4, 2], "x": 2, "y": 4}, {"matrix": [4, 2], "x": 5.2, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [4, 3], "x": 3, "y": 4}, {"matrix": [4, 3], "x": 6.8, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [5, 0], "x": 0, "y": 5}, {"matrix": [5, 0], "x": 11.8, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [5, 1], "x": 1, "y": 5}, {"matrix": [5, 1], "x": 11, "y": 3, "w": 0.85, "h": 0.85},
{"matrix": [5, 2], "x": 2, "y": 5}, {"matrix": [5, 2], "x": 11, "y": 1, "w": 0.85, "h": 0.85},
{"matrix": [5, 3], "x": 3, "y": 5} {"matrix": [5, 3], "x": 10.2, "y": 2, "w": 0.85, "h": 0.85}
] ]
} }
}, },

2
keyboards/snes_macropad/keymaps/default/keymap.c
View File

@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
// clang-format on // clang-format on
const char* get_layer_name_user(int layer) { const char* get_layer_name_user(uint8_t layer) {
switch (layer) { switch (layer) {
case L_Numpad: case L_Numpad:
return "Numpad"; return "Numpad";

2
keyboards/snes_macropad/keymaps/jbarberu/keymap.c
View File

@ -81,7 +81,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
// clang-format on // clang-format on
const char * get_layer_name_user(int layer) { const char * get_layer_name_user(uint8_t layer) {
switch (layer) { switch (layer) {
case L_Numpad: case L_Numpad:
return "Numpad"; return "Numpad";

2
keyboards/snes_macropad/keymaps/test/keymap.c
View File

@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}; };
// clang-format on // clang-format on
const char * get_layer_name_user(int layer) { const char * get_layer_name_user(uint8_t layer) {
switch (layer) { switch (layer) {
case L_Numpad: case L_Numpad:
return "Numpad"; return "Numpad";

4
keyboards/snes_macropad/snes_macropad.c
View File

@ -57,8 +57,8 @@ static void oled_render_keylog(void) {
oled_write_char(key_name, false); oled_write_char(key_name, false);
} }
__attribute__((weak)) const char * get_layer_name_user(int layer) { __attribute__((weak)) const char * get_layer_name_user(uint8_t layer) {
return "Unknown"; return get_u8_str(layer, ' ');
} }
static void oled_render_layer(void) { static void oled_render_layer(void) {