[Companion] Fixes

This commit is contained in:
Bertrand Songis
2017-01-18 15:25:43 +01:00
parent 38c7f1c7d3
commit 1924d28be3
34 changed files with 297 additions and 325 deletions
+31 -37
View File
@@ -288,42 +288,35 @@ struct Option {
class Firmware {
public:
Firmware(const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface):
Firmware(const QString & id, const QString & name, BoardEnum board):
id(id),
name(name),
board(board),
eepromInterface(eepromInterface),
variantBase(0),
base(NULL)
base(NULL),
eepromInterface(NULL)
{
}
Firmware(Firmware * base, const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface):
Firmware(Firmware * base, const QString & id, const QString & name, BoardEnum board):
id(id),
name(name),
board(board),
eepromInterface(eepromInterface),
variantBase(0),
base(base)
base(base),
eepromInterface(NULL)
{
}
virtual ~Firmware()
{
delete eepromInterface;
}
inline const Firmware * getFirmwareBase() const
{
return base ? base : this;
}
// TODO needed?
inline void setVariantBase(unsigned int variant)
{
variantBase = variant;
}
virtual Firmware * getFirmwareVariant(const QString & id) { return NULL; }
unsigned int getVariantNumber();
@@ -336,37 +329,37 @@ class Firmware {
virtual void addOptions(Option options[]);
inline int saveEEPROM(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
{
return eepromInterface->save(eeprom, radioData, version, variant);
}
virtual QString getStampUrl() = 0;
virtual QString getReleaseNotesUrl() = 0;
virtual QString getFirmwareUrl() = 0;
inline BoardEnum getBoard() const
BoardEnum getBoard() const
{
return board;
}
void setEEpromInterface(EEPROMInterface * interface)
{
eepromInterface = interface;
}
EEPROMInterface * getEEpromInterface()
{
return eepromInterface;
}
inline QString getName() const
QString getName() const
{
return name;
}
inline QString getId() const
QString getId() const
{
return id;
}
inline EEPROMInterface * getEepromInterface()
{
return eepromInterface;
}
virtual int getCapability(Capability) = 0;
struct Switch {
@@ -380,8 +373,6 @@ class Firmware {
virtual QTime getMaxTimerStart() = 0;
virtual bool isTelemetrySourceAvailable(int source) = 0;
virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
const int getFlashSize();
@@ -395,9 +386,9 @@ class Firmware {
QString id;
QString name;
BoardEnum board;
EEPROMInterface * eepromInterface;
unsigned int variantBase;
Firmware * base;
EEPROMInterface * eepromInterface;
private:
Firmware();
@@ -408,18 +399,23 @@ extern QList<Firmware *> firmwares;
extern Firmware * default_firmware_variant;
extern Firmware * current_firmware_variant;
Firmware * GetFirmware(const QString & id);
Firmware * getFirmware(const QString & id);
inline Firmware * GetCurrentFirmware()
inline Firmware * getCurrentFirmware()
{
return current_firmware_variant;
}
SimulatorInterface *getCurrentFirmwareSimulator();
SimulatorInterface * getCurrentSimulator();
inline EEPROMInterface * GetEepromInterface()
inline EEPROMInterface * getCurrentEEpromInterface()
{
return GetCurrentFirmware()->getEepromInterface();
return getCurrentFirmware()->getEEpromInterface();
}
inline BoardEnum getCurrentBoard()
{
return getCurrentFirmware()->getBoard();
}
inline int divRoundClosest(const int n, const int d)
@@ -429,8 +425,6 @@ inline int divRoundClosest(const int n, const int d)
#define CHECK_IN_ARRAY(T, index) ((unsigned int)index < (unsigned int)(sizeof(T)/sizeof(T[0])) ? T[(unsigned int)index] : "???")
SimulatorInterface * GetCurrentFirmwareSimulator();
extern QList<EEPROMInterface *> eepromInterfaces;
bool loadFile(RadioData & radioData, const QString & filename);