shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

compile for bootloader

Browse Source
This commit is contained in:
Conor Patrick 2019-02-08 13:09:32 -05:00
parent 665e84d183
commit 120fb95541
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
targets/stm32l432/src/device.c
View File

@ -70,12 +70,13 @@ void TIM6_DAC_IRQHandler()
ctaphid_update_status(__device_status); ctaphid_update_status(__device_status);
} }
} }
#ifndef IS_BOOTLOADER
// NFC sending WTX if needs // NFC sending WTX if needs
if (haveNFC) if (haveNFC)
{ {
WTX_timer_exec(); WTX_timer_exec();
} }
#endif
} }
// Global USB interrupt handler // Global USB interrupt handler
@ -127,6 +128,7 @@ void device_init()
hw_init(HIGH_FREQUENCY); hw_init(HIGH_FREQUENCY);
isLowFreq = 0; isLowFreq = 0;
#ifndef IS_BOOTLOADER #ifndef IS_BOOTLOADER
#if BOOT_TO_DFU #if BOOT_TO_DFU
flash_option_bytes_init(1); flash_option_bytes_init(1);
@ -135,13 +137,8 @@ void device_init()
#endif #endif
printf1(TAG_GEN,"init nfc\n"); printf1(TAG_GEN,"init nfc\n");
haveNFC = nfc_init(); haveNFC = nfc_init();
// if (haveNFC)
// printf1(TAG_GEN,"NFC OK.\n");
// else
// printf1(TAG_GEN,"NFC not found.\n");
#endif #endif
// printf1(TAG_GEN,"hello solo\r\n");
} }
void wait_for_usb_tether() void wait_for_usb_tether()