diff options
Diffstat (limited to 'keyboard/planck/keymaps/pvc_planck.c')
| -rw-r--r-- | keyboard/planck/keymaps/pvc_planck.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/keyboard/planck/keymaps/pvc_planck.c b/keyboard/planck/keymaps/pvc_planck.c index 20bb5d86d..1de8acb1e 100644 --- a/keyboard/planck/keymaps/pvc_planck.c +++ b/keyboard/planck/keymaps/pvc_planck.c | |||
| @@ -131,8 +131,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 131 | */ | 131 | */ |
| 132 | [_FN] = { | 132 | [_FN] = { |
| 133 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | 133 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, |
| 134 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MG_H, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | ||
| 135 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | 134 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, |
| 135 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, | ||
| 136 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} | 136 | {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} |
| 137 | } | 137 | } |
| 138 | }; | 138 | }; |
| @@ -142,16 +142,6 @@ const uint16_t PROGMEM fn_actions[] = { | |||
| 142 | }; | 142 | }; |
| 143 | 143 | ||
| 144 | 144 | ||
| 145 | int tri_layer = 0; | ||
| 146 | void update_tri_layer(int layer) { | ||
| 147 | if (tri_layer > 1) { | ||
| 148 | layer_on(layer); | ||
| 149 | } else { | ||
| 150 | layer_off(layer); | ||
| 151 | } | ||
| 152 | } | ||
| 153 | |||
| 154 | |||
| 155 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 145 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 156 | { | 146 | { |
| 157 | // MACRODOWN only works in this function | 147 | // MACRODOWN only works in this function |
| @@ -161,13 +151,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 161 | if (record->event.pressed) { | 151 | if (record->event.pressed) { |
| 162 | print("RS_DN"); | 152 | print("RS_DN"); |
| 163 | layer_on(_RS); | 153 | layer_on(_RS); |
| 164 | tri_layer++; | 154 | update_tri_layer(_RS, _LW, _FN); |
| 165 | update_tri_layer(_FN); | ||
| 166 | } else { | 155 | } else { |
| 167 | print("RS_UP"); | 156 | print("RS_UP"); |
| 168 | layer_off(_RS); | 157 | layer_off(_RS); |
| 169 | tri_layer--; | 158 | update_tri_layer(_RS, _LW, _FN); |
| 170 | update_tri_layer(_FN); | ||
| 171 | phex(layer_state); | 159 | phex(layer_state); |
| 172 | } | 160 | } |
| 173 | break; | 161 | break; |
| @@ -176,13 +164,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 176 | if (record->event.pressed) { | 164 | if (record->event.pressed) { |
| 177 | print("LW_DN"); | 165 | print("LW_DN"); |
| 178 | layer_on(_LW); | 166 | layer_on(_LW); |
| 179 | tri_layer++; | 167 | update_tri_layer(_RS, _LW, _FN); |
| 180 | update_tri_layer(_FN); | ||
| 181 | } else { | 168 | } else { |
| 182 | print("LW_UP"); | 169 | print("LW_UP"); |
| 183 | layer_off(_LW); | 170 | layer_off(_LW); |
| 184 | tri_layer--; | 171 | update_tri_layer(_RS, _LW, _FN); |
| 185 | update_tri_layer(_FN); | ||
| 186 | } | 172 | } |
| 187 | break; | 173 | break; |
| 188 | 174 | ||
