aboutsummaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2015-10-28 04:07:15 +0200
committerErez Zukerman <ezuk@madmimi.com>2015-10-28 04:07:15 +0200
commitd3db8d62f6fc6a7dee43978ddc8356579b502b37 (patch)
tree6d9445482ff1fd7d564fbc8494344056a120461e /quantum/keymap_common.c
parent2739aa8d780a8210eac30a284786d60dedc671bc (diff)
downloadqmk_firmware-d3db8d62f6fc6a7dee43978ddc8356579b502b37.tar.gz
qmk_firmware-d3db8d62f6fc6a7dee43978ddc8356579b502b37.zip
More work on ErgoDox EZ default keymap
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index fc889a308..6cc7adf51 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19#include "report.h" 19#include "report.h"
20#include "keycode.h" 20#include "keycode.h"
21#include "action_layer.h" 21#include "action_layer.h"
22#include <util/delay.h>
22#include "action.h" 23#include "action.h"
23#include "action_macro.h" 24#include "action_macro.h"
24#include "debug.h" 25#include "debug.h"
@@ -71,6 +72,8 @@ action_t action_for_key(uint8_t layer, keypos_t key)
71 return action; 72 return action;
72#endif 73#endif
73 } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here 74 } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here
75 clear_keyboard();
76 _delay_ms(250);
74 bootloader_jump(); 77 bootloader_jump();
75 return; 78 return;
76 } else if (keycode == DEBUG) { // DEBUG is 0x5001 79 } else if (keycode == DEBUG) { // DEBUG is 0x5001
@@ -78,7 +81,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
78 print("\nDEBUG: enabled.\n"); 81 print("\nDEBUG: enabled.\n");
79 debug_enable = true; 82 debug_enable = true;
80 return; 83 return;
81 } else if (keycode >= 0x5000 && keycode < 0x6000) { 84 } else if (keycode >= 0x5000 && keycode < 0x6000) {
82 // Layer movement shortcuts 85 // Layer movement shortcuts
83 // See .h to see constraints/usage 86 // See .h to see constraints/usage
84 int type = (keycode >> 0x8) & 0xF; 87 int type = (keycode >> 0x8) & 0xF;
@@ -107,7 +110,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
107 action_t action; 110 action_t action;
108 action.code = ACTION_LAYER_TOGGLE(layer); 111 action.code = ACTION_LAYER_TOGGLE(layer);
109 return action; 112 return action;
110 } 113 }
111#ifdef MIDI_ENABLE 114#ifdef MIDI_ENABLE
112 } else if (keycode >= 0x6000 && keycode < 0x7000) { 115 } else if (keycode >= 0x6000 && keycode < 0x7000) {
113 action_t action; 116 action_t action;