Add colemak annepro2HEADmain

1 files changed, 60 insertions, 129 deletions

diff --git a/keyboards/annepro2/keymaps/rbdr/keymap.c b/keyboards/annepro2/keymaps/rbdr/keymap.c
index b7aa2fd..c0843fb 100644
--- a/keyboards/annepro2/keymaps/rbdr/keymap.c
+++ b/keyboards/annepro2/keymaps/rbdr/keymap.c
@@ -1,17 +1,15 @@
 #include QMK_KEYBOARD_H
 
 enum anne_pro_layers {
-  BASE,
-  LAYER_1,
-  LAYER_2,
-  LAYER_3,
+  COLEMAK,
+  QWERTY,
+  FN,
+  SPECIAL,
 };
 
 enum tap_dance_keys {
     TD_ESC_GRV = 0,
-    TD_CTRL_L3,
-    TD_CAPS_L1,
-    TD_SHIFT_L2
+    TD_CAPS_FN
 };
 
 enum tap_dance_state {
@@ -41,9 +39,7 @@ enum tap_dance_state cur_dance(tap_dance_state_t *state) {
 }
 
 static td_tap_t esc_tap_state = {.is_press_action = true, .state = TD_NONE};
-static td_tap_t tab_tap_state = {.is_press_action = true, .state = TD_NONE};
 static td_tap_t ctrl_tap_state = {.is_press_action = true, .state = TD_NONE};
-static td_tap_t shift_tap_state = {.is_press_action = true, .state = TD_NONE};
 
 // ESC/Grave functions
 void esc_finished(tap_dance_state_t *state, void *user_data) {
@@ -76,37 +72,6 @@ void esc_reset(tap_dance_state_t *state, void *user_data) {
     esc_tap_state.state = TD_NONE;
 }
 
-// Left Ctrl/Layer 3 functions
-void ctrl_finished(tap_dance_state_t *state, void *user_data) {
-    tab_tap_state.state = cur_dance(state);
-    switch (tab_tap_state.state) {
-        case TD_SINGLE_TAP:
-        case TD_SINGLE_HOLD:
-            register_code(KC_LCTL);
-            break;
-        case TD_TAP_HOLD:
-            layer_on(3);  // Enable layer 3
-            break;
-        default:
-            break;
-    }
-}
-
-void ctrl_reset(tap_dance_state_t *state, void *user_data) {
-    switch (tab_tap_state.state) {
-        case TD_SINGLE_TAP:
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_LCTL);
-            break;
-        case TD_TAP_HOLD:
-            layer_off(3);  // Disable layer 3
-            break;
-        default:
-            break;
-    }
-    tab_tap_state.state = TD_NONE;
-}
-
 // Caps as Ctrl/Layer 1 functions
 void caps_finished(tap_dance_state_t *state, void *user_data) {
     ctrl_tap_state.state = cur_dance(state);
@@ -116,7 +81,7 @@ void caps_finished(tap_dance_state_t *state, void *user_data) {
             register_code(KC_LCTL);
             break;
         case TD_TAP_HOLD:
-            layer_on(1);  // Enable layer 1
+            layer_on(FN);  // Enable layer 1
             break;
         default:
             break;
@@ -130,7 +95,7 @@ void caps_reset(tap_dance_state_t *state, void *user_data) {
             unregister_code(KC_LCTL);
             break;
         case TD_TAP_HOLD:
-            layer_off(1);  // Disable layer 1
+            layer_off(FN);  // Disable layer 1
             break;
         default:
             break;
@@ -138,42 +103,9 @@ void caps_reset(tap_dance_state_t *state, void *user_data) {
     ctrl_tap_state.state = TD_NONE;
 }
 
-// Shift/Layer 2 functions
-void shift_finished(tap_dance_state_t *state, void *user_data) {
-    shift_tap_state.state = cur_dance(state);
-    switch (shift_tap_state.state) {
-        case TD_SINGLE_TAP:
-        case TD_SINGLE_HOLD:
-            register_code(KC_LSFT);
-            break;
-        case TD_TAP_HOLD:
-            layer_on(2);  // Enable layer 2
-            break;
-        default:
-            break;
-    }
-}
-
-void shift_reset(tap_dance_state_t *state, void *user_data) {
-    switch (shift_tap_state.state) {
-        case TD_SINGLE_TAP:
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_LSFT);
-            break;
-        case TD_TAP_HOLD:
-            layer_off(2);  // Disable layer 2
-            break;
-        default:
-            break;
-    }
-    shift_tap_state.state = TD_NONE;
-}
-
 tap_dance_action_t tap_dance_actions[] = {
     [TD_ESC_GRV] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, esc_finished, esc_reset),
-    [TD_CTRL_L3] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctrl_finished, ctrl_reset),
-    [TD_CAPS_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps_finished, caps_reset),
-    [TD_SHIFT_L2] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, shift_finished, shift_reset)
+    [TD_CAPS_FN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps_finished, caps_reset)
 };
 
 // clang-format off
@@ -183,11 +115,11 @@ tap_dance_action_t tap_dance_actions[] = {
 * ,-----------------------------------------------------------------------------------------.
 * | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
 * |-----------------------------------------------------------------------------------------+
-* | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
+* | Tab    |  q  |  w  |  f  |  p  |  b  |  j  |  l  |  u  |  y  |  ;  |  [  |  ]  |   \    |
 * |-----------------------------------------------------------------------------------------+
-* | Ctl     |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
+* | Ctl     |  a  |  r  |  s  |  t  |  g  |  m  |  n  |  e  |  i  |  o  |  '  |    Enter    |
 * |-----------------------------------------------------------------------------------------+
-* | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
+* | Shift      |  x  |  c  |  d  |  v  |  \  |  k  |  h  |  ,  |  .  |  /  |    Shift       |
 * |-----------------------------------------------------------------------------------------+
 * | Ctl   |  Alt  |  Gui  |               space             |  Gui  |  Alt  |  FN2  | Ctrl  |
 * \-----------------------------------------------------------------------------------------/
@@ -199,86 +131,85 @@ tap_dance_action_t tap_dance_actions[] = {
 * |-----------------------------------------------------------------------------------------+
 * | *1      |     |     |     |     |     |     |     |     |     |     |     |             |
 * |-----------------------------------------------------------------------------------------+
-* | *2         |     |     |     |     |     |     |     |     |     |     |       UP       |
+* |  Z         |     |     |     |     |     |     |     |     |     |     |       UP       |
 * |-----------------------------------------------------------------------------------------+
-* | *3    |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
+* |       |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
 * \-----------------------------------------------------------------------------------------/
 * *1-3 These double tap-hold to the selected layer
 * *` Double tap for grave/tilde
 */
  const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [BASE] = LAYOUT_60_ansi( /* Base */
-    TD(TD_ESC_GRV),  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_BSPC,
-    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,
-    TD(TD_CAPS_L1),  KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L,    KC_SCLN,         KC_QUOT,                KC_ENT,
-    TD(TD_SHIFT_L2),          KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,          KC_SLSH,                RSFT_T(KC_UP),
-    TD(TD_CTRL_L3),  KC_LALT, KC_LGUI,                   KC_SPC,             KC_RGUI, RALT_T(KC_LEFT), LT(LAYER_2,KC_DOWN),    RCTL_T(KC_RGHT)
+ [COLEMAK] = LAYOUT_60_ansi( /* Colemak DHm with angle mod */
+    TD(TD_ESC_GRV),    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_BSPC,
+    KC_TAB,            KC_Q,    KC_W,    KC_F, KC_P, KC_B,    KC_J,   KC_L, KC_U,    KC_Y,    KC_SCLN,         KC_LBRC, KC_RBRC, KC_BSLS,
+    TD(TD_CAPS_FN),    KC_A,    KC_R,    KC_S, KC_T, KC_G,    KC_M,   KC_N, KC_E,    KC_I,    KC_O,            KC_QUOT, KC_ENT,
+    LSFT_T(KC_Z),      KC_X,    KC_C,    KC_D, KC_V, KC_NUHS, KC_K,   KC_H, KC_COMM, KC_DOT,  KC_SLSH,         RSFT_T(KC_UP),
+    KC_LCTL,           KC_LALT, KC_LGUI,                   KC_SPC,                   KC_RGUI, RALT_T(KC_LEFT), LT(SPECIAL,KC_DOWN),    RCTL_T(KC_RGHT)
 ),
   /*
-  * Layer LAYER_1 -> Functions, Other Keys and Media
+  * Layer QWERTY -> Standard QWERTY layout
   * ,-----------------------------------------------------------------------------------------.
-  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
+  * | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO    | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 |  NO    |
+  * | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO     |MUTE |V-UP |V-DWN| NO  | NO  | NO  | NO  | NO  | NO  |HOME |PG-UP|     NO      |
+  * | Ctl     |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
   * |-----------------------------------------------------------------------------------------+
-  * |  Shift     |M-PRV|M-PLY|M-NXT| NO  | NO  |BR-DN|BR-UP| NO  | END |PG-DN|     Shift      |
+  * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
   * |-----------------------------------------------------------------------------------------+
-  * | Ctrl  |  Alt  |  Gui  |                NO               |  Gui  |  Alt  |  NO   | Ctrl  |
+  * | Ctl   |  Alt  |  Gui  |               space             |  Gui  |  Alt  |  FN2  | Ctrl  |
   * \-----------------------------------------------------------------------------------------/
-  *
   */
- [LAYER_1] = LAYOUT_60_ansi( /* Base */
-    KC_GRV,  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,
-    KC_NO,   KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18,             KC_F19,            KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24, KC_NO,
-    KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,  KC_NO,  KC_NO,              KC_NO,             KC_NO,   KC_NO,   KC_HOME, KC_PGUP, KC_NO,
-    KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,  KC_NO,   KC_NO,   KC_END,  KC_RSFT, KC_NO,
-    KC_LCTL, KC_LALT, KC_LGUI,                          KC_NO,                                          KC_RGUI, KC_RALT, KC_NO,   KC_RCTL
-),
+ [QWERTY] = LAYOUT_60_ansi( /* QWERTY */
+    TD(TD_ESC_GRV),  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_BSPC,
+    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,
+    TD(TD_CAPS_FN),  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_N, KC_M, KC_COMM, KC_DOT,          KC_SLSH,                RSFT_T(KC_UP),
+    KC_LCTL,         KC_LALT, KC_LGUI,                   KC_SPC,             KC_RGUI, RALT_T(KC_LEFT), LT(SPECIAL,KC_DOWN),    RCTL_T(KC_RGHT)
+ ),
   /*
-  * Layer LAYER_2 -> Bluetooth + LED
+  * Layer FN -> Functions, Other Keys and Media
   * ,-----------------------------------------------------------------------------------------.
-  * |  NO | BT1 | BT2 | BT3 | BT4 |  NO |  NO | HUE | SAT | BRI | SPD | LOFF|LTOG |     NO    |
+  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO    |  NO | NO  |  NO |  NO |  NO |  NO |  NO |  NO |  NO | NO |  NO  | NO  |   NO   |
+  * |  NO    | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 |  NO    |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO     | LINT| LSPD| NO  |  NO |  NO |LEFT |DOWN |  UP |RIGHT|  NO | NO  |     NO      |
+  * |  NO     |MUTE |V-UP |V-DWN| NO  | NO  |LEFT |DOWN | UP  |RIGHT|HOME |PG-UP|     NO      |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO        |LDPRV| NO  | NO  |  NO |  NO |  NO |  NO |  NO | NO  | NO  |     NO         |
+  * |  Shift     |M-PRV|M-PLY|M-NXT| NO  | NO  |BR-DN|BR-UP| NO  | END |PG-DN|     Shift      |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO   |  NO   |  NO   |                NO               |   NO  |  NO   |  NO   |  NO   |
+  * | Ctrl  |  Alt  |  Gui  |                NO               |  Gui  |  Alt  |  NO   | Ctrl  |
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [LAYER_2] = LAYOUT_60_ansi( /* Base */
-    KC_NO,  KC_AP2_BT1,               KC_AP2_BT2,      KC_AP2_BT3, KC_AP2_BT4, KC_NO, KC_NO,   RGB_HUI, RGB_SAI, RGB_VAI,  RGB_SPI, KC_AP_LED_OFF, KC_AP_RGB_TOG, KC_NO,
-    KC_NO,  KC_NO,                    KC_NO,           KC_NO,      KC_NO,      KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,         KC_NO,         KC_NO,
-    KC_NO,  KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_NO,      KC_NO,      KC_NO, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,         KC_NO,
-    KC_LSFT,                          KC_AP_RGB_MOD,   KC_NO,      KC_NO,      KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,         KC_NO,
-    KC_NO,  KC_NO,                    KC_NO,                                                             KC_NO,                     KC_NO,    KC_NO,   KC_NO,         KC_NO
- ),
+ [FN] = LAYOUT_60_ansi( /* Functions + HJKL Navigation */
+    KC_GRV,  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,
+    KC_NO,   KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18,             KC_F19,            KC_F20,    KC_F21,    KC_F22,  KC_F23,  KC_F24, KC_NO,
+    KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,  KC_NO,  KC_LEFT,            KC_DOWN,           KC_UP,     KC_RIGHT,  KC_HOME, KC_PGUP, KC_NO,
+    KC_LSFT,          KC_MPRV, KC_MPLY, KC_MNXT,KC_NO,  KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,  KC_NO,     KC_NO,     KC_END,  KC_PGDN, KC_RSFT,
+    KC_LCTL, KC_LALT, KC_LGUI,                          KC_NO,                                                       KC_RGUI, KC_RALT, KC_NO,   KC_RCTL
+),
   /*
-  * Layer LAYER_3 -> Special / Experiment / Danger
+  * Layer SPECIAL -> Bluetooth + LED
   * ,-----------------------------------------------------------------------------------------.
-  * |  SLP|WAKE | NO  | NO  | NO  |  NO |  NO | NO  | NO  | NO  | NO  | NO  | USB | Unpair    |
+  * |  NO | BT1 | BT2 | BT3 | BT4 |  NO |  NO | HUE | SAT | BRI | SPD | LOFF| LON |     NO    |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO    |  NO | NO  |  NO |  NO |  NO |  NO |  NO |  NO |  NO | NO |  NO  | NO  |   NO   |
+  * |  NO    |  NO | NO  |  NO |  NO |  NO |  NO |  NO |  NO |  NO | NO |LPREV |LNEXT|   NO   |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO     | NO  | NO  | NO  |  NO |  NO |  NO |  NO |  NO |  NO |  NO | NO  |     PWR     |
+  * |  NO     | LINT| LSPD| NO  |  NO |  NO |LEFT |DOWN |  UP |RIGHT|  NO | NO  |     NO      |
   * |-----------------------------------------------------------------------------------------+
-  * |  NO        |  NO |  NO |  NO |  NO |  NO |  NO |  NO |  NO | NO  | NO  |     NO         |
+  * |  NO        |LDPRV| NO  | NO  |  NO |  NO |  NO |  NO |  NO | NO  | NO  |     NO         |
   * |-----------------------------------------------------------------------------------------+
   * |  NO   |  NO   |  NO   |                NO               |   NO  |  NO   |  NO   |  NO   |
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [LAYER_3] = LAYOUT_60_ansi( /* Base */
-    KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_AP2_USB,     KC_AP2_BT_UNPAIR,
-    KC_NO,           KC_NO,          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,          KC_NO,
-    KC_NO,           KC_NO,          KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
-    KC_NO,                           KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO,           KC_NO,          KC_NO,                      KC_NO,               KC_NO, KC_NO, KC_NO, KC_NO
+ [SPECIAL] = LAYOUT_60_ansi( /* Bluetooth + LED + QWERTY toggle */
+    DF(QWERTY), KC_AP2_BT1,               KC_AP2_BT2,      KC_AP2_BT3, KC_AP2_BT4, KC_NO, KC_NO,   RM_HUEU, RM_SATU, RM_VALU,  RM_SPDU, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_RGB_TOG,
+    DF(COLEMAK),KC_NO,                    KC_NO,           KC_NO,      KC_NO,      KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_AP_LED_PREV_PROFILE,         KC_AP_LED_NEXT_PROFILE,         KC_NO,
+    KC_NO,      KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_NO,      KC_NO,      KC_NO, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,         KC_NO,
+    KC_LSFT,                              KC_AP_RGB_MOD,   KC_NO,      KC_NO,      KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,         KC_NO,
+    KC_NO,      KC_NO,                    KC_NO,                                                             KC_NO,                     KC_NO,    KC_NO,   KC_NO,         KC_NO
  ),
 };
 // clang-format on
@@ -290,16 +221,16 @@ void keyboard_post_init_user(void) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
   switch(get_highest_layer(state)) {
-    case LAYER_1:
+    case FN:
       // Set the leds to blue
       ap2_led_set_foreground_color(0x00, 0x00, 0xFF);
       break;
-    case LAYER_2:
+    case SPECIAL:
       // Set the leds to yellow
       ap2_led_set_foreground_color(0xFF, 0xFF, 0x00);
       break;
-    case LAYER_3:
-      // Set the leds to red
+    case QWERTY:
+      // Set the leds to red (QWERTY mode indicator)
       ap2_led_set_foreground_color(0xFF, 0x00, 0x00);
       break;
     default: