core: Fix variable init and header include

[max/tmk_keyboard.git] / tmk_core / common / keymap.c

diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c
index bf7ddee7923bc689547cbd5477d486536128abf4..f6a151721940d481cbbb3531b8da491a37c59777 100644 (file)
--- a/tmk_core/common/keymap.c
+++ b/tmk_core/common/keymap.c
@@ -14,15 +14,15 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <util/delay.h>
 #include "keymap.h"
 #include "report.h"
 #include "keycode.h"
 #include "action_layer.h"
 #include "action.h"
 #include "action_macro.h"
+#include "wait.h"
 #include "debug.h"
-#include "print.h"
+#include "bootloader.h"
 
 
 static action_t keycode_to_action(uint8_t keycode);
@@ -124,7 +124,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 /* translates keycode to action */
 static action_t keycode_to_action(uint8_t keycode)
 {
-    action_t action;
+    action_t action = {};
     switch (keycode) {
         case KC_A ... KC_EXSEL:
         case KC_LCTRL ... KC_RGUI:
@@ -142,12 +142,10 @@ static action_t keycode_to_action(uint8_t keycode)
         case KC_TRNS:
             action.code = ACTION_TRANSPARENT;
             break;
-        case KC_RESET:
+        case KC_BOOTLOADER:
             clear_keyboard();
-            print("\n\nJump to bootloader... ");
-            _delay_ms(50);
-            bootloader_jump();
-            print("not supported.\n");
+            wait_ms(50);
+            bootloader_jump(); // not return
             break;
         default:
             action.code = ACTION_NO;