Fix a bug where settings were not read properly

This commit is contained in:
Paul Hollinsky
2018-10-30 14:24:57 -04:00
parent 3e51e39f3e
commit ccd26a3637
5 changed files with 66 additions and 8 deletions
+3 -2
View File
@@ -7,9 +7,10 @@ enum class Command : uint8_t {
EnableNetworkCommunication = 0x07,
RequestSerialNumber = 0xA1,
SetSettings = 0xA4, // Previously known as RED_CMD_SET_BAUD_REQ, follow up with SaveSettings to write to EEPROM
GetSettings = 0xA5, // Previously known as RED_CMD_READ_BAUD_REQ
//GetSettings = 0xA5, // Previously known as RED_CMD_READ_BAUD_REQ, now unused
SaveSettings = 0xA6,
SetDefaultSettings = 0xA8 // Follow up with SaveSettings to write to EEPROM
SetDefaultSettings = 0xA8, // Follow up with SaveSettings to write to EEPROM
ReadSettings = 0xC7 // Previously known as 3G_READ_SETTINGS_EX
};
}
@@ -0,0 +1,28 @@
#ifndef __READSETTINGSMESSAGE_H_
#define __READSETTINGSMESSAGE_H_
#include "icsneo/communication/message/message.h"
#include "icsneo/communication/communication.h"
namespace icsneo {
class ReadSettingsMessage : public Message {
public:
virtual ~ReadSettingsMessage() = default;
enum class Response : uint8_t {
OK = 0,
GeneralFailure = 1,
InvalidSubcommand = 2,
InvalidSubversion = 3,
NotEnoughMemory = 4,
APIFailure = 5,
APIUnsupported = 6
};
Response response;
};
}
#endif
+4 -4
View File
@@ -79,7 +79,7 @@ public:
Read_Datalink_Cm_Tx_Msg = 57,
Read_Datalink_Cm_Rx_Msg = 58,
Logging_Overflow = 59,
Read_Settings_Ex = 60,
ReadSettings = 60,
HSCAN4 = 61,
HSCAN5 = 62,
RS232 = 63,
@@ -313,8 +313,8 @@ public:
return "Read Datalink Cm Rx Msg";
case NetID::Logging_Overflow:
return "Logging Overflow";
case NetID::Read_Settings_Ex:
return "Read Settings Ex";
case NetID::ReadSettings:
return "Read Settings";
case NetID::HSCAN4:
return "HSCAN 4";
case NetID::HSCAN5:
@@ -485,7 +485,7 @@ CONSTEXPR uint16_t ICSNEO_NETID_APP_SIGNAL_STATUS = 56;
CONSTEXPR uint16_t ICSNEO_NETID_READ_DATALINK_CM_TX_MSG = 57;
CONSTEXPR uint16_t ICSNEO_NETID_READ_DATALINK_CM_RX_MSG = 58;
CONSTEXPR uint16_t ICSNEO_NETID_LOGGING_OVERFLOW = 59;
CONSTEXPR uint16_t ICSNEO_NETID_READ_SETTINGS_EX = 60;
CONSTEXPR uint16_t ICSNEO_NETID_READ_SETTINGS = 60;
CONSTEXPR uint16_t ICSNEO_NETID_HSCAN4 = 61;
CONSTEXPR uint16_t ICSNEO_NETID_HSCAN5 = 62;
CONSTEXPR uint16_t ICSNEO_NETID_RS232 = 63;