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

Verify a new configuration before applying it

Browse Source
This commit is contained in:
Eric Tang
2017-08-07 11:19:41 -07:00
parent f817a5cbb9
commit 97336455b5
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
right/src/usb_protocol_handler.c
View File

@@ -85,10 +85,19 @@ void readMergeSensor(void)
void applyConfig(void)
{
UserConfigBuffer.offset = 0;
GenericHidOutBuffer[0] = ParseConfig(&UserConfigBuffer);
GenericHidOutBuffer[1] = UserConfigBuffer.offset;
GenericHidOutBuffer[2] = UserConfigBuffer.offset >> 8;
uint8_t *temp;
NewUserConfigBuffer.offset = 0;
GenericHidOutBuffer[0] = ParseConfig(&NewUserConfigBuffer);
GenericHidOutBuffer[1] = NewUserConfigBuffer.offset;
GenericHidOutBuffer[2] = NewUserConfigBuffer.offset >> 8;
if (GenericHidOutBuffer[0] == ParserError_Success) {
temp = UserConfigBuffer.buffer;
UserConfigBuffer.buffer = NewUserConfigBuffer.buffer;
NewUserConfigBuffer.buffer = temp;
UserConfigBuffer.offset = 0;
ParseConfig(&UserConfigBuffer);
}
}
void setLedPwm(void)
@@ -144,7 +153,7 @@ void writeConfiguration(bool isHardware)
return;
}
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : UserConfigBuffer.buffer;
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : NewUserConfigBuffer.buffer;
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {