Some files forgotten
This commit is contained in:
@@ -385,9 +385,9 @@ t_Er9xModelData::operator ModelData ()
|
|||||||
c9x.beepANACenter = beepANACenter;
|
c9x.beepANACenter = beepANACenter;
|
||||||
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
||||||
c9x.extendedLimits = extendedLimits;
|
c9x.extendedLimits = extendedLimits;
|
||||||
c9x.swashRingData.invertELE = swashInvertELE;
|
c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
|
||||||
c9x.swashRingData.invertAIL = swashInvertAIL;
|
c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
|
||||||
c9x.swashRingData.invertCOL = swashInvertCOL;
|
c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
|
||||||
c9x.swashRingData.type = swashType;
|
c9x.swashRingData.type = swashType;
|
||||||
c9x.swashRingData.collectiveSource = er9xToSource(swashCollectiveSource);
|
c9x.swashRingData.collectiveSource = er9xToSource(swashCollectiveSource);
|
||||||
c9x.swashRingData.value = swashRingValue;
|
c9x.swashRingData.value = swashRingValue;
|
||||||
|
|||||||
@@ -517,9 +517,9 @@ t_Ersky9xModelData_v10::operator ModelData ()
|
|||||||
c9x.beepANACenter = beepANACenter;
|
c9x.beepANACenter = beepANACenter;
|
||||||
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
||||||
c9x.extendedLimits = extendedLimits;
|
c9x.extendedLimits = extendedLimits;
|
||||||
c9x.swashRingData.invertELE = swashInvertELE;
|
c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
|
||||||
c9x.swashRingData.invertAIL = swashInvertAIL;
|
c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
|
||||||
c9x.swashRingData.invertCOL = swashInvertCOL;
|
c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
|
||||||
c9x.swashRingData.type = swashType;
|
c9x.swashRingData.type = swashType;
|
||||||
c9x.swashRingData.collectiveSource = ersky9xToSource_v10(swashCollectiveSource);
|
c9x.swashRingData.collectiveSource = ersky9xToSource_v10(swashCollectiveSource);
|
||||||
c9x.swashRingData.value = swashRingValue;
|
c9x.swashRingData.value = swashRingValue;
|
||||||
@@ -632,9 +632,9 @@ t_Ersky9xModelData_v11::operator ModelData ()
|
|||||||
c9x.beepANACenter = beepANACenter;
|
c9x.beepANACenter = beepANACenter;
|
||||||
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
c9x.moduleData[0].ppmPulsePol = pulsePol;
|
||||||
c9x.extendedLimits = extendedLimits;
|
c9x.extendedLimits = extendedLimits;
|
||||||
c9x.swashRingData.invertELE = swashInvertELE;
|
c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
|
||||||
c9x.swashRingData.invertAIL = swashInvertAIL;
|
c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
|
||||||
c9x.swashRingData.invertCOL = swashInvertCOL;
|
c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
|
||||||
c9x.swashRingData.type = swashType;
|
c9x.swashRingData.type = swashType;
|
||||||
c9x.swashRingData.collectiveSource = ersky9xToSource_v11(swashCollectiveSource);
|
c9x.swashRingData.collectiveSource = ersky9xToSource_v11(swashCollectiveSource);
|
||||||
c9x.swashRingData.value = swashRingValue;
|
c9x.swashRingData.value = swashRingValue;
|
||||||
|
|||||||
@@ -338,9 +338,9 @@ t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData()
|
|||||||
t_Gruvin9xSwashRingData::operator SwashRingData ()
|
t_Gruvin9xSwashRingData::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = gruvin9xToSource(collectiveSource);
|
c9x.collectiveSource = gruvin9xToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
|
|||||||
@@ -410,9 +410,9 @@ t_Open9xGruvin9xCustomFunctionData_v210::operator CustomFunctionData ()
|
|||||||
t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
|
t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xV4207ToSource(collectiveSource);
|
c9x.collectiveSource = open9xV4207ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
@@ -422,9 +422,9 @@ t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
|
|||||||
t_Open9xGruvin9xSwashRingData_v209::operator SwashRingData ()
|
t_Open9xGruvin9xSwashRingData_v209::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xV4209ToSource(collectiveSource);
|
c9x.collectiveSource = open9xV4209ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
|
|||||||
@@ -640,9 +640,9 @@ t_Open9xArmCustomFunctionData_v211::operator CustomFunctionData ()
|
|||||||
t_Open9xArmSwashRingData_v208::operator SwashRingData ()
|
t_Open9xArmSwashRingData_v208::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xArm208ToSource(collectiveSource);
|
c9x.collectiveSource = open9xArm208ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
@@ -652,9 +652,9 @@ t_Open9xArmSwashRingData_v208::operator SwashRingData ()
|
|||||||
t_Open9xArmSwashRingData_v209::operator SwashRingData ()
|
t_Open9xArmSwashRingData_v209::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xArm209ToSource(collectiveSource);
|
c9x.collectiveSource = open9xArm209ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
@@ -664,9 +664,9 @@ t_Open9xArmSwashRingData_v209::operator SwashRingData ()
|
|||||||
t_Open9xArmSwashRingData_v210::operator SwashRingData ()
|
t_Open9xArmSwashRingData_v210::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xArm210ToSource(collectiveSource);
|
c9x.collectiveSource = open9xArm210ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
|
|||||||
@@ -665,9 +665,9 @@ t_Open9xCustomFunctionData_v210::operator CustomFunctionData ()
|
|||||||
t_Open9xSwashRingData_v208::operator SwashRingData ()
|
t_Open9xSwashRingData_v208::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9x208ToSource(collectiveSource);
|
c9x.collectiveSource = open9x208ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
@@ -677,9 +677,9 @@ t_Open9xSwashRingData_v208::operator SwashRingData ()
|
|||||||
t_Open9xSwashRingData_v209::operator SwashRingData ()
|
t_Open9xSwashRingData_v209::operator SwashRingData ()
|
||||||
{
|
{
|
||||||
SwashRingData c9x;
|
SwashRingData c9x;
|
||||||
c9x.invertELE = invertELE;
|
c9x.elevatorWeight = invertELE ? -100 : 100;
|
||||||
c9x.invertAIL = invertAIL;
|
c9x.aileronWeight = invertAIL ? -100 : 100;
|
||||||
c9x.invertCOL = invertCOL;
|
c9x.collectiveWeight = invertCOL ? -100 : 100;
|
||||||
c9x.type = type;
|
c9x.type = type;
|
||||||
c9x.collectiveSource = open9xStock209ToSource(collectiveSource);
|
c9x.collectiveSource = open9xStock209ToSource(collectiveSource);
|
||||||
c9x.value = value;
|
c9x.value = value;
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
#define FRSKY_STICKS
|
#define FRSKY_STICKS
|
||||||
#define OVERRIDE_CHANNEL_FUNCTION
|
#define OVERRIDE_CHANNEL_FUNCTION
|
||||||
#define TIMERS 2
|
#define TIMERS 2
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define FLAVOUR "gruvin9x"
|
#define FLAVOUR "gruvin9x"
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
|
|||||||
@@ -51,6 +51,7 @@
|
|||||||
#define OVERRIDE_CHANNEL_FUNCTION
|
#define OVERRIDE_CHANNEL_FUNCTION
|
||||||
#define TIMERS 2
|
#define TIMERS 2
|
||||||
#define GAUGES
|
#define GAUGES
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define FLAVOUR "9x128"
|
#define FLAVOUR "9x128"
|
||||||
#define EEPROM_VARIANT SIMU_M128_VARIANTS
|
#define EEPROM_VARIANT SIMU_M128_VARIANTS
|
||||||
|
|||||||
@@ -55,6 +55,7 @@
|
|||||||
#define GAUGES
|
#define GAUGES
|
||||||
#define TIMERS 2
|
#define TIMERS 2
|
||||||
#define NUM_POTS 3
|
#define NUM_POTS 3
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define FLAVOUR "9x"
|
#define FLAVOUR "9x"
|
||||||
#define EEPROM_VARIANT SIMU_STOCK_VARIANTS
|
#define EEPROM_VARIANT SIMU_STOCK_VARIANTS
|
||||||
|
|||||||
@@ -57,6 +57,7 @@
|
|||||||
#define OVERRIDE_CHANNEL_FUNCTION
|
#define OVERRIDE_CHANNEL_FUNCTION
|
||||||
#define NUM_POTS 3
|
#define NUM_POTS 3
|
||||||
#define TIMERS 2
|
#define TIMERS 2
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
#define FLAVOUR "sky9x"
|
#define FLAVOUR "sky9x"
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
#define REVPLUS
|
#define REVPLUS
|
||||||
#define OVERRIDE_CHANNEL_FUNCTION
|
#define OVERRIDE_CHANNEL_FUNCTION
|
||||||
#define TIMERS 3
|
#define TIMERS 3
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
#define FLAVOUR "taranis-plus"
|
#define FLAVOUR "taranis-plus"
|
||||||
|
|||||||
@@ -59,6 +59,7 @@
|
|||||||
#define REV9E
|
#define REV9E
|
||||||
#define OVERRIDE_CHANNEL_FUNCTION
|
#define OVERRIDE_CHANNEL_FUNCTION
|
||||||
#define TIMERS 3
|
#define TIMERS 3
|
||||||
|
#define THRTRACE
|
||||||
|
|
||||||
#define EEPROM_VARIANT 3
|
#define EEPROM_VARIANT 3
|
||||||
#define FLAVOUR "taranis-x9e"
|
#define FLAVOUR "taranis-x9e"
|
||||||
|
|||||||
@@ -725,18 +725,33 @@ class HeliField: public StructField {
|
|||||||
public:
|
public:
|
||||||
HeliField(SwashRingData & heli, BoardEnum board, unsigned int version, unsigned int variant)
|
HeliField(SwashRingData & heli, BoardEnum board, unsigned int version, unsigned int variant)
|
||||||
{
|
{
|
||||||
Append(new BoolField<1>(heli.invertELE));
|
|
||||||
Append(new BoolField<1>(heli.invertAIL));
|
|
||||||
Append(new BoolField<1>(heli.invertCOL));
|
|
||||||
Append(new UnsignedField<5>(heli.type));
|
|
||||||
Append(new SourceField<8>(heli.collectiveSource, board, version, variant));
|
|
||||||
if (IS_TARANIS(board) && version >= 217) {
|
if (IS_TARANIS(board) && version >= 217) {
|
||||||
|
Append(new UnsignedField<8>(heli.type));
|
||||||
|
Append(new UnsignedField<8>(heli.value));
|
||||||
|
Append(new SourceField<8>(heli.collectiveSource, board, version, variant));
|
||||||
Append(new SourceField<8>(heli.aileronSource, board, version, variant));
|
Append(new SourceField<8>(heli.aileronSource, board, version, variant));
|
||||||
Append(new SourceField<8>(heli.elevatorSource, board, version, variant));
|
Append(new SourceField<8>(heli.elevatorSource, board, version, variant));
|
||||||
|
Append(new SignedField<8>(heli.collectiveWeight));
|
||||||
|
Append(new SignedField<8>(heli.aileronWeight));
|
||||||
|
Append(new SignedField<8>(heli.elevatorWeight));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Append(new BoolField<1>(invertELE));
|
||||||
|
Append(new BoolField<1>(invertAIL));
|
||||||
|
Append(new BoolField<1>(invertCOL));
|
||||||
|
Append(new UnsignedField<5>(heli.type));
|
||||||
|
Append(new SourceField<8>(heli.collectiveSource, board, version, variant));
|
||||||
|
//, FLAG_NOSWITCHES)); Fix shift in collective
|
||||||
|
Append(new UnsignedField<8>(heli.value));
|
||||||
}
|
}
|
||||||
//, FLAG_NOSWITCHES)); Fix shift in collective
|
|
||||||
Append(new UnsignedField<8>(heli.value));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO before + after
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool invertELE;
|
||||||
|
bool invertAIL;
|
||||||
|
bool invertCOL;
|
||||||
};
|
};
|
||||||
|
|
||||||
class FlightModeField: public TransformedField {
|
class FlightModeField: public TransformedField {
|
||||||
|
|||||||
@@ -39,8 +39,7 @@
|
|||||||
|
|
||||||
#define DEFAULT_SCROLLBAR_X (LCD_W-1)
|
#define DEFAULT_SCROLLBAR_X (LCD_W-1)
|
||||||
#define NUM_BODY_LINES (LCD_LINES-1)
|
#define NUM_BODY_LINES (LCD_LINES-1)
|
||||||
#define MENU_TITLE_HEIGHT FH
|
#define MENU_HEADER_HEIGHT FH
|
||||||
#define MENU_NAVIG_HEIGHT 0
|
|
||||||
|
|
||||||
struct MenuItem {
|
struct MenuItem {
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|||||||
Reference in New Issue
Block a user