Compare commits

..

4 Commits

Author SHA1 Message Date
Conor Patrick
873c514b2f bump 3.0.0 2019-10-28 13:17:58 -04:00
Conor Patrick
21f3a0d10f remove hacker constraint for booting into bootloader 2019-10-28 12:55:38 -04:00
allcontributors[bot]
b535b41d92 docs: update .all-contributorsrc 2019-10-28 11:09:54 -04:00
allcontributors[bot]
fd32cc0761 docs: update README.md 2019-10-28 11:09:54 -04:00
2 changed files with 2 additions and 7 deletions

View File

@@ -1 +1 @@
2.5.3 3.0.0

View File

@@ -46,9 +46,7 @@ int main()
{ {
uint8_t hidmsg[64]; uint8_t hidmsg[64];
uint32_t t1 = 0; uint32_t t1 = 0;
#ifdef SOLO_HACKER
uint32_t stboot_time = 0; uint32_t stboot_time = 0;
#endif
uint32_t boot = 1; uint32_t boot = 1;
set_logging_mask( set_logging_mask(
@@ -98,7 +96,6 @@ int main()
} }
#ifdef SOLO_HACKER
if (!is_bootloader_disabled()) if (!is_bootloader_disabled())
{ {
stboot_time = millis(); stboot_time = millis();
@@ -108,7 +105,6 @@ int main()
goto start_bootloader; goto start_bootloader;
} }
} }
#endif
if (is_authorized_to_boot() && (boot || is_bootloader_disabled())) if (is_authorized_to_boot() && (boot || is_bootloader_disabled()))
{ {
@@ -119,9 +115,8 @@ int main()
printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR); printf1(TAG_RED,"Not authorized to boot (%08x == %08lx)\r\n", AUTH_WORD_ADDR, *(uint32_t*)AUTH_WORD_ADDR);
} }
#ifdef SOLO_HACKER
start_bootloader: start_bootloader:
#endif
SystemClock_Config(); SystemClock_Config();
init_gpio(); init_gpio();
init_millisecond_timer(0); init_millisecond_timer(0);