sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix settings checksum issues

pull/4/head
Paul Hollinsky 2018-10-04 12:31:04 -04:00
parent acfeacedfc
commit d86f15ab4c
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
device/idevicesettings.cpp
View File

@ -42,7 +42,7 @@ uint16_t IDeviceSettings::CalculateGSChecksum(const std::vector<uint8_t>& settin
return gs_crc; return gs_crc;
} }
void IDeviceSettings::refresh() { void IDeviceSettings::refresh(bool ignoreChecksum) {
std::vector<uint8_t> rxSettings; std::vector<uint8_t> rxSettings;
bool ret = com->getSettingsSync(rxSettings); bool ret = com->getSettingsSync(rxSettings);
if(ret) { if(ret) {
@ -67,7 +67,7 @@ void IDeviceSettings::refresh() {
return; return;
} }
if(gs_chksum != CalculateGSChecksum(rxSettings)) { if(!ignoreChecksum && gs_chksum != CalculateGSChecksum(rxSettings)) {
std::cout << "Checksum mismatch while reading settings" << std::endl; std::cout << "Checksum mismatch while reading settings" << std::endl;
return; return;
} }
@ -98,8 +98,23 @@ bool IDeviceSettings::send() {
com->sendCommand(Command::SetSettings, bytestream); com->sendCommand(Command::SetSettings, bytestream);
std::shared_ptr<Message> msg = com->waitForMessageSync(std::make_shared<Main51MessageFilter>(Command::SetSettings), std::chrono::milliseconds(1000)); std::shared_ptr<Message> msg = com->waitForMessageSync(std::make_shared<Main51MessageFilter>(Command::SetSettings), std::chrono::milliseconds(1000));
if(!msg || msg->data[0] != 1) if(!msg || msg->data[0] != 1) { // We did not receive a response
refresh(); // Refr refresh(); // Attempt to get the settings from the device so we're up to date if possible
return false;
}
refresh(true); // Refresh ignoring checksum
// The device might modify the settings once they are applied, however in this case it does not update the checksum
// We refresh to get these updates, update the checksum, and send it back so it's all in sync
gs_checksum = CalculateGSChecksum(settings);
bytestream[4] = (uint8_t)gs_checksum;
bytestream[5] = (uint8_t)(gs_checksum >> 8);
memcpy(bytestream.data() + 6, getRawStructurePointer(), structSize);
com->sendCommand(Command::SetSettings, bytestream);
msg = com->waitForMessageSync(std::make_shared<Main51MessageFilter>(Command::SetSettings), std::chrono::milliseconds(1000));
refresh(); // Refresh our buffer with what the device has, whether we were successful or not
return (msg && msg->data[0] == 1); // Device sends 0x01 for success return (msg && msg->data[0] == 1); // Device sends 0x01 for success
} }
@ -111,7 +126,6 @@ bool IDeviceSettings::commit() {
com->sendCommand(Command::SaveSettings); com->sendCommand(Command::SaveSettings);
std::shared_ptr<Message> msg = com->waitForMessageSync(std::make_shared<Main51MessageFilter>(Command::SaveSettings), std::chrono::milliseconds(5000)); std::shared_ptr<Message> msg = com->waitForMessageSync(std::make_shared<Main51MessageFilter>(Command::SaveSettings), std::chrono::milliseconds(5000));
if(!msg || msg->data[0] != 1)
refresh(); // Refresh our buffer with what the device has, whether we were successful or not refresh(); // Refresh our buffer with what the device has, whether we were successful or not
return (msg && msg->data[0] == 1); // Device sends 0x01 for success return (msg && msg->data[0] == 1); // Device sends 0x01 for success

2
device/include/idevicesettings.h
View File

@ -284,7 +284,7 @@ public:
virtual ~IDeviceSettings() {} virtual ~IDeviceSettings() {}
bool ok() { return settingsLoaded; } bool ok() { return settingsLoaded; }
void refresh(); // Get from device void refresh(bool ignoreChecksum = false); // Get from device
bool send(); // Send to device, device keeps settings in volatile RAM until power cycle bool send(); // Send to device, device keeps settings in volatile RAM until power cycle
bool commit(); // Send to device, device keeps settings in EEPROM until next commit bool commit(); // Send to device, device keeps settings in EEPROM until next commit