Skip to content

Commit

Permalink
fix(cpn): profile conversion of models and settings (#5151)
Browse files Browse the repository at this point in the history
  • Loading branch information
@elecpower
elecpower authored Jun 12, 2024
1 parent 4be97ec commit 199e09e
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 16 deletions.
16 changes: 10 additions & 6 deletions companion/src/firmwares/generalsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)

for (int i = 0; i < Boards::getCapability(cstate.fromType, Board::Inputs); i++) {
if (Boards::isInputConfigurable(i, cstate.fromType)) {
cstate.withComponentField("");
cstate.setItemType(Boards::isInputStick(i, cstate.fromType) ? tr("Axis") : tr("Pot"));
RadioDataConversionState::LogField oldData(i, Boards::getInputName(i, cstate.fromType));
const int idx = Boards::getInputIndex(Boards::getInputTag(i, cstate.fromType), Board::LVT_TAG, cstate.toType);
Expand All @@ -422,7 +423,7 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)
// do not copy calibration - use defaults as safer
}
else if (cstate.fromGS()->inputConfig[i].type == Board::AIT_FLEX && cstate.fromGS()->inputConfig[i].flexType != Board::FLEX_NONE) {
cstate.setInvalid(oldData);
cstate.setUnsupported(oldData);
}
}
}
Expand All @@ -431,6 +432,7 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)

for (int i = 0; i < Boards::getCapability(cstate.fromType, Board::Switches); i++) {
if (Boards::isSwitchConfigurable(i, cstate.fromType)) {
cstate.withComponentField("");
cstate.setItemType(Boards::isSwitchFlex(i, cstate.fromType) ? tr("Flex Switch") :
Boards::isSwitchFunc(i, cstate.fromType) ? tr("Function Switch") : tr("Switch"));
RadioDataConversionState::LogField oldData(i, Boards::getSwitchName(i, cstate.fromType));
Expand All @@ -443,9 +445,12 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)

if (Boards::getSwitchInfo(i, cstate.fromType).type > Boards::getSwitchInfo(idx, cstate.toType).type) {
cstate.withComponentField(Boards::getSwitchName(i, cstate.fromType));
cstate.setItemType(Boards::isSwitchFlex(i, cstate.fromType) ? tr("Flex Switch") :
Boards::isSwitchFunc(i, cstate.fromType) ? tr("Function Switch") : tr("Switch"));
RadioDataConversionState::LogField oldSWT(i, Boards::switchTypeToString(fromcfg.type));
tocfg.type = Board::SWITCH_NOT_AVAILABLE;
cstate.setConverted(oldSWT, RadioDataConversionState::LogField(i, Boards::switchTypeToString(fromcfg.type)));
// switch type not supported on to profile so leave as hw default eg from 3 Pos and to 2 Pos
// if switch position not supported it will be reported where used on each model
cstate.setConverted(oldSWT, RadioDataConversionState::LogField(i, Boards::switchTypeToString(tocfg.type)));
}
else
tocfg.type = fromcfg.type;
Expand All @@ -464,9 +469,8 @@ void GeneralSettings::convert(RadioDataConversionState & cstate)
tocfg.inputIdx = fromcfg.inputIdx;
}
}
else if (cstate.fromGS()->switchConfig[i].type != Board::SWITCH_NOT_AVAILABLE) {
cstate.setInvalid(oldData);
}
else if (cstate.fromGS()->switchConfig[i].type != Board::SWITCH_NOT_AVAILABLE)
cstate.setUnsupported(oldData);
}
}

Expand Down
12 changes: 8 additions & 4 deletions companion/src/firmwares/moduledata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,19 @@ void ModuleData::convert(RadioDataConversionState & cstate)
//else if (!isProtocolAvailable(cstate.subCompIdx, (PulsesProtocol) protocol, cstate.toGS)) {
evt = RadioDataConversionState::EVT_INV;
}

if (evt == RadioDataConversionState::EVT_INV) {
cstate.setInvalid(oldData);
}
}
else {
evt = RadioDataConversionState::EVT_INV;
qDebug() << "Error - current firmware board does not match conversion to board!";
evt = RadioDataConversionState::EVT_ERR;
cstate.setErr(tr("Current firmware board does not match conversion to board"));
}

if (evt == RadioDataConversionState::EVT_INV) {
cstate.setInvalid(oldData);
if (evt != RadioDataConversionState::EVT_NONE) {
clear();
cstate.setConverted(oldData, RadioDataConversionState::LogField(protocol, protocolToString(protocol)));
}
}

Expand Down
14 changes: 10 additions & 4 deletions companion/src/firmwares/radiodataconversionstate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ void RadioDataConversionState::setMoved(const LogField & from, const LogField &
addLogEntry(EVT_INF, tr("verify is"));
}

void RadioDataConversionState::setUnsupported(const LogField & item)
{
setLogField(FLD_ITM_BEFORE, item);
addLogEntry(EVT_UNSUP, tr("unsupported"));
}

const ModelData * RadioDataConversionState::toModel() const
{
if (rd && modelIdx > -1 && modelIdx < (int)rd->models.size())
Expand Down Expand Up @@ -161,15 +167,15 @@ bool RadioDataConversionState::hasLogEntries(EventType logLevel) const

QString RadioDataConversionState::eventTypeToString(int type) const
{
// enum EventType { EVT_NONE, EVT_DBG, EVT_INF, EVT_WRN, EVT_CVRT, EVT_ERR, EVT_INV
static const QStringList evtTypes = QStringList() << "" << tr("[DBG]") << tr("[NFO]") << tr("[WRN]") << tr("[CVT]") << tr("[ERR]") << tr("[INV]");
// enum EventType { EVT_NONE, EVT_DBG, EVT_INF, EVT_WRN, EVT_CVRT, EVT_ERR, EVT_INV, EVT_UNSUP
static const QStringList evtTypes = QStringList() << "" << tr("[DBG]") << tr("[NFO]") << tr("[WRN]") << tr("[CVT]") << tr("[ERR]") << tr("[INV]") << tr("[XSP]");
return (type < evtTypes.size() ? evtTypes.at(type) : "");
}

QString RadioDataConversionState::eventTypeToColor(int type) const
{
// enum EventType { EVT_NONE, EVT_DBG, EVT_INF, EVT_WRN, EVT_CVRT, EVT_ERR, EVT_INV
static const QStringList evtColors = QStringList() << "black" << "dimgrey" << "black" << "#ea7104" << "#ea7104" << "red" << "red";
// enum EventType { EVT_NONE, EVT_DBG, EVT_INF, EVT_WRN, EVT_CVRT, EVT_ERR, EVT_INV, EVT_UNSUP
static const QStringList evtColors = QStringList() << "black" << "dimgrey" << "black" << "orange" << "magenta" << "red" << "red" << "blue";
return (type < evtColors.size() ? evtColors.at(type) : "black");
}

Expand Down
2 changes: 2 additions & 0 deletions companion/src/firmwares/radiodataconversionstate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class RadioDataConversionState
EVT_CVRT, // something was converted (A->B)
EVT_ERR, // misc. error, place error-level events after this
EVT_INV, // invalid, control/etc not available on destination radio
EVT_UNSUP, // unsupported, control not available on destiation radio
};

enum LogFieldType {
Expand Down Expand Up @@ -89,6 +90,7 @@ class RadioDataConversionState
void setInvalid(const LogField & item);
void setConverted(const LogField & from, const LogField & to);
void setMoved(const LogField & from, const LogField & to);
void setUnsupported(const LogField & item);
inline void setDbg(const QString & msg) { addLogEntry(EVT_DBG, msg); }
inline void setInf(const QString & msg) { addLogEntry(EVT_INF, msg); }
inline void setWrn(const QString & msg) { addLogEntry(EVT_WRN, msg); }
Expand Down
3 changes: 2 additions & 1 deletion companion/src/firmwares/rawsource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ bool RawSource::isAvailable(const ModelData * const model, const GeneralSettings

RawSource RawSource::convert(RadioDataConversionState & cstate)
{
cstate.setItemType(tr("SRC"), 1);
cstate.setItemType(tr("Source"), 1);
RadioDataConversionState::LogField oldData(index, toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType));

if (type == SOURCE_TYPE_INPUT)
Expand All @@ -389,6 +389,7 @@ RawSource RawSource::convert(RadioDataConversionState & cstate)
if (index < 0 || !isAvailable(nullptr, cstate.toGS(), cstate.toType)) {
cstate.setInvalid(oldData);
clear(); // no source is safer than an invalid one
cstate.setConverted(oldData, RadioDataConversionState::LogField(index, tr("None")));
}

return *this;
Expand Down
3 changes: 2 additions & 1 deletion companion/src/firmwares/rawswitch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ RawSwitch RawSwitch::convert(RadioDataConversionState & cstate)
if (!index)
return *this;

cstate.setItemType(tr("SW"), 2);
cstate.setItemType(tr("Switch"), 2);
RadioDataConversionState::LogField oldData(index, toString(cstate.fromType, cstate.fromGS(), cstate.fromModel()));

int newIdx = 0;
Expand All @@ -223,6 +223,7 @@ RawSwitch RawSwitch::convert(RadioDataConversionState & cstate)
if (newIdx < 0 || !isAvailable(nullptr, cstate.toGS(), cstate.toType)) {
cstate.setInvalid(oldData);
clear(); // no switch is safer than an invalid one
cstate.setConverted(oldData, RadioDataConversionState::LogField(index, tr("None")));
}

return *this;
Expand Down

0 comments on commit 199e09e

Please sign in to comment.