summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorpatrickmt <40182064+patrickmt@users.noreply.github.com>2018-09-28 22:34:56 -0400
committerJack Humbert <jack.humb@gmail.com>2018-09-28 23:09:53 -0400
commitdaf0cc60bff54be948c923cdc40aa80b82a27f6d (patch)
tree121de3f118e7fbc325eb79d23e3dc58c95b99e76 /tmk_core/common
parent20a10bd0846d502069203419f57e36fd7467df5e (diff)
CTRL keyboard bootloader_jump support
Adds support for CTRL keyboards to enter bootloader via bootloader_jump()
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/arm_atsam/bootloader.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/tmk_core/common/arm_atsam/bootloader.c b/tmk_core/common/arm_atsam/bootloader.c
index 9701a62196..ba71bfeb0b 100644
--- a/tmk_core/common/arm_atsam/bootloader.c
+++ b/tmk_core/common/arm_atsam/bootloader.c
@@ -16,25 +16,27 @@
#include "bootloader.h"
#include "samd51j18a.h"
+#include "md_bootloader.h"
//Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
-void bootloader_jump(void)
-{
- //Keyboards released with certain bootloader can not enter bootloader from app until workaround is created
- uint8_t ver_no_jump[] = "v2.18Jun 22 2018 17:28:08";
- uint8_t *ver_check = ver_no_jump;
- uint8_t *boot_check = (uint8_t *)0x21A0;
- while (*ver_check && *boot_check == *ver_check)
- {
- ver_check++;
- boot_check++;
+void bootloader_jump(void) {
+#ifdef KEYBOARD_massdrop_ctrl
+ //CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
+ uint8_t ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; //The version to match (NULL terminated by compiler)
+ uint8_t *ver_check = ver_ram_method; //Pointer to version match string for traversal
+ uint8_t *ver_rom = (uint8_t *)0x21A0; //Pointer to address in ROM where this specific bootloader version would exist
+
+ while (*ver_check && *ver_rom == *ver_check) { //While there are check version characters to match and bootloader's version matches check's version
+ ver_check++; //Move check version pointer to next character
+ ver_rom++; //Move ROM version pointer to next character
}
- if (!*ver_check)
- {
- //Version match
- //Software workaround would go here
- return; //No software restart method implemented... must use hardware reset button
+
+ if (!*ver_check) { //If check version pointer is NULL, all characters have matched
+ *MAGIC_ADDR = BOOTLOADER_MAGIC; //Set magic number into RAM
+ NVIC_SystemReset(); //Perform system reset
+ while (1) {} //Won't get here
}
+#endif
WDT->CTRLA.bit.ENABLE = 0;
while (WDT->SYNCBUSY.bit.ENABLE) {}