Fix Typo in :flash target for missing bootloader (#6615)

* use layer_state_set_user

* fix

keyboards/ft/mars80/mars80.h

@@ -37,7 +37,7 @@
 { \
    { k00,   KC_NO, k02, k03, KC_NO, k05, k06,   k07,   k08, k09, KC_NO, KC_NO, KC_NO, k0D   }, \
    { k10,   k11,   k12, k13, k14,   k15, k16,   KC_NO, k18, k19, k1A,   k1B,   k1C,   k1D   }, \
-   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   KC_NO, k2D   }, \
+   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   k2C,   k2D   }, \
    { k30,   k31,   k32, k33, k34,   k35, k36,   k37,   k38, k39, k3A,   k3B,   k3C,   k3D   }, \
    { k40,   k41,   k42, k43, k44,   k45, k46,   k47,   k48, k49, k4A,   k4B,   k4C,   k4D   }, \
    { KC_NO, k51,   k52, k53, k54,   k55, k56,   k57,   k58, k59, k5A,   k5B,   k5C,   k5D   }, \
@@ -55,7 +55,7 @@
 { \
    { k00,   KC_NO, k02, k03, KC_NO, k05, k06,   k07,   k08, k09, KC_NO, KC_NO, KC_NO, k0D   }, \
    { k10,   k11,   k12, k13, k14,   k15, k16,   KC_NO, k18, k19, k1A,   k1B,   k1C,   k1D   }, \
-   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   KC_NO, k2D   }, \
+   { k20,   k21,   k22, k23, k24,   k25, k26,   k27,   k28, k29, k2A,   k2B,   k2C,   k2D   }, \
    { k30,   k31,   k32, k33, k34,   k35, k36,   k37,   k38, k39, k3A,   k3B,   k3C,   k3D   }, \
    { k40,   k41,   k42, k43, k44,   k45, k46,   k47,   k48, k49, k4A,   k4B,   k4C,   KC_NO }, \
    { KC_NO, k51,   k52, k53, k54,   k55, k56,   k57,   k58, k59, k5A,   k5B,   k5C,   k5D   }, \

keyboards/redox_w/keymaps/default/keymap.c

@@ -91,10 +91,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void matrix_scan_user(void) {
+layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = biton32(layer_state);
+    switch (get_highest_layer(state)) {
-
-    switch (layer) {
         case _QWERTY:
             set_led_off;
             break;
@@ -110,6 +108,7 @@ void matrix_scan_user(void) {
         default:
             break;
     }
-};
+  return state;
+}
 
 

tmk_core/avr.mk

@@ -347,5 +347,5 @@ else ifeq ($(strip $(BOOTLOADER)), USBasp)
 else ifeq ($(strip $(BOOTLOADER)), bootloadHID)
 	$(call EXEC_BOOTLOADHID)
 else
-	$(PRINT_OK); $(SILENT) || printf "&(MSG_FLASH_BOOTLOADER)"
+	$(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_BOOTLOADER)"
 endif