uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserve state across resets by putting Wormhole to the newly added .noinit section. Rename The jump to bootloader USB command to reenumerate and generalize accordingly by handling the passed reenumeration mode.

Browse Source
This commit is contained in:
László Monda
2017-06-04 23:32:48 +02:00
parent a6ed51360f
commit 6c60af4ba8
7 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
right/src/usb_protocol_handler.c
View File

@@ -16,7 +16,7 @@ void setError(uint8_t error);
void setGenericError();
void usbProtocolHandler();
void getSystemProperty();
void jumpToBootloader();
void reenumerate();
void setTestLed();
void writeLedDriver();
void readLedDriver();
@@ -55,8 +55,8 @@ void usbProtocolHandler()
case USB_COMMAND_GET_SYSTEM_PROPERTY:
getSystemProperty();
break;
case USB_COMMAND_JUMP_TO_BOOTLOADER:
jumpToBootloader();
case USB_COMMAND_REENUMERATE:
reenumerate();
break;
case USB_COMMAND_SET_TEST_LED:
setTestLed();
@@ -114,8 +114,9 @@ void getSystemProperty() {
}
}
void jumpToBootloader() {
// Wormhole->magicNumber = WORMHOLE_MAGIC_NUMBER;
void reenumerate() {
Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;
Wormhole.enumerationMode = GenericHidInBuffer[1];
SCB->AIRCR = 0x5FA<<SCB_AIRCR_VECTKEY_Pos | SCB_AIRCR_SYSRESETREQ_Msk; // Reset the MCU.
for (;;);
}