~ruther/qmk_firmware

b7a1004b61bac24d6eaeae06dfb504abd14010d3 — QMK Bot 1 year, 6 months ago 112a51d + c2326c0
Merge remote-tracking branch 'origin/master' into develop
M keyboards/snes_macropad/info.json => keyboards/snes_macropad/info.json +12 -12
@@ 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}
            ]
        }
    },

M keyboards/snes_macropad/keymaps/default/keymap.c => keyboards/snes_macropad/keymaps/default/keymap.c +1 -1
@@ 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";

M keyboards/snes_macropad/keymaps/jbarberu/keymap.c => keyboards/snes_macropad/keymaps/jbarberu/keymap.c +1 -1
@@ 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";

M keyboards/snes_macropad/keymaps/test/keymap.c => keyboards/snes_macropad/keymaps/test/keymap.c +1 -1
@@ 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";

M keyboards/snes_macropad/snes_macropad.c => keyboards/snes_macropad/snes_macropad.c +2 -2
@@ 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) {

Do not follow this link