summaryrefslogtreecommitdiff
path: root/keyboard/planck/keymaps/pvc_planck.c
diff options
context:
space:
mode:
authorJack Humbert2016-04-18 21:03:21 -0400
committerJack Humbert2016-04-18 21:03:21 -0400
commitf2c1e9ddd40573f4b44ffc2ec7df1fb76346f627 (patch)
treeda477a9e67e16339267ee0946c3b253c612c7bbf /keyboard/planck/keymaps/pvc_planck.c
parentd94960be5b32b6a4019b822550ae09cf802bfcd7 (diff)
parent499e3096e9021b88a6a705ad7034ccbacb97b975 (diff)
Merge pull request #262 from IBNobody/master
Fixed keyboard snoring while asleep
Diffstat (limited to 'keyboard/planck/keymaps/pvc_planck.c')
-rw-r--r--keyboard/planck/keymaps/pvc_planck.c24
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] = {
*/
[_FN] = {
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
- {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MG_H, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
+ {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
}
};
@@ -142,16 +142,6 @@ const uint16_t PROGMEM fn_actions[] = {
};
-int tri_layer = 0;
-void update_tri_layer(int layer) {
- if (tri_layer > 1) {
- layer_on(layer);
- } else {
- layer_off(layer);
- }
-}
-
-
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
// 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)
if (record->event.pressed) {
print("RS_DN");
layer_on(_RS);
- tri_layer++;
- update_tri_layer(_FN);
+ update_tri_layer(_RS, _LW, _FN);
} else {
print("RS_UP");
layer_off(_RS);
- tri_layer--;
- update_tri_layer(_FN);
+ update_tri_layer(_RS, _LW, _FN);
phex(layer_state);
}
break;
@@ -176,13 +164,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) {
print("LW_DN");
layer_on(_LW);
- tri_layer++;
- update_tri_layer(_FN);
+ update_tri_layer(_RS, _LW, _FN);
} else {
print("LW_UP");
layer_off(_LW);
- tri_layer--;
- update_tri_layer(_FN);
+ update_tri_layer(_RS, _LW, _FN);
}
break;