From d983251c10c4bb152c746dc4e94bc954b1b82c8c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 29 Aug 2022 02:59:40 +1000 Subject: Switch over MANUFACTURER and PRODUCT to string literals (#18183) --- keyboards/moonlander/keymaps/jjerrell/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h index 1fd17fbbe3..aa4bf3885e 100644 --- a/keyboards/moonlander/keymaps/jjerrell/config.h +++ b/keyboards/moonlander/keymaps/jjerrell/config.h @@ -22,6 +22,6 @@ #define ORYX_CONFIGURATOR #undef PRODUCT -#define PRODUCT Moonlander Mark I - Modified by <@jjerrell> +#define PRODUCT "Moonlander Mark I - Modified by <@jjerrell>" #define IGNORE_MOD_TAP_INTERRUPT -- cgit v1.2.3 From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/moonlander/config.h | 2 +- keyboards/moonlander/moonlander.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h index b0ff86ee81..7db3a184fa 100644 --- a/keyboards/moonlander/config.h +++ b/keyboards/moonlander/config.h @@ -75,7 +75,7 @@ #define DRIVER_COUNT 2 #define DRIVER_1_LED_TOTAL 36 #define DRIVER_2_LED_TOTAL 36 -#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) #define RGB_MATRIX_CENTER { 125, 26 } #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 927c88925e..0844f16661 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -174,7 +174,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) { #ifdef RGB_MATRIX_ENABLE // clang-format off -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location -- cgit v1.2.3 From 5abb125b025750d7015d1a9cafc5a861cedfa9b3 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sun, 25 Sep 2022 13:04:00 -0700 Subject: [Keymap] develop updates for Drashna Keymaps (#18472) --- keyboards/moonlander/keymaps/drashna/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/keymaps/drashna/rules.mk b/keyboards/moonlander/keymaps/drashna/rules.mk index feb91c774b..927d956e9d 100644 --- a/keyboards/moonlander/keymaps/drashna/rules.mk +++ b/keyboards/moonlander/keymaps/drashna/rules.mk @@ -2,5 +2,5 @@ TAP_DANCE_ENABLE = yes BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite UNICODE_ENABLE = yes UNICODEMAP_ENABLE = no -AUTOCORRECTION_ENABLE = yes +AUTOCORRECT_ENABLE = yes CAPS_WORD_ENABLE = yes -- cgit v1.2.3 From 2ee573fc5f9076d1773bd17c851cd581cc67582f Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Sat, 15 Oct 2022 21:09:03 +0200 Subject: led_update_kb -> led_update_ports where appropriate (#18716) Following #14452, less boilerplate is needed to customize indicator led control. --- keyboards/moonlander/moonlander.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 0844f16661..1357539382 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -370,12 +370,8 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander( #endif #ifdef CAPS_LOCK_STATUS -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - if(res) { - ML_LED_6(led_state.caps_lock); - } - return res; +void led_update_ports(led_t led_state) { + ML_LED_6(led_state.caps_lock); } #endif -- cgit v1.2.3 From d089af87030821e7bdd12c7187c5a583a8bf813d Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Sun, 16 Oct 2022 04:31:51 +0200 Subject: Mark the moonlander keyboard default music map as weak (#18715) This allows user keymaps to set a different music map. --- keyboards/moonlander/moonlander.c | 1 + keyboards/moonlander/moonlander.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 1357539382..80e1d04772 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -358,6 +358,7 @@ 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, diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h index 90ce84b3e3..19618a9e2a 100644 --- a/keyboards/moonlander/moonlander.h +++ b/keyboards/moonlander/moonlander.h @@ -55,9 +55,9 @@ extern bool mcp23018_leds[]; { 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, 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 } \ + { KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \ } // clang-format on @@ -83,4 +83,4 @@ typedef union { extern keyboard_config_t keyboard_config; -bool is_transport_connected(void); \ No newline at end of file +bool is_transport_connected(void); -- cgit v1.2.3 From c347e732be6b50500c1651b3fb8c0753b0c9c40d Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 20 Oct 2022 22:20:07 +1100 Subject: Remove legacy EEPROM clear keycodes (#18782) * `EEP_RST` -> `EE_CLR`, default-ish keymaps * `EEP_RST` -> `EE_CLR`, user keymaps * `EEP_RST` -> `EE_CLR`, community layouts * `EEP_RST` -> `EE_CLR`, userspace * `EEP_RST` -> `EE_CLR`, docs & core --- keyboards/moonlander/keymaps/default/keymap.c | 2 +- keyboards/moonlander/keymaps/via/keymap.c | 2 +- keyboards/moonlander/moonlander.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/keymaps/default/keymap.c b/keyboards/moonlander/keymaps/default/keymap.c index c0c2820307..d747e9eaf2 100644 --- a/keyboards/moonlander/keymaps/default/keymap.c +++ b/keyboards/moonlander/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, KC_UP, KC_7, KC_8, KC_9, KC_ASTR, KC_F12, _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, _______, _______, KC_DOWN, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_AMPR, KC_1, KC_2, KC_3, KC_BSLS, _______, - EEP_RST, _______, _______, _______, _______, RGB_VAI, RGB_TOG, _______, KC_DOT, KC_0, KC_EQL, _______, + EE_CLR, _______, _______, _______, _______, RGB_VAI, RGB_TOG, _______, KC_DOT, KC_0, KC_EQL, _______, RGB_HUD, RGB_VAD, RGB_HUI, TOGGLE_LAYER_COLOR,_______, _______ ), diff --git a/keyboards/moonlander/keymaps/via/keymap.c b/keyboards/moonlander/keymaps/via/keymap.c index ab36b4fc33..70264c240b 100644 --- a/keyboards/moonlander/keymaps/via/keymap.c +++ b/keyboards/moonlander/keymaps/via/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MDIA] = LAYOUT_moonlander( USER01, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, + _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 80e1d04772..8bde17b79e 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -321,7 +321,7 @@ bool music_mask_kb(uint16_t keycode) { case QK_MOD_TAP ... QK_MOD_TAP_MAX: case AU_ON ... MUV_DE: case QK_BOOT: - case EEP_RST: + case QK_CLEAR_EEPROM: return false; default: return music_mask_user(keycode); -- cgit v1.2.3 From 7cbff9d921879ef3c54837cb2ffc455e019f45b4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 22 Oct 2022 01:46:10 +1100 Subject: Deprecate `KC_LOCK` for `QK_LOCK` (#18796) --- keyboards/moonlander/keymaps/jjerrell/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/keymaps/jjerrell/keymap.c b/keyboards/moonlander/keymaps/jjerrell/keymap.c index 012b773678..ee6226177f 100644 --- a/keyboards/moonlander/keymaps/jjerrell/keymap.c +++ b/keyboards/moonlander/keymaps/jjerrell/keymap.c @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, __________________QWERTY_L1__________________, KC_SLSH, KC_LALT, __________________QWERTY_L2__________________, KC_BSLS, KC_LSFT, __________________QWERTY_L3__________________, - KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4, KC_LOCK, + KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4, QK_LOCK, KC_SPC, KC_BTN2, MO(_LOWER) ), [_GAME_LOWER] = LAYOUT_moonlander_gamepad( @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, __________________QWERTY_L1__________________, KC_SLSH, KC_LALT, __________________QWERTY_L2__________________, KC_BSLS, KC_LSFT, __________________QWERTY_L3__________________, - KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8, KC_LOCK, + KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8, QK_LOCK, KC_SPC, KC_BTN2, MO(_LOWER) ) }; -- cgit v1.2.3 From 4f63be4d1d44c7d4a154c14a982186e0ca27ceba Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 25 Oct 2022 06:07:34 +0100 Subject: Remove some assumptions on sequential keycode ranges (#18838) --- keyboards/moonlander/moonlander.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 8bde17b79e..29d13af3ee 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -316,8 +316,15 @@ led_config_t g_led_config = { { #ifdef AUDIO_ENABLE bool music_mask_kb(uint16_t keycode) { switch (keycode) { - case QK_LAYER_TAP ... QK_ONE_SHOT_LAYER_MAX: - case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX: + case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: + case QK_TO ... QK_TO_MAX: + case QK_MOMENTARY ... QK_MOMENTARY_MAX: + case QK_DEF_LAYER ... QK_DEF_LAYER_MAX: + case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX: + case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX: + case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: + case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: + case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX: case QK_MOD_TAP ... QK_MOD_TAP_MAX: case AU_ON ... MUV_DE: case QK_BOOT: -- cgit v1.2.3 From 5974d989fe72f6c576901a065bee4487a58c351d Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 1 Nov 2022 08:15:12 +1100 Subject: Normalise Unicode keycodes (#18898) * `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV` * `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*` * `UC_MAC` -> `UNICODE_MODE_MACOS` * `UC_LNX` -> `UNICODE_MODE_LINUX` * `UC_WIN` -> `UNICODE_MODE_WINDOWS` * `UC_BSD` -> `UNICODE_MODE_BSD` * `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE` * `UC_EMACS` -> `UNICODE_MODE_EMACS` * `UC__COUNT` -> `UNICODE_MODE_COUNT` * `UC_M_MA` -> `UC_MAC` * `UC_M_LN` -> `UC_LINX` * `UC_M_WI` -> `UC_WIN` * `UC_M_BS` -> `UC_BSD` * `UC_M_WC` -> `UC_WINC` * `UC_M_EM` -> `UC_EMAC` * Docs * Update quantum/unicode/unicode.h --- keyboards/moonlander/keymaps/drashna/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c index ced94786ef..e38a2828fe 100644 --- a/keyboards/moonlander/keymaps/drashna/keymap.c +++ b/keyboards/moonlander/keymaps/drashna/keymap.c @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,_______, KC_NUKE,KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, QK_BOOT, VRSN, _________________ADJUST_L1_________________, TG(_DIABLOII), _______, _________________ADJUST_R1_________________, EE_CLR, KEYLOCK, _________________ADJUST_L2_________________, _______, _______, _________________ADJUST_R2_________________, RGB_IDL, - UC_MOD, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, + UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AUTO_CTN, QK_RBT, _______, _______, _______, _______, _______ ), -- cgit v1.2.3 From 3b11e98215f1528287a28158837125408cbf3d9b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 22 Nov 2022 11:07:47 +0000 Subject: Update use of legacy keycodes (#19120) --- keyboards/moonlander/moonlander.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/moonlander') diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c index 29d13af3ee..2d6b1f037b 100644 --- a/keyboards/moonlander/moonlander.c +++ b/keyboards/moonlander/moonlander.c @@ -326,7 +326,7 @@ bool music_mask_kb(uint16_t keycode) { case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX: case QK_MOD_TAP ... QK_MOD_TAP_MAX: - case AU_ON ... MUV_DE: + case AU_ON ... AU_PREV: case QK_BOOT: case QK_CLEAR_EEPROM: return false; -- cgit v1.2.3