From d34cd30a02bbee527782b8396192a24bac9c73fa Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 26 Nov 2024 15:31:09 -0500 Subject: fix ferris config --- keyboards/orbekk_ferris_sweep/config.h | 10 ++++++---- keyboards/orbekk_ferris_sweep/info.json | 14 ++++++-------- keyboards/orbekk_ferris_sweep/keymaps/default/keymap.c | 2 +- keyboards/orbekk_ferris_sweep/keymaps/default/layout.h | 4 +++- 4 files changed, 16 insertions(+), 14 deletions(-) (limited to 'keyboards') diff --git a/keyboards/orbekk_ferris_sweep/config.h b/keyboards/orbekk_ferris_sweep/config.h index 0f82d6793e..4cf870af33 100644 --- a/keyboards/orbekk_ferris_sweep/config.h +++ b/keyboards/orbekk_ferris_sweep/config.h @@ -27,16 +27,18 @@ #define MASTER_LEFT -#define LAYOUT(k0A, k0B, k0C, k0D, k0E, k4E, k4D, k4C, k4B, k4A, k1A, k1B, k1C, k1D, k1E, k5E, k5D, k5C, k5B, k5A, k2A, k2B, k2C, k2D, k2E, k6E, k6D, k6C, k6B, k6A, k3B, k3D, k3E, k7E, k7D, k7B) { \ +/* +#define LAYOUT(k0A, k0B, k0C, k0D, k0E, k4E, k4D, k4C, k4B, k4A, k1A, k1B, k1C, k1D, k1E, k5E, k5D, k5C, k5B, k5A, k2A, k2B, k2C, k2D, k2E, k6E, k6D, k6C, k6B, k6A, k3A, k3B, k7A, k7B) { \ {k0A, k0B, k0C, k0D, k0E}, \ {k1A, k1B, k1C, k1D, k1E}, \ {k2A, k2B, k2C, k2D, k2E}, \ - {KC_NO, k3B, KC_NO, k3D, k3E}, \ + {k3A, k3K, KC_NO, KC_NO, KC_NO}, \ {k4A, k4B, k4C, k4D, k4E}, \ {k5A, k5B, k5C, k5D, k5E}, \ {k6A, k6B, k6C, k6D, k6E}, \ - {KC_NO, k7B, KC_NO, k7D, k7E} \ + {k7A, k7B, KC_NO, KC_NO, KC_NO} \ } +*/ #define LAYOUT_LR( \ LA0, LA1, LA2, LA3, LA4, \ @@ -51,5 +53,5 @@ RT0, RT1 \ LA0, LA1, LA2, LA3, LA4, RA0, RA1, RA2, RA3, RA4, \ LB0, LB1, LB2, LB3, LB4, RB0, RB1, RB2, RB3, RB4, \ LC0, LC1, LC2, LC3, LC4, RC0, RC1, RC2, RC3, RC4, \ -LT0, LT1, KC_NO, KC_NO, RT0, RT1 \ +LT0, LT1, RT0, RT1 \ ) diff --git a/keyboards/orbekk_ferris_sweep/info.json b/keyboards/orbekk_ferris_sweep/info.json index 811c8fe3d1..e226b30e61 100644 --- a/keyboards/orbekk_ferris_sweep/info.json +++ b/keyboards/orbekk_ferris_sweep/info.json @@ -16,12 +16,12 @@ ["GP7", "GP26", "GP27", "GP28", "GP29"], ["GP22", "GP20", "GP23", "GP21", "GP0"], ["GP2", "GP3", "GP4", "GP5", "GP6"], - ["GP8", "GP9", null, null, null], + ["GP8", "GP9", null, null, null] ] }, "split": { "enabled": true - } + }, "processor": "RP2040", "url": "", "usb": { @@ -68,13 +68,11 @@ {"matrix": [6, 1], "x": 8, "y": 2}, {"matrix": [6, 0], "x": 9, "y": 2}, - {"matrix": [3, 1], "x": 0, "y": 3}, - {"matrix": [3, 3], "x": 1, "y": 3}, - {"matrix": [3, 4], "x": 2, "y": 3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [7, 4], "x": 3, "y": 3}, - {"matrix": [7, 3], "x": 4, "y": 3}, - {"matrix": [7, 1], "x": 4, "y": 3} + {"matrix": [7, 1], "x": 2, "y": 3}, + {"matrix": [7, 0], "x": 3, "y": 3} ] } } diff --git a/keyboards/orbekk_ferris_sweep/keymaps/default/keymap.c b/keyboards/orbekk_ferris_sweep/keymaps/default/keymap.c index ac97a604d2..b0acca9c25 100644 --- a/keyboards/orbekk_ferris_sweep/keymaps/default/keymap.c +++ b/keyboards/orbekk_ferris_sweep/keymaps/default/keymap.c @@ -34,7 +34,7 @@ combo_t key_combos[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [GR] = LAYOUT_LR( - KC_B, KC_L, KC_D, KC_W, KC_COMMA, + KC_A, KC_L, KC_D, KC_W, KC_COMMA, HL_1(KC_N), HL_2(KC_R), HL_3(KC_T), HL_4(KC_S), KC_G, KC_Q, KC_X, KC_M, KC_C, KC_V, TL_LOWR, LT(NAV, KC_SPC), diff --git a/keyboards/orbekk_ferris_sweep/keymaps/default/layout.h b/keyboards/orbekk_ferris_sweep/keymaps/default/layout.h index b992f3c9f8..9851cc5138 100644 --- a/keyboards/orbekk_ferris_sweep/keymaps/default/layout.h +++ b/keyboards/orbekk_ferris_sweep/keymaps/default/layout.h @@ -2,6 +2,7 @@ #include QMK_KEYBOARD_H +/* #define LAYOUT(k0A, k0B, k0C, k0D, k0E, k4E, k4D, k4C, k4B, k4A, k1A, k1B, k1C, k1D, k1E, k5E, k5D, k5C, k5B, k5A, k2A, k2B, k2C, k2D, k2E, k6E, k6D, k6C, k6B, k6A, k3B, k3D, k3E, k7E, k7D, k7B) { \ {k0A, k0B, k0C, k0D, k0E}, \ {k1A, k1B, k1C, k1D, k1E}, \ @@ -12,6 +13,7 @@ {k6A, k6B, k6C, k6D, k6E}, \ {KC_NO, k7B, KC_NO, k7D, k7E} \ } +*/ #define LAYOUT_LR( \ LA0, LA1, LA2, LA3, LA4, \ @@ -26,5 +28,5 @@ RT0, RT1 \ LA0, LA1, LA2, LA3, LA4, RA0, RA1, RA2, RA3, RA4, \ LB0, LB1, LB2, LB3, LB4, RB0, RB1, RB2, RB3, RB4, \ LC0, LC1, LC2, LC3, LC4, RC0, RC1, RC2, RC3, RC4, \ -LT0, LT1, KC_NO, KC_NO, RT0, RT1 \ +LT0, LT1, RT0, RT1 \ ) -- cgit v1.2.3