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

[Keyboard] Fixes to make snes_macropad play nicer with qmk configurator (#22432) 

* [Keyboard] Change default implementation for get_layer_name_user

Will now show the layer number instead of "Unknown", since this is
what will be shown if QMK Configurator is used to compile the
firmware.

* [Keyboard] Update the layout info

This makes it look sort of like a macropad + gamepad rather than an 4x6
ortholinear keyboard.

* [Keyboard] Fix default implementation of get_layer_name_user

Based on feedback from code review the implementation was swapped in
favor of using get_u8_str. This implied a change to the argument type
from int to uint8_t, which cascaded into the existing keymaps. (This
made sense in general, since the return type of get_highest_layer is
also a uint8_t.)
master
John Barbero 2023-11-12 06:30:31 +01:00 committed by GitHub
parent 0189c485b9
commit c2326c05c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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, 3], "x": 3, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [5, 0], "x": 0, "y": 5},
{"matrix": [5, 1], "x": 1, "y": 5},
{"matrix": [5, 2], "x": 2, "y": 5},
{"matrix": [5, 3], "x": 3, "y": 5}
{"matrix": [3, 0], "x": 5.2, "y": 0, "w": 2, "h": 0.75},
{"matrix": [3, 1], "x": 10.65, "y": 0, "w": 2, "h": 0.75},
{"matrix": [3, 2], "x": 7.9, "y": 2.5, "w": 1, "h": 0.75},
{"matrix": [3, 3], "x": 8.9, "y": 2.5, "w": 1, "h": 0.75},
{"matrix": [4, 0], "x": 6, "y": 1, "w": 0.85, "h": 0.85},
{"matrix": [4, 1], "x": 6, "y": 3, "w": 0.85, "h": 0.85},
{"matrix": [4, 2], "x": 5.2, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [4, 3], "x": 6.8, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [5, 0], "x": 11.8, "y": 2, "w": 0.85, "h": 0.85},
{"matrix": [5, 1], "x": 11, "y": 3, "w": 0.85, "h": 0.85},
{"matrix": [5, 2], "x": 11, "y": 1, "w": 0.85, "h": 0.85},
{"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
const char* get_layer_name_user(int layer) {
const char* get_layer_name_user(uint8_t layer) {
switch (layer) {
case L_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
const char * get_layer_name_user(int layer) {
const char * get_layer_name_user(uint8_t layer) {
switch (layer) {
case L_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
const char * get_layer_name_user(int layer) {
const char * get_layer_name_user(uint8_t layer) {
switch (layer) {
case L_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);
}
__attribute__((weak)) const char * get_layer_name_user(int layer) {
return "Unknown";
__attribute__((weak)) const char * get_layer_name_user(uint8_t layer) {
return get_u8_str(layer, ' ');
}
static void oled_render_layer(void) {