[Keymap] Update keymap for alice and fix for ctrl and os swap (#6642)

* update map for alice and fix for via boards

* enable bootmagic

3 files changed, 21 insertions, 12 deletions

diff --git a/keyboards/projectkb/alice/config.h b/keyboards/projectkb/alice/config.h
index 2a6e81f1d..cc0386ae6 100644
--- a/keyboards/projectkb/alice/config.h
+++ b/keyboards/projectkb/alice/config.h
@@ -71,7 +71,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define EEPROM_CUSTOM_BACKLIGHT 804
 
-
+#undef EEPROM_MAGIC_ADDR
+#define EEPROM_MAGIC_ADDR 34
+#undef EEPROM_VERSION_ADDR
+#define EEPROM_VERSION_ADDR 36
+#undef RGB_BACKLIGHT_CONFIG_EEPROM_ADDR
+#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 37
+#undef DYNAMIC_KEYMAP_EEPROM_ADDR 
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 68
+#undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 66
 
 /*
  * Feature disable options
diff --git a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
index 7ebb670e0..0f63a607a 100644
--- a/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
+++ b/keyboards/projectkb/alice/keymaps/madhatter/keymap.c
@@ -25,19 +25,19 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_default(
-    KC_ESC,  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
-    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_PGDN, KC_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RALT,
-             KC_LCTL,          KC_LALT, KC_ENT,  KC_LCMD,                           KC_SPC,           FNM,              KC_RCTL
+    KC_ESC,  KC_GESC, KC_1,  KC_2,    KC_3,   KC_4,    KC_5,  KC_6,  KC_7,   KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
+    KC_PGUP, KC_TAB,  KC_Q,  KC_W,    KC_E,   KC_R,    KC_T,         KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_PGDN, KC_GRV,  KC_A,  KC_S,    KC_D,   KC_F,    KC_G,         KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+             KC_LSFT, KC_Z,  KC_X,    KC_C,   KC_V,    KC_B,         KC_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNM,
+             KC_LCTL,                   KC_LCMD, KC_ENT, FNM,         KC_SPC,       KC_RCMD,                            KC_RCTL
   ),
 
   [_FNM] = LAYOUT_default(
-    RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
-    RGB_MOD, _______, _______, _______, _______, _______, _______,         RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______,   RESET,
-    VLK_TOG, _______, _______, _______, _______, _______, _______,         KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______,          _______,
-             _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,         _______, _______, _______, _______, _______, _______, _______, _______,
-             _______,         _______,  _______, _______,                           _______,          _______,          _______
+    RGB_TOG, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
+    RGB_MOD, _______, _______, _______, _______, _______, _______,        RGB_SAI, RGB_HUI, RGB_VAI, RGB_SAD, RGB_HUD, RGB_VAD, _______,   RESET,
+    VLK_TOG, _______, _______, _______, _______, _______, _______,        KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______,          EEP_RST,
+             _______, BL_INC,  BL_DEC,  BL_TOGG, BL_BRTG, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
+             _______,         _______,  _______, _______,                          _______,          _______,          _______
   )
 };
 
diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk
index caebb88ae..606ffda18 100644
--- a/keyboards/projectkb/alice/rules.mk
+++ b/keyboards/projectkb/alice/rules.mk
@@ -40,7 +40,7 @@ VPATH += keyboards/cannonkeys/stm32f072
 SRC =   keyboard.c \
       led.c
 
-#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes   # Mouse keys
 EXTRAKEY_ENABLE = yes   # Audio control and System control
 CONSOLE_ENABLE = yes    # Console for debug