Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-18 22:05:10 +03:00
Code Issues Wiki Activity

Side readded in Companion. Templates removed.

Browse source
This commit is contained in:
bsongis 2014-03-19 10:30:51 +01:00
parent 1d1f4ed4fe
commit 25a94e637d
6 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -945,12 +945,13 @@ class InputField: public TransformedField {
{ {
if (IS_TARANIS(board) && version >= 216) { if (IS_TARANIS(board) && version >= 216) {
internalField.Append(new SourceField<8>(expo.srcRaw, board, version, 0)); internalField.Append(new SourceField<8>(expo.srcRaw, board, version, 0));
internalField.Append(new UnsignedField<16>(expo.scale)); internalField.Append(new UnsignedField<16>(expo.scale, "Scale"));
internalField.Append(new UnsignedField<8>(expo.chn, "Channel")); internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
internalField.Append(new SwitchField<8>(expo.swtch, board, version)); internalField.Append(new SwitchField<8>(expo.swtch, board, version));
internalField.Append(new UnsignedField<16>(expo.phases)); internalField.Append(new UnsignedField<16>(expo.phases));
internalField.Append(new SignedField<8>(_weight, "Weight")); internalField.Append(new SignedField<8>(_weight, "Weight"));
internalField.Append(new SignedField<8>(expo.carryTrim)); internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
internalField.Append(new ZCharField<8>(expo.name)); internalField.Append(new ZCharField<8>(expo.name));
internalField.Append(new SignedField<8>(expo.offset, "Offset")); internalField.Append(new SignedField<8>(expo.offset, "Offset"));
internalField.Append(new CurveReferenceField(expo.curve, board, version)); internalField.Append(new CurveReferenceField(expo.curve, board, version));
@ -1021,10 +1022,6 @@ class InputField: public TransformedField {
expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn); expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
} }
} }
else {
if (expo.srcRaw.type != SOURCE_TYPE_NONE)
expo.mode = 3;
}
} }
expo.weight = smallGvarToC9x(_weight); expo.weight = smallGvarToC9x(_weight);

2
companion/src/modeledit/expodialog.cpp
View file

@ -46,8 +46,6 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
} }
if (GetEepromInterface()->getCapability(VirtualInputs)) { if (GetEepromInterface()->getCapability(VirtualInputs)) {
ui->sideLabel->hide();
ui->sideCB->hide();
ui->inputName->setMaxLength(4); ui->inputName->setMaxLength(4);
populateSourceCB(ui->sourceCB, ed->srcRaw, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY); populateSourceCB(ui->sourceCB, ed->srcRaw, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
ui->sourceCB->removeItem(0); ui->sourceCB->removeItem(0);

11
companion/src/modeledit/inputs.cpp
View file

@ -98,12 +98,11 @@ void InputsPanel::update()
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString(); str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
} }
} }
else {
switch (md->mode) { switch (md->mode) {
case (1): str += " <-"; break; case (1): str += " <-"; break;
case (2): str += " ->"; break; case (2): str += " ->"; break;
default: str += " "; break; default: str += " "; break;
};
} }
str += " " + tr("Weight(%1)").arg(getGVarString(md->weight)); str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));

6
radio/src/Makefile
View file

@ -994,8 +994,10 @@ ifeq ($(HELI), YES)
endif endif
ifeq ($(TEMPLATES), YES) ifeq ($(TEMPLATES), YES)
CPPDEFS += -DTEMPLATES ifneq ($(PCB), TARANIS)
CPPSRC += templates.cpp CPPDEFS += -DTEMPLATES
CPPSRC += templates.cpp
endif
endif endif
ifeq ($(PXX), YES) ifeq ($(PXX), YES)

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

@ -3283,7 +3283,7 @@ static uint8_t s_copySrcCh;
#define EXPO_LINE_SRC_POS 9*FW-2 #define EXPO_LINE_SRC_POS 9*FW-2
#define EXPO_LINE_CURVE_POS 12*FW+4 #define EXPO_LINE_CURVE_POS 12*FW+4
#define EXPO_LINE_SWITCH_POS 17*FW-1 #define EXPO_LINE_SWITCH_POS 17*FW-1
#define EXPO_LINE_SIDE_POS 20*FW-1 #define EXPO_LINE_SIDE_POS 20*FW-2
#define EXPO_LINE_SELECT_POS 5*FW+2 #define EXPO_LINE_SELECT_POS 5*FW+2
#define EXPO_LINE_FM_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH-FW #define EXPO_LINE_FM_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH-FW
#define EXPO_LINE_NAME_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH #define EXPO_LINE_NAME_POS LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH

15
radio/src/templates.cpp
View file

@ -56,6 +56,10 @@
#include "opentx.h" #include "opentx.h"
#if defined(PCBTARANIS)
#pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
#endif
MixData* setDest(uint8_t dch, uint8_t src, bool clear=false) MixData* setDest(uint8_t dch, uint8_t src, bool clear=false)
{ {
uint8_t i = 0; uint8_t i = 0;
@ -184,13 +188,10 @@ void applyTemplate(uint8_t idx)
// Simple 4-Ch // Simple 4-Ch
case TMPL_SIMPLE_4CH: case TMPL_SIMPLE_4CH:
defaultInputs(); defaultInputs();
#if defined(PCBTARANIS) setDest(ICC(STK_RUD), TMPL_INPUT(STK_RUD));
#pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!") setDest(ICC(STK_ELE), TMPL_INPUT(STK_ELE));
#endif setDest(ICC(STK_THR), TMPL_INPUT(STK_THR));
setDest(ICC(STK_RUD), MIXSRC_Rud); setDest(ICC(STK_AIL), TMPL_INPUT(STK_AIL));
setDest(ICC(STK_ELE), MIXSRC_Ele);
setDest(ICC(STK_THR), MIXSRC_Thr);
setDest(ICC(STK_AIL), MIXSRC_Ail);
break; break;
// Sticky-T-Cut // Sticky-T-Cut