]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Add Bootmagic Lite for now
authorDrashna Jaelre <drashna@live.com>
Fri, 26 Oct 2018 05:08:49 +0000 (22:08 -0700)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Sun, 28 Oct 2018 15:44:58 +0000 (08:44 -0700)
users/drashna/config.h
users/drashna/drashna.c
users/drashna/drashna.h

index 4545b34ef67dc6efc209c2fa6d57b85c8e4ecc32..0d41359cca6de49ff4e3cb03b11358740096ef4b 100644 (file)
 
 #define MACRO_TIMER 5
 
-
+#if !defined(BOOTMAGIC_LITE) && !defined(BOOTMAGIC_ENABLE)
+#ifndef BOOTMAGIC_LITE_COLUMN
+  #define BOOTMAGIC_LITE_COLUMN 0
+#endif
+#ifndef BOOTMAGIC_LITE_ROW
+  #define BOOTMAGIC_LITE_ROW 0
+#endif
+#endif
index 5b9957c3da74664531c6b13c39d991d7ef42c654..35fa15be472121b140651fbfdee4e6d12e15d1ec 100644 (file)
@@ -81,6 +81,21 @@ bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t thi
   return false;
 }
 
+void bootmagic_lite(void) {
+  matrix_scan();
+  #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
+    wait_ms(DEBOUNCING_DELAY * 2);
+  #elif defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+  #else
+    wait_ms(30);
+  #endif
+  matrix_scan();
+   if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    bootloader_jump();
+  }
+}
+
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
 // customization of the keymap.  Use _keymap instead of _user
@@ -133,6 +148,10 @@ void eeconfig_init_keymap(void) {}
 // Call user matrix init, set default RGB colors and then
 // call the keymap's init function
 void matrix_init_user(void) {
+  #if !defined(BOOTMAGIC_LITE) && !defined(BOOTMAGIC_ENABLE)
+    bootmagic_lite();
+  #endif
+
   userspace_config.raw = eeconfig_read_user();
 
 #ifdef BOOTLOADER_CATERINA
index 7e69a9f8d9f4a7e8894871c4c2f8078af9f2b3f4..221a8e413e2d05f350a6d1219f99777fce817ca0 100644 (file)
@@ -353,4 +353,3 @@ NOTE: These are all the same length.  If you do a search/replace
 #define _________________ADJUST_R1_________________        KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5
 #define _________________ADJUST_R2_________________        AG_SWAP, QWERTY,  COLEMAK, DVORAK,  WORKMAN
 #define _________________ADJUST_R3_________________        MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT
-