[Companion] Move SwitchType enum to RadioData GeneralSettings (#4249)

* [Companion] Move SwitchType enum to RadioData GeneralSettings for consistency.

* Fix default 9X switch index positions & trainer switch name.
This commit is contained in:
Max Paperno
2017-01-18 07:33:28 +01:00
committed by Bertrand Songis
parent 56dc2f94ce
commit d29c381c19
6 changed files with 145 additions and 144 deletions
+2 -9
View File
@@ -196,7 +196,7 @@ class EEPROMInterface
virtual unsigned long load(RadioData &radioData, const uint8_t * eeprom, int size) = 0;
virtual unsigned long loadBackup(RadioData & radioData, const uint8_t * eeprom, int esize, int index) = 0;
virtual int save(uint8_t * eeprom, const RadioData & radioData, uint8_t version=0, uint32_t variant=0) = 0;
virtual int getSize(const ModelData &) = 0;
@@ -367,15 +367,8 @@ class Firmware {
virtual int getCapability(Capability) = 0;
enum SwitchType {
SWITCH_NONE,
SWITCH_TOGGLE,
SWITCH_2POS,
SWITCH_3POS
};
struct Switch {
SwitchType type;
GeneralSettings::SwitchConfig type;
const char * name;
};