Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

STAY replaced by EDGE in constants names

Browse source
This commit is contained in:
bsongis 2014-08-28 15:27:43 +02:00
parent c107a1bc8e
commit e620230e44
9 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/src/eeprominterface.cpp
View file

@ -522,8 +522,8 @@ QString CurveReference::toString()
CSFunctionFamily LogicalSwitchData::getFunctionFamily() CSFunctionFamily LogicalSwitchData::getFunctionFamily()
{ {
if (func == LS_FN_STAY) if (func == LS_FN_EDGE)
return LS_FAMILY_STAY; return LS_FAMILY_EDGE;
else if (func == LS_FN_TIMER) else if (func == LS_FN_TIMER)
return LS_FAMILY_TIMER; return LS_FAMILY_TIMER;
else if (func == LS_FN_STICKY) else if (func == LS_FN_STICKY)
@ -589,7 +589,7 @@ QString LogicalSwitchData::funcToString()
return QObject::tr("Timer"); return QObject::tr("Timer");
case LS_FN_STICKY: case LS_FN_STICKY:
return QObject::tr("Sticky"); return QObject::tr("Sticky");
case LS_FN_STAY: case LS_FN_EDGE:
return QObject::tr("Edge"); return QObject::tr("Edge");
default: default:
return QObject::tr("Unknown"); return QObject::tr("Unknown");
@ -607,7 +607,7 @@ QString LogicalSwitchData::toString(const ModelData & model, const GeneralSettin
result +="( "; result +="( ";
} }
switch (getFunctionFamily()) { switch (getFunctionFamily()) {
case LS_FAMILY_STAY: case LS_FAMILY_EDGE:
result += QObject::tr("Edge(%1, [%2:%3])").arg(RawSwitch(val1).toString()).arg(ValToTim(val2)).arg(ValToTim(val2+val3)); result += QObject::tr("Edge(%1, [%2:%3])").arg(RawSwitch(val1).toString()).arg(ValToTim(val2)).arg(ValToTim(val2+val3));
break; break;
case LS_FAMILY_STICKY: case LS_FAMILY_STICKY:

4
companion/src/eeprominterface.h
View file

@ -691,7 +691,7 @@ enum CSFunction {
LS_FN_VALMOSTEQUAL, LS_FN_VALMOSTEQUAL,
LS_FN_TIMER, LS_FN_TIMER,
LS_FN_STICKY, LS_FN_STICKY,
LS_FN_STAY, LS_FN_EDGE,
// later ... LS_FN_RANGE, // later ... LS_FN_RANGE,
LS_FN_MAX LS_FN_MAX
}; };
@ -702,7 +702,7 @@ enum CSFunctionFamily {
LS_FAMILY_VCOMP, LS_FAMILY_VCOMP,
LS_FAMILY_TIMER, LS_FAMILY_TIMER,
LS_FAMILY_STICKY, LS_FAMILY_STICKY,
LS_FAMILY_STAY, LS_FAMILY_EDGE,
}; };
class LogicalSwitchData { // Logical Switches data class LogicalSwitchData { // Logical Switches data

6
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -1451,7 +1451,7 @@ class LogicalSwitchesFunctionsTable: public ConversionTable {
addConversion(LS_FN_AND, val++); addConversion(LS_FN_AND, val++);
addConversion(LS_FN_OR, val++); addConversion(LS_FN_OR, val++);
addConversion(LS_FN_XOR, val++); addConversion(LS_FN_XOR, val++);
if (IS_ARM(board) && version >= 216) addConversion(LS_FN_STAY, val++); if (IS_ARM(board) && version >= 216) addConversion(LS_FN_EDGE, val++);
addConversion(LS_FN_EQUAL, val++); addConversion(LS_FN_EQUAL, val++);
if (!afterrelease21March2013) if (!afterrelease21March2013)
addConversion(LS_FN_NEQUAL, val++); addConversion(LS_FN_NEQUAL, val++);
@ -1603,7 +1603,7 @@ class LogicalSwitchField: public TransformedField {
v1 = csw.val1; v1 = csw.val1;
v2 = csw.val2; v2 = csw.val2;
} }
else if (csw.func == LS_FN_STAY) { else if (csw.func == LS_FN_EDGE) {
switchesConversionTable->exportValue(csw.val1, v1); switchesConversionTable->exportValue(csw.val1, v1);
v2 = csw.val2; v2 = csw.val2;
v3 = csw.val3; v3 = csw.val3;
@ -1628,7 +1628,7 @@ class LogicalSwitchField: public TransformedField {
csw.val1 = v1; csw.val1 = v1;
csw.val2 = v2; csw.val2 = v2;
} }
else if (csw.func == LS_FN_STAY) { else if (csw.func == LS_FN_EDGE) {
switchesConversionTable->importValue(v1, csw.val1); switchesConversionTable->importValue(v1, csw.val1);
csw.val2 = v2; csw.val2 = v2;
csw.val3 = v3; csw.val3 = v3;

10
companion/src/modeledit/logicalswitches.cpp
View file

@ -197,7 +197,7 @@ void LogicalSwitchesPanel::edited()
model.customSw[i].val1 = -119; model.customSw[i].val1 = -119;
model.customSw[i].val2 = -119; model.customSw[i].val2 = -119;
} }
else if (newFuncFamily == LS_FAMILY_STAY) { else if (newFuncFamily == LS_FAMILY_EDGE) {
model.customSw[i].val1 = 0; model.customSw[i].val1 = 0;
model.customSw[i].val2 = -129; model.customSw[i].val2 = -129;
model.customSw[i].val3 = 0; model.customSw[i].val3 = 0;
@ -238,7 +238,7 @@ void LogicalSwitchesPanel::edited()
updateTimerParam(cswitchValue[i], model.customSw[i].val1, 0.1); updateTimerParam(cswitchValue[i], model.customSw[i].val1, 0.1);
updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.1); updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.1);
break; break;
case LS_FAMILY_STAY: case LS_FAMILY_EDGE:
if (sender() == cswitchOffset[i]) { if (sender() == cswitchOffset[i]) {
model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value()); model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0); updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
@ -326,7 +326,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext); populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2), generalSettings, LogicalSwitchesContext); populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2), generalSettings, LogicalSwitchesContext);
break; break;
case LS_FAMILY_STAY: case LS_FAMILY_EDGE:
mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE; mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE;
mask &= ~DELAY_ENABLED; mask &= ~DELAY_ENABLED;
populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext); populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
@ -377,7 +377,7 @@ void LogicalSwitchesPanel::populateCSWCB(QComboBox *b, int value)
LS_FN_AND, LS_FN_AND,
LS_FN_OR, LS_FN_OR,
LS_FN_XOR, LS_FN_XOR,
LS_FN_STAY, LS_FN_EDGE,
LS_FN_EQUAL, LS_FN_EQUAL,
LS_FN_NEQUAL, LS_FN_NEQUAL,
LS_FN_GREATER, LS_FN_GREATER,
@ -396,7 +396,7 @@ void LogicalSwitchesPanel::populateCSWCB(QComboBox *b, int value)
if (func == LS_FN_NEQUAL || func == LS_FN_EGREATER || func == LS_FN_ELESS) if (func == LS_FN_NEQUAL || func == LS_FN_EGREATER || func == LS_FN_ELESS)
continue; continue;
if (!IS_ARM(firmware->getBoard())) { if (!IS_ARM(firmware->getBoard())) {
if (func == LS_FN_VEQUAL || func == LS_FN_STAY) if (func == LS_FN_VEQUAL || func == LS_FN_EDGE)
continue; continue;
} }
b->addItem(LogicalSwitchData(func).funcToString(), func); b->addItem(LogicalSwitchData(func).funcToString(), func);

2
radio/src/eeprom_conversions.cpp
View file

@ -841,7 +841,7 @@ void ConvertModel_215_to_216(ModelData &model)
sw.func = oldModel.logicalSw[i].func; sw.func = oldModel.logicalSw[i].func;
if (sw.func >= LS_FUNC_VEQUAL) sw.func += 1; if (sw.func >= LS_FUNC_VEQUAL) sw.func += 1;
if (sw.func >= LS_FUNC_RANGE) sw.func += 1; if (sw.func >= LS_FUNC_RANGE) sw.func += 1;
if (sw.func >= LS_FUNC_STAY) sw.func += 1; if (sw.func >= LS_FUNC_EDGE) sw.func += 1;
sw.v1 = oldModel.logicalSw[i].v1; sw.v1 = oldModel.logicalSw[i].v1;
sw.v2 = oldModel.logicalSw[i].v2; sw.v2 = oldModel.logicalSw[i].v2;
sw.delay = oldModel.logicalSw[i].delay * 5; sw.delay = oldModel.logicalSw[i].delay * 5;

16
radio/src/gui/menu_model.cpp
View file

@ -4483,7 +4483,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
if (new_cstate == LS_FAMILY_TIMER) { if (new_cstate == LS_FAMILY_TIMER) {
cs->v1 = cs->v2 = 0; cs->v1 = cs->v2 = 0;
} }
else if (new_cstate == LS_FAMILY_STAY) { else if (new_cstate == LS_FAMILY_EDGE) {
cs->v1 = 0; cs->v2 = -129; cs->v3 = 0; cs->v1 = 0; cs->v2 = -129; cs->v3 = 0;
} }
else { else {
@ -4496,7 +4496,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
{ {
lcd_putsLeft(y, STR_V1); lcd_putsLeft(y, STR_V1);
int v1_min=0, v1_max=MIXSRC_LAST_TELEM; int v1_min=0, v1_max=MIXSRC_LAST_TELEM;
if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_STAY) { if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cstate == LS_FAMILY_EDGE) {
putsSwitches(CSWONE_2ND_COLUMN, y, v1_val, attr); putsSwitches(CSWONE_2ND_COLUMN, y, v1_val, attr);
v1_min = SWSRC_OFF+1; v1_max = SWSRC_ON-1; v1_min = SWSRC_OFF+1; v1_max = SWSRC_ON-1;
} }
@ -4527,7 +4527,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->v2+1, LEFT|attr); lcd_outdezAtt(CSWONE_2ND_COLUMN, y, cs->v2+1, LEFT|attr);
v2_max = 99; v2_max = 99;
} }
else if (cstate == LS_FAMILY_STAY) { else if (cstate == LS_FAMILY_EDGE) {
putsEdgeDelayParam(CSWONE_2ND_COLUMN, y, cs, m_posHorz==0 ? attr : 0, m_posHorz==1 ? attr : 0); putsEdgeDelayParam(CSWONE_2ND_COLUMN, y, cs, m_posHorz==0 ? attr : 0, m_posHorz==1 ? attr : 0);
if (s_editMode <= 0) continue; if (s_editMode <= 0) continue;
if (attr && m_posHorz==1) { if (attr && m_posHorz==1) {
@ -4642,7 +4642,7 @@ void menuModelLogicalSwitches(uint8_t event)
putsMixerSource(CSW_2ND_COLUMN, y, cs->v1, 0); putsMixerSource(CSW_2ND_COLUMN, y, cs->v1, 0);
putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, 0); putsMixerSource(CSW_3RD_COLUMN, y, cs->v2, 0);
} }
else if (cstate == LS_FAMILY_STAY) { else if (cstate == LS_FAMILY_EDGE) {
putsSwitches(CSW_2ND_COLUMN, y, cs->v1, 0); putsSwitches(CSW_2ND_COLUMN, y, cs->v1, 0);
putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, 0, 0); putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, 0, 0);
} }
@ -4770,7 +4770,7 @@ void menuModelLogicalSwitches(uint8_t event)
INCDEC_ENABLE_CHECK(isSwitchAvailableInLogicalSwitches); INCDEC_ENABLE_CHECK(isSwitchAvailableInLogicalSwitches);
} }
#if defined(CPUARM) #if defined(CPUARM)
else if (cstate == LS_FAMILY_STAY) { else if (cstate == LS_FAMILY_EDGE) {
putsSwitches(CSW_2ND_COLUMN, y, cs->v1, attr1); putsSwitches(CSW_2ND_COLUMN, y, cs->v1, attr1);
putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, attr2, horz==LS_FIELD_V3 ? attr : 0); putsEdgeDelayParam(CSW_3RD_COLUMN, y, cs, attr2, horz==LS_FIELD_V3 ? attr : 0);
v1_min = SWSRC_FIRST_IN_LOGICAL_SWITCHES; v1_max = SWSRC_LAST_IN_LOGICAL_SWITCHES; v1_min = SWSRC_FIRST_IN_LOGICAL_SWITCHES; v1_max = SWSRC_LAST_IN_LOGICAL_SWITCHES;
@ -4891,7 +4891,7 @@ void menuModelLogicalSwitches(uint8_t event)
lcd_putsiAtt(CSW_5TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DURATION ? attr : 0); lcd_putsiAtt(CSW_5TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DURATION ? attr : 0);
// CSW delay // CSW delay
if (cstate == LS_FAMILY_STAY) { if (cstate == LS_FAMILY_EDGE) {
lcd_puts(CSW_6TH_COLUMN, y, STR_NA); lcd_puts(CSW_6TH_COLUMN, y, STR_NA);
if (attr && horz == LS_FIELD_DELAY) { if (attr && horz == LS_FIELD_DELAY) {
REPEAT_LAST_CURSOR_MOVE(); REPEAT_LAST_CURSOR_MOVE();
@ -4904,7 +4904,7 @@ void menuModelLogicalSwitches(uint8_t event)
lcd_putsiAtt(CSW_6TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DELAY ? attr : 0); lcd_putsiAtt(CSW_6TH_COLUMN, y, STR_MMMINV, 0, horz==LS_FIELD_DELAY ? attr : 0);
} }
if (attr && horz == LS_FIELD_V3 && cstate != LS_FAMILY_STAY) { if (attr && horz == LS_FIELD_V3 && cstate != LS_FAMILY_EDGE) {
REPEAT_LAST_CURSOR_MOVE(); REPEAT_LAST_CURSOR_MOVE();
} }
#endif #endif
@ -4924,7 +4924,7 @@ void menuModelLogicalSwitches(uint8_t event)
if (new_cstate == LS_FAMILY_TIMER) { if (new_cstate == LS_FAMILY_TIMER) {
cs->v1 = cs->v2 = -119; cs->v1 = cs->v2 = -119;
} }
else if (new_cstate == LS_FAMILY_STAY) { else if (new_cstate == LS_FAMILY_EDGE) {
cs->v1 = 0; cs->v2 = -129; cs->v3 = 0; cs->v1 = 0; cs->v2 = -129; cs->v3 = 0;
} }
else { else {

2
radio/src/myeeprom.h
View file

@ -779,7 +779,7 @@ enum LogicalSwitchesFunctions {
LS_FUNC_OR, LS_FUNC_OR,
LS_FUNC_XOR, LS_FUNC_XOR,
#if defined(CPUARM) #if defined(CPUARM)
LS_FUNC_STAY, LS_FUNC_EDGE,
#endif #endif
LS_FUNC_EQUAL, LS_FUNC_EQUAL,
LS_FUNC_GREATER, LS_FUNC_GREATER,

2
radio/src/opentx.h
View file

@ -1255,7 +1255,7 @@ enum CswFunctionFamilies {
LS_FAMILY_TIMER, LS_FAMILY_TIMER,
LS_FAMILY_STICKY, LS_FAMILY_STICKY,
LS_FAMILY_RANGE, LS_FAMILY_RANGE,
LS_FAMILY_STAY LS_FAMILY_EDGE
}; };
uint8_t lswFamily(uint8_t func); uint8_t lswFamily(uint8_t func);

8
radio/src/switches.cpp
View file

@ -242,7 +242,7 @@ bool getLogicalSwitch(uint8_t idx)
result = (LS_LAST_VALUE(mixerCurrentFlightMode, idx) & (1<<0)); result = (LS_LAST_VALUE(mixerCurrentFlightMode, idx) & (1<<0));
} }
#if defined(CPUARM) #if defined(CPUARM)
else if (s == LS_FAMILY_STAY) { else if (s == LS_FAMILY_EDGE) {
result = (LS_LAST_VALUE(mixerCurrentFlightMode, idx) & (1<<0)); result = (LS_LAST_VALUE(mixerCurrentFlightMode, idx) & (1<<0));
} }
#endif #endif
@ -769,7 +769,7 @@ void logicalSwitchesTimerTick()
} }
} }
#if defined(CPUARM) #if defined(CPUARM)
else if (ls->func == LS_FUNC_STAY) { else if (ls->func == LS_FUNC_EDGE) {
ls_stay_struct & lastValue = (ls_stay_struct &)LS_LAST_VALUE(fm, i); ls_stay_struct & lastValue = (ls_stay_struct &)LS_LAST_VALUE(fm, i);
lastValue.state = false; lastValue.state = false;
bool state = getSwitch(ls->v1); bool state = getSwitch(ls->v1);
@ -810,8 +810,8 @@ uint8_t lswFamily(uint8_t func)
else if (func <= LS_FUNC_XOR) else if (func <= LS_FUNC_XOR)
return LS_FAMILY_BOOL; return LS_FAMILY_BOOL;
#if defined(CPUARM) #if defined(CPUARM)
else if (func == LS_FUNC_STAY) else if (func == LS_FUNC_EDGE)
return LS_FAMILY_STAY; return LS_FAMILY_EDGE;
#endif #endif
else if (func <= LS_FUNC_LESS) else if (func <= LS_FUNC_LESS)
return LS_FAMILY_COMP; return LS_FAMILY_COMP;