diff options
Diffstat (limited to 'keyboards/zsa/moonlander/moonlander.c')
| -rw-r--r-- | keyboards/zsa/moonlander/moonlander.c | 240 |
1 files changed, 94 insertions, 146 deletions
diff --git a/keyboards/zsa/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c index 02c64f4b96..14405fc412 100644 --- a/keyboards/zsa/moonlander/moonlander.c +++ b/keyboards/zsa/moonlander/moonlander.c @@ -23,76 +23,95 @@ keyboard_config_t keyboard_config; bool mcp23018_leds[3] = {0, 0, 0}; bool is_launching = false; -#ifdef DYNAMIC_MACRO_ENABLE -static bool is_dynamic_recording = false; - -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; - ML_LED_3(false); +#if defined(DEFERRED_EXEC_ENABLE) +# if defined(DYNAMIC_MACRO_ENABLE) +deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN; + +static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) { + static bool led_state = true; + if (!is_launching) { + led_state = !led_state; + ML_LED_3(led_state); + } + return 100; } -#endif -void moonlander_led_task(void) { - if (is_launching) { - ML_LED_1(false); - ML_LED_2(false); - ML_LED_3(false); - ML_LED_4(false); - ML_LED_5(false); - ML_LED_6(false); - - ML_LED_1(true); - wait_ms(250); - ML_LED_2(true); - wait_ms(250); - ML_LED_3(true); - wait_ms(250); - ML_LED_4(true); - wait_ms(250); - ML_LED_5(true); - wait_ms(250); - ML_LED_6(true); - wait_ms(250); - ML_LED_1(false); - wait_ms(250); - ML_LED_2(false); - wait_ms(250); - ML_LED_3(false); - wait_ms(250); - ML_LED_4(false); - wait_ms(250); - ML_LED_5(false); - wait_ms(250); - ML_LED_6(false); - wait_ms(250); - is_launching = false; - layer_state_set_kb(layer_state); +bool dynamic_macro_record_start_kb(int8_t direction) { + if (!dynamic_macro_record_start_user(direction)) { + return false; } -#ifdef DYNAMIC_MACRO_ENABLE - else if (is_dynamic_recording) { + if (dynamic_macro_token == INVALID_DEFERRED_TOKEN) { ML_LED_3(true); - wait_ms(100); - ML_LED_3(false); - wait_ms(155); - } -#endif -#if !defined(MOONLANDER_USER_LEDS) - else { - layer_state_set_kb(layer_state); + dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL); } -#endif + return true; } -static THD_WORKING_AREA(waLEDThread, 128); -static THD_FUNCTION(LEDThread, arg) { - (void)arg; - chRegSetThreadName("LEDThread"); - while (true) { - moonlander_led_task(); +bool dynamic_macro_record_end_kb(int8_t direction) { + if (!dynamic_macro_record_end_user(direction)) { + return false; } + if (cancel_deferred_exec(dynamic_macro_token)) { + dynamic_macro_token = INVALID_DEFERRED_TOKEN; + ML_LED_3(false); + } + return false; } +# endif + +static uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) { + static uint8_t startup_loop = 0; + + switch (startup_loop++) { + case 0: + ML_LED_1(true); + ML_LED_2(false); + ML_LED_3(false); + ML_LED_4(false); + ML_LED_5(false); + ML_LED_6(false); + break; + case 1: + ML_LED_2(true); + break; + case 2: + ML_LED_3(true); + break; + case 3: + ML_LED_4(true); + break; + case 4: + ML_LED_5(true); + break; + case 5: + ML_LED_6(true); + break; + case 6: + ML_LED_1(false); + break; + case 7: + ML_LED_2(false); + break; + case 8: + ML_LED_3(false); + break; + case 9: + ML_LED_4(false); + break; + case 10: + ML_LED_5(false); + break; + case 11: + ML_LED_6(false); + break; + case 12: + is_launching = false; + layer_state_set_kb(layer_state); + return 0; + } + return 250; +} +#endif void keyboard_pre_init_kb(void) { gpio_set_pin_output(B5); @@ -103,13 +122,6 @@ void keyboard_pre_init_kb(void) { gpio_write_pin_low(B4); gpio_write_pin_low(B3); - chThdCreateStatic(waLEDThread, sizeof(waLEDThread), NORMALPRIO - 16, LEDThread, NULL); - - /* the array is initialized to 0, no need to re-set it here */ - // mcp23018_leds[0] = 0; // blue - // mcp23018_leds[1] = 0; // green - // mcp23018_leds[2] = 0; // red - keyboard_pre_init_user(); } @@ -173,13 +185,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) { #ifdef RGB_MATRIX_ENABLE // clang-format off const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { -/* Refer to IS31 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, C3_2, C1_1, C4_2}, // 1 + {0, C3_2, C1_1, C4_2}, {0, C2_2, C1_2, C4_3}, {0, C2_3, C1_3, C3_3}, {0, C2_4, C1_4, C3_4}, @@ -189,7 +195,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {0, C2_8, C1_8, C3_8}, {0, C3_1, C2_1, C4_1}, - {0, C7_8, C6_8, C8_8}, // 10 + {0, C7_8, C6_8, C8_8}, {0, C7_7, C6_7, C9_8}, {0, C8_7, C6_6, C9_7}, {0, C8_6, C7_6, C9_6}, @@ -199,7 +205,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {0, C8_2, C7_2, C9_2}, {0, C8_1, C7_1, C9_1}, - {0, C3_10, C1_9, C4_10}, // 19 + {0, C3_10, C1_9, C4_10}, {0, C2_10, C1_10, C4_11}, {0, C2_11, C1_11, C3_11}, {0, C2_12, C1_12, C3_12}, @@ -209,7 +215,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {0, C2_16, C1_16, C3_16}, {0, C3_9, C2_9, C4_9}, - {0, C7_16, C6_16, C8_16}, // 28 + {0, C7_16, C6_16, C8_16}, {0, C7_15, C6_15, C9_16}, {0, C8_15, C6_14, C9_15}, {0, C8_10, C7_10, C9_10}, @@ -219,7 +225,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {0, C8_13, C7_13, C9_13}, {0, C8_14, C7_14, C9_14}, - {1, C3_2, C1_1, C4_2}, // 1 + {1, C3_2, C1_1, C4_2}, {1, C2_2, C1_2, C4_3}, {1, C2_3, C1_3, C3_3}, {1, C2_4, C1_4, C3_4}, @@ -229,7 +235,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {1, C2_8, C1_8, C3_8}, {1, C3_1, C2_1, C4_1}, - {1, C7_8, C6_8, C8_8}, // 10 + {1, C7_8, C6_8, C8_8}, {1, C7_7, C6_7, C9_8}, {1, C8_7, C6_6, C9_7}, {1, C8_6, C7_6, C9_6}, @@ -239,7 +245,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {1, C8_2, C7_2, C9_2}, {1, C8_1, C7_1, C9_1}, - {1, C3_10, C1_9, C4_10}, // 19 + {1, C3_10, C1_9, C4_10}, {1, C2_10, C1_10, C4_11}, {1, C2_11, C1_11, C3_11}, {1, C2_12, C1_12, C3_12}, @@ -249,7 +255,7 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {1, C2_16, C1_16, C3_16}, {1, C3_9, C2_9, C4_9}, - {1, C7_16, C6_16, C8_16}, // 28 + {1, C7_16, C6_16, C8_16}, {1, C7_15, C6_15, C9_16}, {1, C8_15, C6_14, C9_15}, {1, C8_10, C7_10, C9_10}, @@ -258,61 +264,8 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { {1, C8_12, C7_12, C9_12}, {1, C8_13, C7_13, C9_13}, {1, C8_14, C7_14, C9_14}, - }; - -led_config_t g_led_config = { { - { 0, 5, 10, 15, 20, 25, 29 }, - { 1, 6, 11, 16, 21, 26, 30 }, - { 2, 7, 12, 17, 22, 27, 31 }, - { 3, 8, 13, 18, 23, 28, NO_LED }, - { 4, 9, 14, 19, 24, NO_LED, NO_LED }, - { 32, 33, 34, 35, NO_LED, NO_LED, NO_LED }, - { 65, 61, 56, 51, 46, 41, 36 }, - { 66, 62, 57, 52, 47, 42, 37 }, - { 67, 63, 58, 53, 48, 43, 38 }, - { NO_LED, 64, 59, 54, 49, 44, 39 }, - { NO_LED, NO_LED, 60, 55, 50, 45, 40 }, - { NO_LED, NO_LED, NO_LED, 71, 70, 69, 68 } -}, { - { 0, 4}, { 0, 20}, { 0, 36}, { 0, 52}, { 0, 68}, - { 16, 3}, { 16, 19}, { 16, 35}, { 16, 51}, { 16, 67}, - { 32, 1}, { 32, 17}, { 32, 33}, { 32, 49}, { 32, 65}, - { 48, 0}, { 48, 16}, { 48, 32}, { 48, 48}, { 48, 64}, - { 64, 1}, { 64, 17}, { 64, 33}, { 64, 49}, { 64, 65}, - { 80, 3}, { 80, 19}, { 80, 35}, { 80, 51}, - { 96, 4}, { 96, 20}, { 96, 36}, - { 88, 69}, {100, 80}, {112, 91}, {108, 69}, - - {240, 4}, {240, 20}, {240, 36}, {240, 52}, {240, 68}, - {224, 3}, {224, 19}, {224, 35}, {224, 51}, {224, 67}, - {208, 1}, {208, 17}, {208, 33}, {208, 49}, {208, 65}, - {192, 0}, {192, 16}, {192, 32}, {192, 48}, {192, 64}, - {176, 1}, {176, 17}, {176, 33}, {176, 49}, {176, 65}, - {160, 3}, {160, 19}, {160, 35}, {160, 51}, - {144, 4}, {144, 20}, {144, 36}, - {152, 69}, {140, 80}, {128, 91}, {132, 69} -}, { - 1, 1, 1, 1, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, - 1, 1, 1, - 1, 1, 1, 1, - - 1, 1, 1, 1, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, 1, - 4, 4, 4, 4, - 1, 1, 1, - 1, 1, 1, 1 -} }; // clang-format on - #endif #ifdef AUDIO_ENABLE @@ -358,11 +311,6 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { {{6,5}, {5,5}, {4,5}, {3,5}, {2,5}, {1,5},{0,5}}, }; // clang-format on - -void keyboard_post_init_kb(void) { - rgb_matrix_enable_noeeprom(); - keyboard_post_init_user(); -} #endif #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) @@ -441,7 +389,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -void matrix_init_kb(void) { +void keyboard_post_init_kb(void) { keyboard_config.raw = eeconfig_read_kb(); if (!keyboard_config.led_level && !keyboard_config.led_level_res) { @@ -450,11 +398,11 @@ void matrix_init_kb(void) { eeconfig_update_kb(keyboard_config.raw); } #ifdef RGB_MATRIX_ENABLE - if (keyboard_config.rgb_matrix_enable) { - rgb_matrix_set_flags(LED_FLAG_ALL); - } else { - rgb_matrix_set_flags(LED_FLAG_NONE); - } + rgb_matrix_enable_noeeprom(); +#endif +#if defined(DEFERRED_EXEC_ENABLE) + is_launching = true; + defer_exec(500, startup_exec, NULL); #endif matrix_init_user(); } |