diff options
Diffstat (limited to 'keyboards/moonlander')
| -rw-r--r-- | keyboards/moonlander/info.json | 92 | ||||
| -rw-r--r-- | keyboards/moonlander/keymaps/jjerrell/config.h | 1 | ||||
| -rw-r--r-- | keyboards/moonlander/moonlander.c | 26 | ||||
| -rw-r--r-- | keyboards/moonlander/moonlander.h | 24 | ||||
| -rw-r--r-- | keyboards/moonlander/rules.mk | 1 |
5 files changed, 96 insertions, 48 deletions
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json index 3492713a6a..fc09859f82 100644 --- a/keyboards/moonlander/info.json +++ b/keyboards/moonlander/info.json @@ -8,27 +8,97 @@ "pid": "0x1969", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_moonlander": { "layout": [ - {"x":0, "y":0.375}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":6, "y":0.25}, - {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.125}, {"x":13, "y":0}, {"x":14, "y":0.125}, {"x":15, "y":0.375}, {"x":16, "y":0.375}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, + + {"matrix": [6, 0], "x": 10, "y": 0.25}, + {"matrix": [6, 1], "x": 11, "y": 0.25}, + {"matrix": [6, 2], "x": 12, "y": 0.125}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0.125}, + {"matrix": [6, 5], "x": 15, "y": 0.375}, + {"matrix": [6, 6], "x": 16, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + + {"matrix": [7, 0], "x": 10, "y": 1.25}, + {"matrix": [7, 1], "x": 11, "y": 1.25}, + {"matrix": [7, 2], "x": 12, "y": 1.125}, + {"matrix": [7, 3], "x": 13, "y": 1}, + {"matrix": [7, 4], "x": 14, "y": 1.125}, + {"matrix": [7, 5], "x": 15, "y": 1.375}, + {"matrix": [7, 6], "x": 16, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, + + {"matrix": [8, 0], "x": 10, "y": 2.25}, + {"matrix": [8, 1], "x": 11, "y": 2.25}, + {"matrix": [8, 2], "x": 12, "y": 2.125}, + {"matrix": [8, 3], "x": 13, "y": 2}, + {"matrix": [8, 4], "x": 14, "y": 2.125}, + {"matrix": [8, 5], "x": 15, "y": 2.375}, + {"matrix": [8, 6], "x": 16, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, - {"x":0, "y":1.375}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, - {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.125}, {"x":13, "y":1}, {"x":14, "y":1.125}, {"x":15, "y":1.375}, {"x":16, "y":1.375}, + {"matrix": [9, 1], "x": 11, "y": 3.25}, + {"matrix": [9, 2], "x": 12, "y": 3.125}, + {"matrix": [9, 3], "x": 13, "y": 3}, + {"matrix": [9, 4], "x": 14, "y": 3.125}, + {"matrix": [9, 5], "x": 15, "y": 3.375}, + {"matrix": [9, 6], "x": 16, "y": 3.375}, - {"x":0, "y":2.375}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":6, "y":2.25}, - {"x":10, "y":2.25}, {"x":11, "y":2.25}, {"x":12, "y":2.125}, {"x":13, "y":2}, {"x":14, "y":2.125}, {"x":15, "y":2.375}, {"x":16, "y":2.375}, + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2, "y": 4.125}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.125}, + {"matrix": [5, 3], "x": 5, "y": 4.5, "w": 2}, - {"x":0, "y":3.375}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, - {"x":11, "y":3.25}, {"x":12, "y":3.125}, {"x":13, "y":3}, {"x":14, "y":3.125}, {"x":15, "y":3.375}, {"x":16, "y":3.375}, + {"matrix": [11, 3], "x": 10, "y": 4.5, "w": 2}, + {"matrix": [10, 2], "x": 12, "y": 4.125}, + {"matrix": [10, 3], "x": 13, "y": 4}, + {"matrix": [10, 4], "x": 14, "y": 4.125}, + {"matrix": [10, 5], "x": 15, "y": 4.375}, + {"matrix": [10, 6], "x": 16, "y": 4.375}, - {"x":0, "y":4.375}, {"x":1, "y":4.375}, {"x":2, "y":4.125}, {"x":3, "y":4}, {"x":4, "y":4.125}, {"x":5, "y":4.5, "w":2}, - {"x":10, "y":4.5, "w":2}, {"x":12, "y":4.125}, {"x":13, "y":4}, {"x":14, "y":4.125}, {"x":15, "y":4.375}, {"x":16, "y":4.375}, + {"matrix": [5, 0], "x": 5, "y": 5.5, "h": 1.5}, + {"matrix": [5, 1], "x": 6, "y": 5.5, "h": 1.5}, + {"matrix": [5, 2], "x": 7, "y": 5.5, "h": 1.5}, - {"x":5, "y":5.5, "h":1.5}, {"x":6, "y":5.5, "h":1.5}, {"x":7, "y":5.5, "h":1.5}, {"x":9, "y":5.5, "h":1.5}, {"x":10, "y":5.5, "h":1.5}, {"x":11, "y":5.5, "h":1.5} + {"matrix": [11, 4], "x": 9, "y": 5.5, "h": 1.5}, + {"matrix": [11, 5], "x": 10, "y": 5.5, "h": 1.5}, + {"matrix": [11, 6], "x": 11, "y": 5.5, "h": 1.5} ] } } diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h index aa4bf3885e..e39340c80a 100644 --- a/keyboards/moonlander/keymaps/jjerrell/config.h +++ b/keyboards/moonlander/keymaps/jjerrell/config.h @@ -24,4 +24,3 @@ #undef PRODUCT #define PRODUCT "Moonlander Mark I - Modified by <@jjerrell>" -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 83b5997b53..4146fc7afb 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -16,8 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include "moonlander.h" keyboard_config_t keyboard_config; @@ -28,7 +26,7 @@ bool is_launching = false; #ifdef DYNAMIC_MACRO_ENABLE static bool is_dynamic_recording = false; -void dynamic_macro_record_start_user(void) { is_dynamic_recording = true; } +void dynamic_macro_record_start_user(int8_t direction) { is_dynamic_recording = true; } void dynamic_macro_record_end_user(int8_t direction) { is_dynamic_recording = false; @@ -370,14 +368,20 @@ void keyboard_post_init_kb(void) { #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) // clang-format off __attribute__ ((weak)) -const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander( - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 8, 9, 10, 11, 12, 3, 4, 13, 14, 15, 16, 17, - 0, 1, 2, 5, 6, 7 -); +const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = { + {58, 59, 60, 61, 62, 63, 64}, + {44, 45, 46, 47, 48, 49, 50}, + {30, 31, 32, 33, 34, 35, 36}, + {18, 19, 20, 21, 22, 23, 0}, + { 8, 9, 10, 11, 12, 0, 0}, + { 0, 1, 2, 3, 0, 0, 0}, + {65, 66, 67, 68, 69, 70, 71}, + {51, 52, 53, 54, 55, 56, 57}, + {37, 38, 39, 40, 41, 42, 43}, + { 0, 24, 25, 26, 27, 28, 29}, + { 0, 0, 13, 14, 15, 16, 17}, + { 0, 0, 0, 4, 5, 6, 7} +}; // clang-format on #endif diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h index 400c97be0d..f68b60379c 100644 --- a/keyboards/moonlander/moonlander.h +++ b/keyboards/moonlander/moonlander.h @@ -36,30 +36,6 @@ extern bool mcp23018_leds[]; // clang-format off -#define LAYOUT_moonlander( \ - k00, k01, k02, k03, k04, k05, k06, k60, k61, k62, k63, k64, k65, k66, \ - k10, k11, k12, k13, k14, k15, k16, k70, k71, k72, k73, k74, k75, k76, \ - k20, k21, k22, k23, k24, k25, k26, k80, k81, k82, k83, k84, k85, k86, \ - k30, k31, k32, k33, k34, k35, k91, k92, k93, k94, k95, k96, \ - k40, k41, k42, k43, k44, k53, kb3, ka2, ka3, ka4, ka5, ka6, \ - k50, k51, k52, kb4, kb5, kb6 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, KC_NO }, \ - { k40, k41, k42, k43, k44, KC_NO, KC_NO }, \ - { k50, k51, k52, k53, KC_NO, KC_NO, KC_NO }, \ -\ - { k60, k61, k62, k63, k64, k65, k66 }, \ - { k70, k71, k72, k73, k74, k75, k76 }, \ - { k80, k81, k82, k83, k84, k85, k86 }, \ - { KC_NO, k91, k92, k93, k94, k95, k96 }, \ - { KC_NO, KC_NO, ka2, ka3, ka4, ka5, ka6 }, \ - { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \ -} - #define LED_LAYOUT_moonlander( \ l00, l01, l02, l03, l04, l05, l06, l60, l61, l62, l63, l64, l65, l66, \ l10, l11, l12, l13, l14, l15, l16, l70, l71, l72, l73, l74, l75, l76, \ diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk index 825afb6ba1..12987afdac 100644 --- a/keyboards/moonlander/rules.mk +++ b/keyboards/moonlander/rules.mk @@ -14,7 +14,6 @@ AUDIO_DRIVER = dac_additive CUSTOM_MATRIX = lite SWAP_HANDS_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 EEPROM_DRIVER = i2c #project specific files |