feat: use any source for expo/weight/offset (#5220)
Co-authored-by: philmoz <phil.a.mitchell@gmail.com> Co-authored-by: 3djc <3djc@gh.com> Co-authored-by: elecpower <elecpower@users.noreply.github.com>
This commit is contained in:
co-authored by
philmoz
3djc
elecpower
parent
326c58a7fd
commit
4b917b762c
@@ -93,7 +93,7 @@
|
|||||||
#define CPN_STR_SW_INDICATOR_NEUT QCoreApplication::translate("RawSwitch", "-") // Switch neutral (middle) position indicator.
|
#define CPN_STR_SW_INDICATOR_NEUT QCoreApplication::translate("RawSwitch", "-") // Switch neutral (middle) position indicator.
|
||||||
#define CPN_STR_SW_INDICATOR_REV QCoreApplication::translate("RawSwitch", "!") // Switch reversed logic (NOT) indicator.
|
#define CPN_STR_SW_INDICATOR_REV QCoreApplication::translate("RawSwitch", "!") // Switch reversed logic (NOT) indicator.
|
||||||
|
|
||||||
#define CPN_STR_SRC_INDICATOR_INVERT QCoreApplication::translate("RawSource", "!") // Source inverted logic indicator.
|
#define CPN_STR_SRC_INDICATOR_NEG QCoreApplication::translate("RawSource", "-") // Source negative value indicator.
|
||||||
|
|
||||||
#define EDGETX_HOME_PAGE_URL "https://edgetx.org"
|
#define EDGETX_HOME_PAGE_URL "https://edgetx.org"
|
||||||
|
|
||||||
|
|||||||
@@ -222,8 +222,6 @@ CurveRefFilteredFactory::CurveRefFilteredFactory(CompoundItemModelFactory * shar
|
|||||||
|
|
||||||
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_Curve), curveFlags),
|
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_Curve), curveFlags),
|
||||||
fidToString(CRFIM_CURVE), CRFIM_CURVE);
|
fidToString(CRFIM_CURVE), CRFIM_CURVE);
|
||||||
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_GVarRef), gvarRefFlags),
|
|
||||||
fidToString(CRFIM_GVARREF), CRFIM_GVARREF);
|
|
||||||
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CurveRefType)),
|
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CurveRefType)),
|
||||||
fidToString(CRFIM_TYPE), CRFIM_TYPE);
|
fidToString(CRFIM_TYPE), CRFIM_TYPE);
|
||||||
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CurveRefFunc)),
|
registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_CurveRefFunc)),
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ set(${PROJECT_NAME}_NAMES
|
|||||||
rawsource
|
rawsource
|
||||||
rawswitch
|
rawswitch
|
||||||
sensordata
|
sensordata
|
||||||
|
sourcenumref
|
||||||
telem_data
|
telem_data
|
||||||
timerdata
|
timerdata
|
||||||
ersky9x/ersky9xeeprom
|
ersky9x/ersky9xeeprom
|
||||||
|
|||||||
@@ -19,14 +19,16 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "curvereference.h"
|
#include "curvereference.h"
|
||||||
#include "adjustmentreference.h"
|
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "modeldata.h"
|
#include "modeldata.h"
|
||||||
|
#include "generalsettings.h"
|
||||||
#include "filtereditemmodels.h"
|
#include "filtereditemmodels.h"
|
||||||
#include "curveimagewidget.h"
|
#include "curveimagewidget.h"
|
||||||
#include "curvedialog.h"
|
#include "curvedialog.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
|
||||||
const QString CurveReference::toString(const ModelData * model, bool verbose) const
|
const QString CurveReference::toString(const ModelData * model, bool verbose, const GeneralSettings * const generalSettings,
|
||||||
|
Board::Type board, bool prefixCustomName) const
|
||||||
{
|
{
|
||||||
if (value == 0)
|
if (value == 0)
|
||||||
return CPN_STR_NONE_ITEM;
|
return CPN_STR_NONE_ITEM;
|
||||||
@@ -37,7 +39,7 @@ const QString CurveReference::toString(const ModelData * model, bool verbose) co
|
|||||||
switch(type) {
|
switch(type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
ret = AdjustmentReference(value).toString(model);
|
ret = SourceNumRef(value).toString(model, generalSettings, board, prefixCustomName);
|
||||||
break;
|
break;
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
ret = functionToString(value);
|
ret = functionToString(value);
|
||||||
@@ -48,7 +50,7 @@ const QString CurveReference::toString(const ModelData * model, bool verbose) co
|
|||||||
else
|
else
|
||||||
ret = CurveData().nameToString(idx);
|
ret = CurveData().nameToString(idx);
|
||||||
if (value < 0)
|
if (value < 0)
|
||||||
ret.prepend(CPN_STR_SW_INDICATOR_REV);
|
ret.prepend(CPN_STR_SRC_INDICATOR_NEG);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return CPN_STR_UNKNOWN_ITEM;
|
return CPN_STR_UNKNOWN_ITEM;
|
||||||
@@ -62,7 +64,7 @@ const QString CurveReference::toString(const ModelData * model, bool verbose) co
|
|||||||
|
|
||||||
const bool CurveReference::isValueNumber() const
|
const bool CurveReference::isValueNumber() const
|
||||||
{
|
{
|
||||||
return (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO) && AdjustmentReference(value).type == AdjustmentReference::ADJUST_REF_VALUE;
|
return (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO) && SourceNumRef(value).isNumber();
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool CurveReference::isAvailable() const
|
const bool CurveReference::isAvailable() const
|
||||||
@@ -74,7 +76,7 @@ const bool CurveReference::isAvailable() const
|
|||||||
int CurveReference::getDefaultValue(const CurveRefType type, const bool isGVar)
|
int CurveReference::getDefaultValue(const CurveRefType type, const bool isGVar)
|
||||||
{
|
{
|
||||||
if (isGVar && (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO))
|
if (isGVar && (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO))
|
||||||
return AdjustmentReference(AdjustmentReference::ADJUST_REF_GVAR, 1).toValue();
|
return SourceNumRef(SOURCE_TYPE_GVAR, 1).toValue();
|
||||||
else if (type == CURVE_REF_FUNC)
|
else if (type == CURVE_REF_FUNC)
|
||||||
return 1;
|
return 1;
|
||||||
else
|
else
|
||||||
@@ -146,54 +148,50 @@ int CurveReference::functionCount()
|
|||||||
* CurveReferenceUIManager
|
* CurveReferenceUIManager
|
||||||
*/
|
*/
|
||||||
|
|
||||||
CurveReferenceUIManager::CurveReferenceUIManager(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QSpinBox * curveValueSB,
|
CurveReferenceUIManager::CurveReferenceUIManager(QComboBox * cboType, QCheckBox * chkUseSource, QSpinBox * sbxValue,
|
||||||
QComboBox * curveValueCB, QLabel * curveLabelImage,
|
QComboBox * cboSource, QComboBox * cboCurveFunc, CurveImageWidget * curveImage,
|
||||||
CurveReference & curveRef, ModelData & model, CompoundItemModelFactory * sharedItemModels,
|
CurveReference & curveRef, ModelData & model, CompoundItemModelFactory * sharedItemModels,
|
||||||
CurveRefFilteredFactory * curveRefFilteredFactory, QObject * parent) :
|
CurveRefFilteredFactory * curveRefFilteredFactory, FilteredItemModel * sourceItemModel,
|
||||||
|
QObject * parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
curveTypeCB(curveTypeCB),
|
cboType(cboType),
|
||||||
curveGVarCB(curveGVarCB),
|
chkUseSource(chkUseSource),
|
||||||
curveValueSB(curveValueSB),
|
sbxValue(sbxValue),
|
||||||
curveValueCB(curveValueCB),
|
cboSource(cboSource),
|
||||||
|
cboCurveFunc(cboCurveFunc),
|
||||||
|
curveImage(curveImage),
|
||||||
curveRef(curveRef),
|
curveRef(curveRef),
|
||||||
model(model),
|
model(model),
|
||||||
sharedItemModels(sharedItemModels),
|
|
||||||
filteredModelFactory(curveRefFilteredFactory),
|
filteredModelFactory(curveRefFilteredFactory),
|
||||||
lock(false),
|
lock(false),
|
||||||
curveImageWidget(nullptr)
|
srcNumRefEditor(nullptr)
|
||||||
{
|
{
|
||||||
connectItemModelEvents(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_CURVE));
|
connectItemModelEvents(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_CURVE));
|
||||||
|
|
||||||
hasCapabilityGvars = getCurrentFirmware()->getCapability(Gvars);
|
if (chkUseSource || sbxValue || cboSource)
|
||||||
|
srcNumRefEditor = new SourceNumRefEditor(curveRef.value, chkUseSource, sbxValue, cboSource, 0, -100, 100, 1, model, sourceItemModel);
|
||||||
|
|
||||||
if (curveTypeCB) {
|
if (cboType) {
|
||||||
curveTypeCB->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_TYPE));
|
cboType->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
curveTypeCB->setCurrentIndex(curveTypeCB->findData((int)curveRef.type));
|
cboType->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_TYPE));
|
||||||
connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)));
|
cboType->setCurrentIndex(cboType->findData((int)curveRef.type));
|
||||||
|
connect(cboType, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &CurveReferenceUIManager::cboTypeChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (curveGVarCB)
|
if (cboCurveFunc) {
|
||||||
connect(curveGVarCB, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
|
if (!cboType) {
|
||||||
|
cboCurveFunc->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_CURVE));
|
||||||
if (curveValueSB) {
|
cboCurveFunc->setCurrentIndex(cboCurveFunc->findData(curveRef.value));
|
||||||
curveValueSB->setMinimum(-100);
|
|
||||||
curveValueSB->setMaximum(100);
|
|
||||||
connect(curveValueSB, SIGNAL(editingFinished()), this, SLOT(valueSBChanged()));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (curveValueCB) {
|
|
||||||
curveValueCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
|
||||||
curveValueCB->setMaxVisibleItems(10);
|
|
||||||
connect(curveValueCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valueCBChanged()));
|
|
||||||
|
|
||||||
if (curveLabelImage) {
|
|
||||||
curveImageWidget = qobject_cast<CurveImageWidget *>(curveLabelImage);
|
|
||||||
if (curveImageWidget) {
|
|
||||||
curveImageWidget->set(&model, getCurrentFirmware(), sharedItemModels, abs(curveRef.value) - 1, Qt::black, 3);
|
|
||||||
curveImageWidget->setGrid(Qt::gray, 2);
|
|
||||||
connect(curveImageWidget, &CurveImageWidget::doubleClicked, this, &CurveReferenceUIManager::curveImageDoubleClicked);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
cboCurveFunc->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
cboCurveFunc->setMaxVisibleItems(10);
|
||||||
|
connect(cboCurveFunc, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &CurveReferenceUIManager::cboCurveFuncChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (curveImage) {
|
||||||
|
curveImage->set(&model, getCurrentFirmware(), sharedItemModels, curveRef.value, Qt::black, 3);
|
||||||
|
curveImage->setGrid(Qt::gray, 2);
|
||||||
|
connect(curveImage, &CurveImageWidget::doubleClicked, this, &CurveReferenceUIManager::curveImageDoubleClicked);
|
||||||
}
|
}
|
||||||
|
|
||||||
update();
|
update();
|
||||||
@@ -201,10 +199,10 @@ CurveReferenceUIManager::CurveReferenceUIManager(QComboBox * curveTypeCB, QCheck
|
|||||||
|
|
||||||
CurveReferenceUIManager::~CurveReferenceUIManager()
|
CurveReferenceUIManager::~CurveReferenceUIManager()
|
||||||
{
|
{
|
||||||
|
delete srcNumRefEditor;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define CURVE_REF_UI_GVAR_SHOW (1 << 0)
|
#define CURVE_REF_UI_SRC_SHOW (1 << 0)
|
||||||
#define CURVE_REF_UI_VALUE_SHOW (1 << 1)
|
#define CURVE_REF_UI_VALUE_SHOW (1 << 1)
|
||||||
#define CURVE_REF_UI_REF_SHOW (1 << 2)
|
#define CURVE_REF_UI_REF_SHOW (1 << 2)
|
||||||
#define CURVE_REF_UI_CURVE_SHOW (1 << 3)
|
#define CURVE_REF_UI_CURVE_SHOW (1 << 3)
|
||||||
@@ -212,89 +210,72 @@ CurveReferenceUIManager::~CurveReferenceUIManager()
|
|||||||
void CurveReferenceUIManager::update()
|
void CurveReferenceUIManager::update()
|
||||||
{
|
{
|
||||||
lock = true;
|
lock = true;
|
||||||
|
|
||||||
|
if (srcNumRefEditor)
|
||||||
|
srcNumRefEditor->setLock(true);
|
||||||
|
|
||||||
int widgetsMask = 0;
|
int widgetsMask = 0;
|
||||||
|
|
||||||
if (curveRef.type == CurveReference::CURVE_REF_DIFF || curveRef.type == CurveReference::CURVE_REF_EXPO) {
|
if (srcNumRefEditor) {
|
||||||
if (hasCapabilityGvars)
|
if (curveRef.type == CurveReference::CURVE_REF_DIFF || curveRef.type == CurveReference::CURVE_REF_EXPO) {
|
||||||
widgetsMask |= CURVE_REF_UI_GVAR_SHOW;
|
srcNumRefEditor->setVisible(true);
|
||||||
if (curveRef.isValueNumber()) {
|
srcNumRefEditor->update();
|
||||||
curveGVarCB->setChecked(false);
|
|
||||||
curveValueSB->setValue(curveRef.value);
|
|
||||||
widgetsMask |= CURVE_REF_UI_VALUE_SHOW;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
curveGVarCB->setChecked(true);
|
srcNumRefEditor->setVisible(false);
|
||||||
widgetsMask |= CURVE_REF_UI_REF_SHOW;
|
widgetsMask |= CURVE_REF_UI_REF_SHOW;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
widgetsMask |= CURVE_REF_UI_REF_SHOW;
|
widgetsMask |= CURVE_REF_UI_REF_SHOW;
|
||||||
}
|
|
||||||
|
|
||||||
if (curveRef.type == CurveReference::CURVE_REF_CUSTOM)
|
if (curveRef.type == CurveReference::CURVE_REF_CUSTOM && curveRef.value != 0)
|
||||||
widgetsMask |= CURVE_REF_UI_CURVE_SHOW;
|
widgetsMask |= CURVE_REF_UI_CURVE_SHOW;
|
||||||
|
|
||||||
|
if (cboType)
|
||||||
|
cboType->setCurrentIndex(cboType->findData(curveRef.type));
|
||||||
|
|
||||||
if (curveTypeCB) {
|
if (cboCurveFunc) {
|
||||||
curveTypeCB->setCurrentIndex(curveTypeCB->findData(curveRef.type));
|
|
||||||
curveTypeCB->show();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (curveGVarCB)
|
|
||||||
curveGVarCB->setVisible(widgetsMask & CURVE_REF_UI_GVAR_SHOW);
|
|
||||||
|
|
||||||
if (curveValueSB)
|
|
||||||
curveValueSB->setVisible(widgetsMask & CURVE_REF_UI_VALUE_SHOW);
|
|
||||||
|
|
||||||
if (curveValueCB) {
|
|
||||||
if (curveRef.isValueReference())
|
if (curveRef.isValueReference())
|
||||||
populateValueCB(curveValueCB);
|
populateValueCB(cboCurveFunc);
|
||||||
curveValueCB->setVisible(widgetsMask & CURVE_REF_UI_REF_SHOW);
|
cboCurveFunc->setVisible(widgetsMask & CURVE_REF_UI_REF_SHOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (curveValueCB && curveImageWidget) {
|
if (curveImage) {
|
||||||
curveImageWidget->draw();
|
if (widgetsMask & CURVE_REF_UI_CURVE_SHOW) {
|
||||||
curveImageWidget->setVisible(widgetsMask & CURVE_REF_UI_CURVE_SHOW);
|
curveImage->setIndex(curveRef.value);
|
||||||
|
if (abs(curveRef.value) > 0 && abs(curveRef.value) <= CPN_MAX_CURVES)
|
||||||
|
curveImage->setPen(colors[abs(curveRef.value) - 1], 3);
|
||||||
|
else
|
||||||
|
curveImage->setPen(Qt::black, 3);
|
||||||
|
}
|
||||||
|
curveImage->draw();
|
||||||
|
curveImage->setVisible(widgetsMask & CURVE_REF_UI_CURVE_SHOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
emit resized();
|
emit resized();
|
||||||
|
|
||||||
|
if (srcNumRefEditor)
|
||||||
|
srcNumRefEditor->setLock(false);
|
||||||
|
|
||||||
lock = false;
|
lock = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CurveReferenceUIManager::gvarCBChanged(int state)
|
void CurveReferenceUIManager::cboTypeChanged(int index)
|
||||||
{
|
{
|
||||||
if (!lock) {
|
if (!lock) {
|
||||||
curveRef.value = CurveReference::getDefaultValue(curveRef.type, state);
|
CurveReference::CurveRefType type = (CurveReference::CurveRefType)cboType->itemData(index).toInt();
|
||||||
update();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void CurveReferenceUIManager::typeChanged(int value)
|
|
||||||
{
|
|
||||||
if (!lock) {
|
|
||||||
CurveReference::CurveRefType type = (CurveReference::CurveRefType)curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt();
|
|
||||||
curveRef = CurveReference(type, CurveReference::getDefaultValue(type));
|
curveRef = CurveReference(type, CurveReference::getDefaultValue(type));
|
||||||
if (curveImageWidget && curveRef.type == CurveReference::CURVE_REF_CUSTOM)
|
|
||||||
curveImageWidget->setIndex(abs(curveRef.value) - 1);
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CurveReferenceUIManager::valueSBChanged()
|
void CurveReferenceUIManager::cboCurveFuncChanged(int index)
|
||||||
{
|
{
|
||||||
if (!lock) {
|
if (!lock) {
|
||||||
curveRef.value = curveValueSB->value();
|
if (!cboType)
|
||||||
update();
|
curveRef.type = CurveReference::CURVE_REF_CUSTOM;
|
||||||
}
|
curveRef.value = cboCurveFunc->itemData(index).toInt();
|
||||||
}
|
|
||||||
|
|
||||||
void CurveReferenceUIManager::valueCBChanged()
|
|
||||||
{
|
|
||||||
if (!lock) {
|
|
||||||
curveRef.value = curveValueCB->itemData(curveValueCB->currentIndex()).toInt();
|
|
||||||
if (curveImageWidget && curveRef.type == CurveReference::CURVE_REF_CUSTOM)
|
|
||||||
curveImageWidget->setIndex(abs(curveRef.value) - 1);
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -303,10 +284,6 @@ void CurveReferenceUIManager::populateValueCB(QComboBox * cb)
|
|||||||
{
|
{
|
||||||
if (cb) {
|
if (cb) {
|
||||||
switch (curveRef.type) {
|
switch (curveRef.type) {
|
||||||
case CurveReference::CURVE_REF_DIFF:
|
|
||||||
case CurveReference::CURVE_REF_EXPO:
|
|
||||||
cb->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_GVARREF));
|
|
||||||
break;
|
|
||||||
case CurveReference::CURVE_REF_FUNC:
|
case CurveReference::CURVE_REF_FUNC:
|
||||||
cb->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_FUNC));
|
cb->setModel(filteredModelFactory->getItemModel(CurveRefFilteredFactory::CRFIM_FUNC));
|
||||||
break;
|
break;
|
||||||
@@ -324,7 +301,7 @@ void CurveReferenceUIManager::populateValueCB(QComboBox * cb)
|
|||||||
void CurveReferenceUIManager::curveImageDoubleClicked()
|
void CurveReferenceUIManager::curveImageDoubleClicked()
|
||||||
{
|
{
|
||||||
if (curveRef.type == CurveReference::CURVE_REF_CUSTOM && abs(curveRef.value) > 0)
|
if (curveRef.type == CurveReference::CURVE_REF_CUSTOM && abs(curveRef.value) > 0)
|
||||||
curveImageWidget->edit();
|
curveImage->edit();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CurveReferenceUIManager::connectItemModelEvents(const FilteredItemModel * itemModel)
|
void CurveReferenceUIManager::connectItemModelEvents(const FilteredItemModel * itemModel)
|
||||||
|
|||||||
@@ -20,6 +20,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "rawsource.h"
|
||||||
|
|
||||||
#include <QtCore>
|
#include <QtCore>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
@@ -27,11 +29,13 @@
|
|||||||
#include <QSpinBox>
|
#include <QSpinBox>
|
||||||
#include <QStandardItemModel>
|
#include <QStandardItemModel>
|
||||||
|
|
||||||
|
class GeneralSettings;
|
||||||
class ModelData;
|
class ModelData;
|
||||||
class CurveRefFilteredFactory;
|
class CurveRefFilteredFactory;
|
||||||
class CompoundItemModelFactory;
|
class CompoundItemModelFactory;
|
||||||
class FilteredItemModel;
|
class FilteredItemModel;
|
||||||
class CurveImageWidget;
|
class CurveImageWidget;
|
||||||
|
class SourceNumRefEditor;
|
||||||
|
|
||||||
class CurveReference {
|
class CurveReference {
|
||||||
|
|
||||||
@@ -64,7 +68,8 @@ class CurveReference {
|
|||||||
const bool isSet() const { return !isEmpty(); }
|
const bool isSet() const { return !isEmpty(); }
|
||||||
const bool isValueNumber() const;
|
const bool isValueNumber() const;
|
||||||
const bool isValueReference() const { return !isValueNumber(); }
|
const bool isValueReference() const { return !isValueNumber(); }
|
||||||
const QString toString(const ModelData * model = nullptr, bool verbose = true) const;
|
const QString toString(const ModelData * model = nullptr, bool verbose = true, const GeneralSettings * const generalSettings = nullptr,
|
||||||
|
Board::Type board = Board::BOARD_UNKNOWN, bool prefixCustomName = true) const;
|
||||||
const bool isAvailable() const;
|
const bool isAvailable() const;
|
||||||
|
|
||||||
CurveRefType type;
|
CurveRefType type;
|
||||||
@@ -91,13 +96,17 @@ class CurveReferenceUIManager : public QObject {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CurveReferenceUIManager(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QSpinBox *curveValueSB, QComboBox *curveValueCB,
|
explicit CurveReferenceUIManager(QComboBox * cboType, QCheckBox * chkUseSource, QSpinBox * sbxValue, QComboBox * cboSource,
|
||||||
QLabel *curveImage, CurveReference & curve, ModelData & model, CompoundItemModelFactory * sharedItemModels,
|
QComboBox * cboCurveFunc, CurveImageWidget * curveImage, CurveReference & curveRef,
|
||||||
CurveRefFilteredFactory * curveRefFilteredFactory, QObject * parent = nullptr);
|
ModelData & model, CompoundItemModelFactory * sharedItemModels,
|
||||||
|
CurveRefFilteredFactory * curveRefFilteredFactory, FilteredItemModel * sourceItemModel,
|
||||||
|
QObject * parent = nullptr);
|
||||||
|
|
||||||
explicit CurveReferenceUIManager(QComboBox *curveValueCB, CurveReference & curve, ModelData & model, CompoundItemModelFactory * sharedItemModels,
|
explicit CurveReferenceUIManager(QComboBox *cboCurveFunc, CurveImageWidget * curveImage, CurveReference & curveRef, ModelData & model,
|
||||||
CurveRefFilteredFactory * curveRefFilteredFactory, QObject * parent = nullptr) :
|
CompoundItemModelFactory * sharedItemModels, CurveRefFilteredFactory * curveRefFilteredFactory,
|
||||||
CurveReferenceUIManager(nullptr, nullptr, nullptr, curveValueCB, nullptr, curve, model, sharedItemModels, curveRefFilteredFactory, parent) {}
|
QObject * parent = nullptr) :
|
||||||
|
CurveReferenceUIManager(nullptr, nullptr, nullptr, nullptr, cboCurveFunc, curveImage, curveRef, model, sharedItemModels,
|
||||||
|
curveRefFilteredFactory, nullptr, parent) {}
|
||||||
|
|
||||||
virtual ~CurveReferenceUIManager();
|
virtual ~CurveReferenceUIManager();
|
||||||
|
|
||||||
@@ -105,28 +114,25 @@ class CurveReferenceUIManager : public QObject {
|
|||||||
void resized();
|
void resized();
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void gvarCBChanged(int);
|
void cboTypeChanged(int);
|
||||||
void typeChanged(int);
|
void cboCurveFuncChanged(int);
|
||||||
void valueSBChanged();
|
|
||||||
void valueCBChanged();
|
|
||||||
void update();
|
void update();
|
||||||
void curveImageDoubleClicked();
|
void curveImageDoubleClicked();
|
||||||
void onItemModelAboutToBeUpdated();
|
void onItemModelAboutToBeUpdated();
|
||||||
void onItemModelUpdateComplete();
|
void onItemModelUpdateComplete();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QComboBox *curveTypeCB;
|
QComboBox *cboType;
|
||||||
QCheckBox *curveGVarCB;
|
QCheckBox *chkUseSource;
|
||||||
QSpinBox *curveValueSB;
|
QSpinBox *sbxValue;
|
||||||
QComboBox *curveValueCB;
|
QComboBox *cboSource;
|
||||||
CurveReference & curveRef;
|
QComboBox *cboCurveFunc;
|
||||||
ModelData & model;
|
CurveImageWidget *curveImage;
|
||||||
CompoundItemModelFactory *sharedItemModels;
|
CurveReference &curveRef;
|
||||||
|
ModelData &model;
|
||||||
CurveRefFilteredFactory *filteredModelFactory;
|
CurveRefFilteredFactory *filteredModelFactory;
|
||||||
bool lock;
|
bool lock;
|
||||||
CurveImageWidget *curveImageWidget = nullptr;
|
SourceNumRefEditor *srcNumRefEditor;
|
||||||
|
|
||||||
bool hasCapabilityGvars;
|
|
||||||
|
|
||||||
void connectItemModelEvents(const FilteredItemModel * itemModel);
|
void connectItemModelEvents(const FilteredItemModel * itemModel);
|
||||||
void populateValueCB(QComboBox * cb);
|
void populateValueCB(QComboBox * cb);
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ Node convert<ExpoData>::encode(const ExpoData& rhs)
|
|||||||
node["chn"] = rhs.chn;
|
node["chn"] = rhs.chn;
|
||||||
node["swtch"] = rhs.swtch;
|
node["swtch"] = rhs.swtch;
|
||||||
node["flightModes"] = YamlWriteFlightModes(rhs.flightModes);
|
node["flightModes"] = YamlWriteFlightModes(rhs.flightModes);
|
||||||
node["weight"] = YamlWriteMixWeight(rhs.weight);
|
node["weight"] = YamlSourceNumRefEncode(rhs.weight);
|
||||||
node["offset"] = YamlWriteMixWeight(rhs.offset);
|
node["offset"] = YamlSourceNumRefEncode(rhs.offset);
|
||||||
node["curve"] = rhs.curve;
|
node["curve"] = rhs.curve;
|
||||||
node["trimSource"] = rhs.carryTrim; // temporary for 2.8.1, trimSource in 2.9
|
node["trimSource"] = rhs.carryTrim; // temporary for 2.8.1, trimSource in 2.9
|
||||||
node["name"] = rhs.name;
|
node["name"] = rhs.name;
|
||||||
@@ -54,10 +54,10 @@ bool convert<ExpoData>::decode(const Node& node, ExpoData& rhs)
|
|||||||
rhs.flightModes = YamlReadFlightModes(node["flightModes"]);
|
rhs.flightModes = YamlReadFlightModes(node["flightModes"]);
|
||||||
}
|
}
|
||||||
if (node["weight"]) {
|
if (node["weight"]) {
|
||||||
rhs.weight = YamlReadMixWeight(node["weight"]);
|
rhs.weight = YamlSourceNumRefDecode(node["weight"]);
|
||||||
}
|
}
|
||||||
if (node["offset"]) {
|
if (node["offset"]) {
|
||||||
rhs.offset = YamlReadMixWeight(node["offset"]);
|
rhs.offset = YamlSourceNumRefDecode(node["offset"]);
|
||||||
}
|
}
|
||||||
node["curve"] >> rhs.curve;
|
node["curve"] >> rhs.curve;
|
||||||
if (node["carryTrim"]) { // 2.9 - change bugged carryTrim to trimSource
|
if (node["carryTrim"]) { // 2.9 - change bugged carryTrim to trimSource
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "yaml_rawswitch.h"
|
#include "yaml_rawswitch.h"
|
||||||
#include "yaml_rawsource.h"
|
#include "yaml_rawsource.h"
|
||||||
#include "curvereference.h"
|
#include "curvereference.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
|
||||||
static const YamlLookupTable mixMultiplexLut = {
|
static const YamlLookupTable mixMultiplexLut = {
|
||||||
{ MLTPX_ADD, "ADD" },
|
{ MLTPX_ADD, "ADD" },
|
||||||
@@ -32,46 +33,55 @@ static const YamlLookupTable mixMultiplexLut = {
|
|||||||
#define GVAR_SMALL 128
|
#define GVAR_SMALL 128
|
||||||
#define CPN_GV1 1024
|
#define CPN_GV1 1024
|
||||||
|
|
||||||
int32_t YamlReadMixWeight(const YAML::Node& node)
|
int32_t YamlSourceNumRefDecode(const YAML::Node& node)
|
||||||
{
|
{
|
||||||
std::string val = node.as<std::string>();
|
std::string val = node.as<std::string>();
|
||||||
if ((val.size() >= 4)
|
|
||||||
|
if (modelSettingsVersion < SemanticVersion(QString("2.11.0"))) {
|
||||||
|
if ((val.size() >= 4)
|
||||||
&& (val[0] == '-')
|
&& (val[0] == '-')
|
||||||
&& (val[1] == 'G')
|
&& (val[1] == 'G')
|
||||||
&& (val[2] == 'V')
|
&& (val[2] == 'V')
|
||||||
&& (val[3] >= '1')
|
&& (val[3] >= '1')
|
||||||
&& (val[3] <= '9')) {
|
&& (val[3] <= '9')) {
|
||||||
|
|
||||||
return -10000 - std::stoi(val.substr(3));
|
std::stringstream src(val.substr(3));
|
||||||
}
|
int gv = 0;
|
||||||
|
src >> gv;
|
||||||
|
return RawSource(SOURCE_TYPE_GVAR, gv).toValue() * -1;
|
||||||
|
}
|
||||||
|
|
||||||
if ((val.size() >= 3)
|
if ((val.size() >= 3)
|
||||||
&& (val[0] == 'G')
|
&& (val[0] == 'G')
|
||||||
&& (val[1] == 'V')
|
&& (val[1] == 'V')
|
||||||
&& (val[2] >= '1')
|
&& (val[2] >= '1')
|
||||||
&& (val[2] <= '9')) {
|
&& (val[2] <= '9')) {
|
||||||
|
|
||||||
return 10000 + std::stoi(val.substr(2));
|
std::stringstream src(val.substr(2));
|
||||||
|
int gv = 0;
|
||||||
|
src >> gv;
|
||||||
|
return RawSource(SOURCE_TYPE_GVAR, gv).toValue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
int i = val[0] == '-' ? 1 : 0;
|
||||||
return std::stoi(val);
|
|
||||||
} catch(...) {
|
if (val[i] >= '0' && val[i] <= '9')
|
||||||
throw YAML::TypedBadConversion<int>(node.Mark());
|
try {
|
||||||
}
|
return std::stoi(val);
|
||||||
|
} catch(...) {
|
||||||
|
throw YAML::TypedBadConversion<int>(node.Mark());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return YamlRawSourceDecode(val).toValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string YamlWriteMixWeight(int32_t sval)
|
std::string YamlSourceNumRefEncode(int32_t sval)
|
||||||
{
|
{
|
||||||
if (sval < -10000) {
|
if (SourceNumRef(sval).isNumber())
|
||||||
int n = -sval - 10000;
|
return std::to_string(sval);
|
||||||
return std::string("-GV") + std::to_string(n);
|
else
|
||||||
} else if (sval > 10000) {
|
return YamlRawSourceEncode(RawSource(sval));
|
||||||
int n = sval - 10000;
|
|
||||||
return std::string("GV") + std::to_string(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
return std::to_string(sval);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t YamlReadFlightModes(const YAML::Node& node)
|
uint32_t YamlReadFlightModes(const YAML::Node& node)
|
||||||
@@ -108,7 +118,7 @@ Node convert<CurveReference>::encode(const CurveReference& rhs)
|
|||||||
{
|
{
|
||||||
Node node;
|
Node node;
|
||||||
node["type"] = (int)rhs.type;
|
node["type"] = (int)rhs.type;
|
||||||
node["value"] = YamlWriteMixWeight(rhs.value);
|
node["value"] = YamlSourceNumRefEncode(rhs.value);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +129,7 @@ bool convert<CurveReference>::decode(const Node& node, CurveReference& rhs)
|
|||||||
node["type"] >> type;
|
node["type"] >> type;
|
||||||
rhs.type = (CurveReference::CurveRefType)type;
|
rhs.type = (CurveReference::CurveRefType)type;
|
||||||
if (node["value"]) {
|
if (node["value"]) {
|
||||||
rhs.value = YamlReadMixWeight(node["value"]);
|
rhs.value = YamlSourceNumRefDecode(node["value"]);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -129,7 +139,7 @@ Node convert<MixData>::encode(const MixData& rhs)
|
|||||||
Node node;
|
Node node;
|
||||||
node["destCh"] = rhs.destCh - 1;
|
node["destCh"] = rhs.destCh - 1;
|
||||||
node["srcRaw"] = rhs.srcRaw;
|
node["srcRaw"] = rhs.srcRaw;
|
||||||
node["weight"] = YamlWriteMixWeight(rhs.weight);
|
node["weight"] = YamlSourceNumRefEncode(rhs.weight);
|
||||||
node["swtch"] = rhs.swtch;
|
node["swtch"] = rhs.swtch;
|
||||||
node["curve"] = rhs.curve;
|
node["curve"] = rhs.curve;
|
||||||
node["delayUp"] = rhs.delayUp;
|
node["delayUp"] = rhs.delayUp;
|
||||||
@@ -141,7 +151,7 @@ Node convert<MixData>::encode(const MixData& rhs)
|
|||||||
node["mltpx"] = rhs.mltpx;
|
node["mltpx"] = rhs.mltpx;
|
||||||
node["mixWarn"] = rhs.mixWarn;
|
node["mixWarn"] = rhs.mixWarn;
|
||||||
node["flightModes"] = YamlWriteFlightModes(rhs.flightModes);
|
node["flightModes"] = YamlWriteFlightModes(rhs.flightModes);
|
||||||
node["offset"] = YamlWriteMixWeight(rhs.sOffset);
|
node["offset"] = YamlSourceNumRefEncode(rhs.sOffset);
|
||||||
node["name"] = rhs.name;
|
node["name"] = rhs.name;
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
@@ -151,7 +161,7 @@ bool convert<MixData>::decode(const Node& node, MixData& rhs)
|
|||||||
node["destCh"] >> ioffset_int((int&)rhs.destCh, -1);
|
node["destCh"] >> ioffset_int((int&)rhs.destCh, -1);
|
||||||
node["srcRaw"] >> rhs.srcRaw;
|
node["srcRaw"] >> rhs.srcRaw;
|
||||||
if (node["weight"]) {
|
if (node["weight"]) {
|
||||||
rhs.weight = YamlReadMixWeight(node["weight"]);
|
rhs.weight = YamlSourceNumRefDecode(node["weight"]);
|
||||||
}
|
}
|
||||||
node["swtch"] >> rhs.swtch;
|
node["swtch"] >> rhs.swtch;
|
||||||
node["curve"] >> rhs.curve;
|
node["curve"] >> rhs.curve;
|
||||||
@@ -167,7 +177,7 @@ bool convert<MixData>::decode(const Node& node, MixData& rhs)
|
|||||||
rhs.flightModes = YamlReadFlightModes(node["flightModes"]);
|
rhs.flightModes = YamlReadFlightModes(node["flightModes"]);
|
||||||
}
|
}
|
||||||
if (node["offset"]) {
|
if (node["offset"]) {
|
||||||
rhs.sOffset = YamlReadMixWeight(node["offset"]);
|
rhs.sOffset = YamlSourceNumRefDecode(node["offset"]);
|
||||||
}
|
}
|
||||||
node["name"] >> rhs.name;
|
node["name"] >> rhs.name;
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -21,8 +21,8 @@
|
|||||||
#include "yaml_ops.h"
|
#include "yaml_ops.h"
|
||||||
#include "mixdata.h"
|
#include "mixdata.h"
|
||||||
|
|
||||||
int32_t YamlReadMixWeight(const YAML::Node& node);
|
int32_t YamlSourceNumRefDecode(const YAML::Node& node);
|
||||||
std::string YamlWriteMixWeight(int32_t sval);
|
std::string YamlSourceNumRefEncode(int32_t sval);
|
||||||
|
|
||||||
uint32_t YamlReadFlightModes(const YAML::Node& node);
|
uint32_t YamlReadFlightModes(const YAML::Node& node);
|
||||||
std::string YamlWriteFlightModes(uint32_t val);
|
std::string YamlWriteFlightModes(uint32_t val);
|
||||||
|
|||||||
@@ -546,6 +546,7 @@ struct convert<LimitData> {
|
|||||||
node["symetrical"] = (int)rhs.symetrical;
|
node["symetrical"] = (int)rhs.symetrical;
|
||||||
node["name"] = rhs.name;
|
node["name"] = rhs.name;
|
||||||
node["curve"] = rhs.curve.value;
|
node["curve"] = rhs.curve.value;
|
||||||
|
// rhs.curve.type is not encoded
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -565,6 +566,7 @@ struct convert<LimitData> {
|
|||||||
node["symetrical"] >> rhs.symetrical;
|
node["symetrical"] >> rhs.symetrical;
|
||||||
node["name"] >> rhs.name;
|
node["name"] >> rhs.name;
|
||||||
node["curve"] >> rhs.curve.value;
|
node["curve"] >> rhs.curve.value;
|
||||||
|
rhs.curve.type = CurveReference::CURVE_REF_CUSTOM; // this is not encoded but needed internally so force type
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -25,6 +25,8 @@
|
|||||||
#include "opentxeeprom.h"
|
#include "opentxeeprom.h"
|
||||||
#include "customdebug.h"
|
#include "customdebug.h"
|
||||||
#include "opentxinterface.h"
|
#include "opentxinterface.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
#include "adjustmentreference.h"
|
||||||
|
|
||||||
using namespace Board;
|
using namespace Board;
|
||||||
|
|
||||||
@@ -805,6 +807,11 @@ class CurveReferenceField: public TransformedField {
|
|||||||
{
|
{
|
||||||
curve.type = (CurveReference::CurveRefType)_curve_type;
|
curve.type = (CurveReference::CurveRefType)_curve_type;
|
||||||
curve.value = smallGvarExport(_curve_value);
|
curve.value = smallGvarExport(_curve_value);
|
||||||
|
// 2,11 num or gvar changed to SourceNumRef
|
||||||
|
if ((curve.type == CurveReference::CURVE_REF_DIFF || curve.type == CurveReference::CURVE_REF_EXPO) &&
|
||||||
|
AdjustmentReference(curve.value).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
curve.value = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(curve.value).value).toValue();
|
||||||
|
|
||||||
qCDebug(eepromImport) << QString("imported CurveReference(%1)").arg(curve.toString());
|
qCDebug(eepromImport) << QString("imported CurveReference(%1)").arg(curve.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1114,8 +1121,20 @@ class MixField: public TransformedField {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 2.11
|
||||||
|
if ((mix.curve.type == CurveReference::CURVE_REF_DIFF || mix.curve.type == CurveReference::CURVE_REF_EXPO) &&
|
||||||
|
AdjustmentReference(mix.curve.value).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
mix.curve.value = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(mix.curve.value).value).toValue();
|
||||||
|
|
||||||
importGvarParam(mix.weight, _weight, version);
|
importGvarParam(mix.weight, _weight, version);
|
||||||
|
// 2.11
|
||||||
|
if (AdjustmentReference(mix.weight).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
mix.weight = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(mix.weight).value).toValue();
|
||||||
|
|
||||||
importGvarParam(mix.sOffset, _offset, version);
|
importGvarParam(mix.sOffset, _offset, version);
|
||||||
|
// 2.11
|
||||||
|
if (AdjustmentReference(mix.sOffset).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
mix.sOffset = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(mix.sOffset).value).toValue();
|
||||||
|
|
||||||
qCDebug(eepromImport) << QString("imported %1: ch %2, name '%3'").arg(internalField.getName()).arg(mix.destCh).arg(mix.name);
|
qCDebug(eepromImport) << QString("imported %1: ch %2, name '%3'").arg(internalField.getName()).arg(mix.destCh).arg(mix.name);
|
||||||
}
|
}
|
||||||
@@ -1222,9 +1241,15 @@ class InputField: public TransformedField {
|
|||||||
}
|
}
|
||||||
|
|
||||||
expo.weight = smallGvarExport(_weight);
|
expo.weight = smallGvarExport(_weight);
|
||||||
|
// 2.11
|
||||||
|
if (AdjustmentReference(expo.weight).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
expo.weight = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(expo.weight).value).toValue();
|
||||||
|
|
||||||
if (IS_STM32(board) || version >= 218) {
|
if (IS_STM32(board) || version >= 218) {
|
||||||
expo.offset = smallGvarExport(_offset);
|
expo.offset = smallGvarExport(_offset);
|
||||||
|
// 2.11
|
||||||
|
if (AdjustmentReference(expo.offset).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
expo.offset = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(expo.offset).value).toValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IS_TARANIS(board) && version < 218) {
|
if (!IS_TARANIS(board) && version < 218) {
|
||||||
@@ -1235,6 +1260,13 @@ class InputField: public TransformedField {
|
|||||||
else
|
else
|
||||||
expo.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
|
expo.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 2.11
|
||||||
|
if ((expo.curve.type == CurveReference::CURVE_REF_DIFF || expo.curve.type == CurveReference::CURVE_REF_EXPO) &&
|
||||||
|
AdjustmentReference(expo.curve.value).type == AdjustmentReference::ADJUST_REF_GVAR)
|
||||||
|
expo.curve.value = RawSource(SOURCE_TYPE_GVAR, AdjustmentReference(expo.curve.value).value).toValue();
|
||||||
|
|
||||||
|
|
||||||
qCDebug(eepromImport) << QString("imported %1: ch %2 name '%3'").arg(internalField.getName()).arg(expo.chn).arg(expo.name);
|
qCDebug(eepromImport) << QString("imported %1: ch %2 name '%3'").arg(internalField.getName()).arg(expo.chn).arg(expo.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
|
|||||||
QString RawSource::toString(const ModelData * model, const GeneralSettings * const generalSettings, Board::Type board, bool prefixCustomName) const
|
QString RawSource::toString(const ModelData * model, const GeneralSettings * const generalSettings, Board::Type board, bool prefixCustomName) const
|
||||||
{
|
{
|
||||||
if (index < 0)
|
if (index < 0)
|
||||||
return CPN_STR_SRC_INDICATOR_INVERT % RawSource(type, -index).toString(model, generalSettings, board, prefixCustomName);
|
return CPN_STR_SRC_INDICATOR_NEG % RawSource(type, -index).toString(model, generalSettings, board, prefixCustomName);
|
||||||
|
|
||||||
if (board == Board::BOARD_UNKNOWN)
|
if (board == Board::BOARD_UNKNOWN)
|
||||||
board = getCurrentBoard();
|
board = getCurrentBoard();
|
||||||
|
|||||||
@@ -0,0 +1,156 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) EdgeTX
|
||||||
|
*
|
||||||
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
|
* th9x - http://code.google.com/p/th9x
|
||||||
|
* er9x - http://code.google.com/p/er9x
|
||||||
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
|
*
|
||||||
|
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
#include "filtereditemmodels.h"
|
||||||
|
#include "helpers.h"
|
||||||
|
|
||||||
|
QString SourceNumRef::toString(const ModelData * model, const GeneralSettings * const generalSettings,
|
||||||
|
Board::Type board, bool prefixCustomName) const
|
||||||
|
{
|
||||||
|
if (srcNum.type == SOURCE_TYPE_NONE)
|
||||||
|
return QString::number(srcNum.index);
|
||||||
|
else
|
||||||
|
return srcNum.toString(model, generalSettings, board, prefixCustomName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// static
|
||||||
|
int SourceNumRef::getDefault(int useSource, int dflt)
|
||||||
|
{
|
||||||
|
if (useSource)
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
return dflt;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SourceNumRefEditor
|
||||||
|
*/
|
||||||
|
|
||||||
|
SourceNumRefEditor::SourceNumRefEditor(int & srcNumValue, QCheckBox * chkUseSource, QSpinBox * sbxValue, QComboBox * cboValue,
|
||||||
|
int defValue, int minValue, int maxValue, int step,
|
||||||
|
ModelData & model, FilteredItemModel * sourceItemModel, QObject * parent) :
|
||||||
|
QObject(parent),
|
||||||
|
srcNumValue(srcNumValue),
|
||||||
|
chkUseSource(chkUseSource),
|
||||||
|
sbxValue(sbxValue),
|
||||||
|
cboValue(cboValue),
|
||||||
|
defValue(defValue),
|
||||||
|
model(model),
|
||||||
|
lock(false)
|
||||||
|
{
|
||||||
|
if (chkUseSource) {
|
||||||
|
connect(chkUseSource, &QCheckBox::stateChanged, this, &SourceNumRefEditor::chkUseSourceChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sbxValue) {
|
||||||
|
sbxValue->setMinimum(minValue);
|
||||||
|
sbxValue->setMaximum(maxValue);
|
||||||
|
sbxValue->setSingleStep(step);
|
||||||
|
sbxValue->setValue(defValue);
|
||||||
|
connect(sbxValue, &QSpinBox::editingFinished, this, &SourceNumRefEditor::sbxValueChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cboValue) {
|
||||||
|
cboValue->setModel(sourceItemModel);
|
||||||
|
cboValue->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
cboValue->setMaxVisibleItems(10);
|
||||||
|
cboValue->setCurrentIndex(Helpers::getFirstPosValueIndex(cboValue));
|
||||||
|
connect(cboValue, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SourceNumRefEditor::cboValueChanged);
|
||||||
|
}
|
||||||
|
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumRefEditor::chkUseSourceChanged(int state)
|
||||||
|
{
|
||||||
|
if (!lock) {
|
||||||
|
srcNumValue = SourceNumRef::getDefault(state, defValue);
|
||||||
|
|
||||||
|
if (state == Qt::Checked) {
|
||||||
|
cboValue->setCurrentIndex(cboValue->findData(srcNumValue));
|
||||||
|
if (cboValue->currentIndex() < 0)
|
||||||
|
cboValue->setCurrentIndex(Helpers::getFirstPosValueIndex(cboValue));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
sbxValue->setValue(srcNumValue);
|
||||||
|
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumRefEditor::sbxValueChanged()
|
||||||
|
{
|
||||||
|
if (!lock) {
|
||||||
|
srcNumValue = sbxValue->value();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumRefEditor::cboValueChanged(int index)
|
||||||
|
{
|
||||||
|
if (!lock) {
|
||||||
|
srcNumValue = cboValue->itemData(index).toInt();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumRefEditor::setVisible(bool state)
|
||||||
|
{
|
||||||
|
chkUseSource->setVisible(state);
|
||||||
|
cboValue->setVisible(state);
|
||||||
|
sbxValue->setVisible(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumRefEditor::update()
|
||||||
|
{
|
||||||
|
lock = true;
|
||||||
|
|
||||||
|
if (SourceNumRef(srcNumValue).isNumber()) {
|
||||||
|
if (chkUseSource)
|
||||||
|
chkUseSource->setChecked(false);
|
||||||
|
|
||||||
|
if (sbxValue) {
|
||||||
|
sbxValue->setValue(srcNumValue);
|
||||||
|
sbxValue->setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cboValue)
|
||||||
|
cboValue->setVisible(false);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (chkUseSource)
|
||||||
|
chkUseSource->setChecked(true);
|
||||||
|
|
||||||
|
if (sbxValue)
|
||||||
|
sbxValue->setVisible(false);
|
||||||
|
|
||||||
|
if (cboValue) {
|
||||||
|
cboValue->setCurrentIndex(cboValue->findData(srcNumValue));
|
||||||
|
cboValue->setVisible(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
emit resized();
|
||||||
|
|
||||||
|
lock = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) EdgeTX
|
||||||
|
*
|
||||||
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
|
* th9x - http://code.google.com/p/th9x
|
||||||
|
* er9x - http://code.google.com/p/er9x
|
||||||
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
|
*
|
||||||
|
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "rawsource.h"
|
||||||
|
|
||||||
|
#include <QtCore>
|
||||||
|
#include <QCheckBox>
|
||||||
|
#include <QComboBox>
|
||||||
|
#include <QSpinBox>
|
||||||
|
|
||||||
|
class FilteredItemModel;
|
||||||
|
|
||||||
|
/*
|
||||||
|
This class takes advantage of RawSource's assumption that small values must be SOURCE_TYPE_NONE ie zero
|
||||||
|
albeit anything other than value zero is unexpected. However there is no setter validation to stop unknown values.
|
||||||
|
|
||||||
|
Also SOURCE_TYPE_NONE must be excluded from selection lists.
|
||||||
|
It would not make sense anyway as it equates to value 0 and thus ambiguous.
|
||||||
|
*/
|
||||||
|
|
||||||
|
class SourceNumRef {
|
||||||
|
|
||||||
|
Q_DECLARE_TR_FUNCTIONS(SourceNumRef)
|
||||||
|
|
||||||
|
public:
|
||||||
|
SourceNumRef() : srcNum(RawSource()) {}
|
||||||
|
explicit SourceNumRef(int value) : srcNum(RawSource(value)) {}
|
||||||
|
SourceNumRef(RawSourceType type, int index = 0) : srcNum(RawSource(type, index)) {}
|
||||||
|
|
||||||
|
virtual ~SourceNumRef() {}
|
||||||
|
|
||||||
|
int toValue() { return srcNum.toValue(); }
|
||||||
|
|
||||||
|
QString toString(const ModelData * model = nullptr, const GeneralSettings * const generalSettings = nullptr,
|
||||||
|
Board::Type board = Board::BOARD_UNKNOWN, bool prefixCustomName = true) const;
|
||||||
|
|
||||||
|
const bool isNumber() const { return srcNum.type == SOURCE_TYPE_NONE; }
|
||||||
|
const bool isSource() const { return srcNum.type != SOURCE_TYPE_NONE; }
|
||||||
|
static int getDefault(int useSource, int dflt);
|
||||||
|
|
||||||
|
private:
|
||||||
|
RawSource srcNum;
|
||||||
|
};
|
||||||
|
|
||||||
|
class SourceNumRefEditor : public QObject {
|
||||||
|
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit SourceNumRefEditor(int & srcNumValue, QCheckBox * chkUseSource, QSpinBox * sbxValue, QComboBox * cboValue,
|
||||||
|
int defValue, int minValue, int maxValue, int step,
|
||||||
|
ModelData & model, FilteredItemModel * sourceItemModel, QObject * parent = nullptr);
|
||||||
|
|
||||||
|
virtual ~SourceNumRefEditor() {}
|
||||||
|
|
||||||
|
void setLock(bool state) { lock = state; }
|
||||||
|
void setVisible(bool state);
|
||||||
|
void update();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void resized();
|
||||||
|
|
||||||
|
protected slots:
|
||||||
|
void chkUseSourceChanged(int state);
|
||||||
|
void sbxValueChanged();
|
||||||
|
void cboValueChanged(int index);
|
||||||
|
|
||||||
|
protected:
|
||||||
|
int &srcNumValue;
|
||||||
|
QCheckBox *chkUseSource;
|
||||||
|
QSpinBox *sbxValue;
|
||||||
|
QComboBox *cboValue;
|
||||||
|
int defValue;
|
||||||
|
ModelData &model;
|
||||||
|
bool lock;
|
||||||
|
};
|
||||||
@@ -324,6 +324,37 @@ void Helpers::setBitmappedValue(unsigned int & field, unsigned int value, unsign
|
|||||||
field = (field & ~fieldmask) | (value << (numbits * index + offset));
|
field = (field & ~fieldmask) | (value << (numbits * index + offset));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// return index of 'none' ie zero or first positive data entry in potentially an asymetrical list
|
||||||
|
int Helpers::getFirstPosValueIndex(QComboBox * cbo)
|
||||||
|
{
|
||||||
|
const int cnt = cbo->count();
|
||||||
|
if (cnt == 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
const int idx = cnt / 2;
|
||||||
|
const int val = cbo->itemData(idx).toInt();
|
||||||
|
|
||||||
|
if (val == 0)
|
||||||
|
return idx;
|
||||||
|
|
||||||
|
const int step = val > 0 ? -1 : 1;
|
||||||
|
|
||||||
|
for (int i = idx + step; i >= 0 && i < cbo->count(); i += step) {
|
||||||
|
if (cbo->findData(i) == 0)
|
||||||
|
return i;
|
||||||
|
else if (step < 0 && cbo->itemData(i).toInt() < 0) {
|
||||||
|
if (i++ < cbo->count())
|
||||||
|
return i++;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
else if (step > 0 && cbo->itemData(i).toInt() > 0)
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
// Flag when simulator is running
|
// Flag when simulator is running
|
||||||
static bool simulatorRunning = false;
|
static bool simulatorRunning = false;
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
#include <QElapsedTimer>
|
#include <QElapsedTimer>
|
||||||
#include <QStandardItemModel>
|
#include <QStandardItemModel>
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
|
#include <QComboBox>
|
||||||
|
|
||||||
extern const QColor colors[CPN_MAX_CURVES];
|
extern const QColor colors[CPN_MAX_CURVES];
|
||||||
|
|
||||||
@@ -117,6 +118,7 @@ namespace Helpers
|
|||||||
QString removeAccents(const QString & str);
|
QString removeAccents(const QString & str);
|
||||||
unsigned int getBitmappedValue(const unsigned int & field, const unsigned int index = 0, const unsigned int numbits = 1, const unsigned int offset = 0);
|
unsigned int getBitmappedValue(const unsigned int & field, const unsigned int index = 0, const unsigned int numbits = 1, const unsigned int offset = 0);
|
||||||
void setBitmappedValue(unsigned int & field, unsigned int value, unsigned int index = 0, unsigned int numbits = 1, unsigned int offset = 0);
|
void setBitmappedValue(unsigned int & field, unsigned int value, unsigned int index = 0, unsigned int numbits = 1, unsigned int offset = 0);
|
||||||
|
int getFirstPosValueIndex(QComboBox * cbo);
|
||||||
|
|
||||||
} // namespace Helpers
|
} // namespace Helpers
|
||||||
|
|
||||||
|
|||||||
@@ -104,6 +104,9 @@ ChannelsPanel::ChannelsPanel(QWidget * parent, ModelData & model, GeneralSetting
|
|||||||
|
|
||||||
int gvid = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_GVarRef)), "GVarRef");
|
int gvid = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_GVarRef)), "GVarRef");
|
||||||
|
|
||||||
|
curveRefFilteredItemModels = new CurveRefFilteredFactory(sharedItemModels,
|
||||||
|
firmware->getCapability(HasMixerExpo) ? 0 : FilteredItemModel::PositiveFilter);
|
||||||
|
|
||||||
QStringList headerLabels;
|
QStringList headerLabels;
|
||||||
headerLabels << "#";
|
headerLabels << "#";
|
||||||
if (channelNameMaxLen > 0) {
|
if (channelNameMaxLen > 0) {
|
||||||
@@ -162,20 +165,15 @@ ChannelsPanel::ChannelsPanel(QWidget * parent, ModelData & model, GeneralSetting
|
|||||||
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
||||||
curveCB[i] = new QComboBox(this);
|
curveCB[i] = new QComboBox(this);
|
||||||
curveCB[i]->setProperty("index", i);
|
curveCB[i]->setProperty("index", i);
|
||||||
curveCB[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
|
||||||
curveCB[i]->setModel(dialogFilteredItemModels->getItemModel(crvid));
|
|
||||||
connect(curveCB[i], SIGNAL(currentIndexChanged(int)), this, SLOT(curveEdited()));
|
|
||||||
tableLayout->addWidget(i, col++, curveCB[i]);
|
tableLayout->addWidget(i, col++, curveCB[i]);
|
||||||
|
|
||||||
curveImage[i] = new CurveImageWidget(this);
|
curveImage[i] = new CurveImageWidget(this);
|
||||||
int crvidx = model.limitData[i].curve.value - 1;
|
|
||||||
QColor pencolor = colors[crvidx >= 0 ? crvidx : Qt::black];
|
|
||||||
curveImage[i]->set(&model, firmware, sharedItemModels, crvidx, pencolor, 3);
|
|
||||||
curveImage[i]->setGrid(Qt::gray, 2);
|
|
||||||
curveImage[i]->setProperty("index", i);
|
curveImage[i]->setProperty("index", i);
|
||||||
curveImage[i]->setFixedSize(QSize(100, 100));
|
curveImage[i]->setFixedSize(QSize(100, 100));
|
||||||
connect(curveImage[i], &CurveImageWidget::doubleClicked, this, &ChannelsPanel::on_curveImageDoubleClicked);
|
|
||||||
tableLayout->addWidget(i, col++, curveImage[i]);
|
tableLayout->addWidget(i, col++, curveImage[i]);
|
||||||
|
|
||||||
|
curveGroup[i] = new CurveReferenceUIManager(curveCB[i], curveImage[i], model.limitData[i].curve, model, sharedItemModels,
|
||||||
|
curveRefFilteredItemModels, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
// PPM center
|
// PPM center
|
||||||
@@ -201,6 +199,7 @@ ChannelsPanel::ChannelsPanel(QWidget * parent, ModelData & model, GeneralSetting
|
|||||||
tableLayout->addWidget(i, col++, symlimitsChk[i]);
|
tableLayout->addWidget(i, col++, symlimitsChk[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
update();
|
update();
|
||||||
|
|
||||||
disableMouseScrolling();
|
disableMouseScrolling();
|
||||||
@@ -222,8 +221,10 @@ ChannelsPanel::~ChannelsPanel()
|
|||||||
delete curveCB[i];
|
delete curveCB[i];
|
||||||
delete centerSB[i];
|
delete centerSB[i];
|
||||||
delete symlimitsChk[i];
|
delete symlimitsChk[i];
|
||||||
|
delete curveGroup[i];
|
||||||
}
|
}
|
||||||
delete dialogFilteredItemModels;
|
delete dialogFilteredItemModels;
|
||||||
|
delete curveRefFilteredItemModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelsPanel::symlimitsEdited()
|
void ChannelsPanel::symlimitsEdited()
|
||||||
@@ -270,24 +271,6 @@ void ChannelsPanel::invEdited()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelsPanel::curveEdited()
|
|
||||||
{
|
|
||||||
if (!lock) {
|
|
||||||
QComboBox *cb = qobject_cast<QComboBox*>(sender());
|
|
||||||
int index = cb->property("index").toInt();
|
|
||||||
// ignore unnecessary updates that could be triggered by updates to the data model
|
|
||||||
LimitData &ld = model->limitData[index];
|
|
||||||
if (ld.curve != CurveReference(CurveReference::CURVE_REF_CUSTOM, cb->itemData(cb->currentIndex()).toInt())) {
|
|
||||||
ld.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, cb->itemData(cb->currentIndex()).toInt());
|
|
||||||
curveImage[index]->setIndex(abs(ld.curve.value) - 1);
|
|
||||||
if (abs(ld.curve.value) > 0)
|
|
||||||
curveImage[index]->setPen(colors[abs(ld.curve.value) - 1], 3);
|
|
||||||
updateLine(index);
|
|
||||||
emit modified();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ChannelsPanel::ppmcenterEdited()
|
void ChannelsPanel::ppmcenterEdited()
|
||||||
{
|
{
|
||||||
if (!lock) {
|
if (!lock) {
|
||||||
@@ -317,16 +300,6 @@ void ChannelsPanel::updateLine(int i)
|
|||||||
chnMin[i]->setValue(chn.min);
|
chnMin[i]->setValue(chn.min);
|
||||||
chnMax[i]->setValue(chn.max);
|
chnMax[i]->setValue(chn.max);
|
||||||
invCB[i]->setCurrentIndex((chn.revert) ? 1 : 0);
|
invCB[i]->setCurrentIndex((chn.revert) ? 1 : 0);
|
||||||
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
|
|
||||||
curveCB[i]->setCurrentIndex(curveCB[i]->findData(chn.curve.value));
|
|
||||||
if (chn.curve.value == 0) {
|
|
||||||
curveImage[i]->setVisible(false);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
curveImage[i]->setVisible(true);
|
|
||||||
curveImage[i]->draw();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (firmware->getCapability(PPMCenter)) {
|
if (firmware->getCapability(PPMCenter)) {
|
||||||
centerSB[i]->setValue(chn.ppmCenter + 1500);
|
centerSB[i]->setValue(chn.ppmCenter + 1500);
|
||||||
}
|
}
|
||||||
@@ -496,14 +469,3 @@ void ChannelsPanel::updateItemModels()
|
|||||||
sharedItemModels->update(AbstractItemModel::IMUE_Channels);
|
sharedItemModels->update(AbstractItemModel::IMUE_Channels);
|
||||||
emit modified();
|
emit modified();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelsPanel::on_curveImageDoubleClicked()
|
|
||||||
{
|
|
||||||
bool ok = false;
|
|
||||||
int index = sender()->property("index").toInt(&ok);
|
|
||||||
|
|
||||||
if (ok && curveImage[abs(index)]->edit()) {
|
|
||||||
updateLine(index);
|
|
||||||
emit modified();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ class ChannelsPanel : public ModelPanel
|
|||||||
void symlimitsEdited();
|
void symlimitsEdited();
|
||||||
void nameEdited();
|
void nameEdited();
|
||||||
void invEdited();
|
void invEdited();
|
||||||
void curveEdited();
|
|
||||||
void ppmcenterEdited();
|
void ppmcenterEdited();
|
||||||
void update();
|
void update();
|
||||||
void updateLine(int index);
|
void updateLine(int index);
|
||||||
@@ -86,7 +85,6 @@ class ChannelsPanel : public ModelPanel
|
|||||||
void onCustomContextMenuRequested(QPoint pos);
|
void onCustomContextMenuRequested(QPoint pos);
|
||||||
void onItemModelAboutToBeUpdated();
|
void onItemModelAboutToBeUpdated();
|
||||||
void onItemModelUpdateComplete();
|
void onItemModelUpdateComplete();
|
||||||
void on_curveImageDoubleClicked();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QLineEdit *name[CPN_MAX_CHNOUT];
|
QLineEdit *name[CPN_MAX_CHNOUT];
|
||||||
@@ -102,6 +100,8 @@ class ChannelsPanel : public ModelPanel
|
|||||||
int chnCapability;
|
int chnCapability;
|
||||||
CompoundItemModelFactory *sharedItemModels;
|
CompoundItemModelFactory *sharedItemModels;
|
||||||
FilteredItemModelFactory *dialogFilteredItemModels;
|
FilteredItemModelFactory *dialogFilteredItemModels;
|
||||||
|
CurveRefFilteredFactory *curveRefFilteredItemModels;
|
||||||
|
CurveReferenceUIManager *curveGroup[CPN_MAX_CHNOUT];
|
||||||
|
|
||||||
bool hasClipboardData(QByteArray * data = nullptr) const;
|
bool hasClipboardData(QByteArray * data = nullptr) const;
|
||||||
bool insertAllowed() const;
|
bool insertAllowed() const;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ CurvesPanel::CurvesPanel(QWidget * parent, ModelData & model, GeneralSettings &
|
|||||||
tableLayout->addWidget(i, col++, label);
|
tableLayout->addWidget(i, col++, label);
|
||||||
|
|
||||||
image[i] = new CurveImageWidget(this);
|
image[i] = new CurveImageWidget(this);
|
||||||
image[i]->set(&model, firmware, sharedItemModels, i, colors[i], 3);
|
image[i]->set(&model, firmware, sharedItemModels, i + 1, colors[i], 3);
|
||||||
image[i]->setGrid(Qt::gray, 2);
|
image[i]->setGrid(Qt::gray, 2);
|
||||||
image[i]->setProperty("index", i);
|
image[i]->setProperty("index", i);
|
||||||
image[i]->setFixedSize(QSize(100, 100));
|
image[i]->setFixedSize(QSize(100, 100));
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) OpenTX
|
* Copyright (C) EdgeTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
@@ -23,6 +24,7 @@
|
|||||||
#include "filtereditemmodels.h"
|
#include "filtereditemmodels.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "namevalidator.h"
|
#include "namevalidator.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
|
||||||
ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, GeneralSettings & generalSettings,
|
ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, GeneralSettings & generalSettings,
|
||||||
Firmware * firmware, QString & inputName, CompoundItemModelFactory * sharedItemModels) :
|
Firmware * firmware, QString & inputName, CompoundItemModelFactory * sharedItemModels) :
|
||||||
@@ -33,14 +35,12 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
|
|||||||
firmware(firmware),
|
firmware(firmware),
|
||||||
ed(expoData),
|
ed(expoData),
|
||||||
inputName(inputName),
|
inputName(inputName),
|
||||||
modelPrinter(firmware, generalSettings, model),
|
|
||||||
lock(false)
|
lock(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
Board::Type board = firmware->getBoard();
|
Board::Type board = firmware->getBoard();
|
||||||
dialogFilteredItemModels = new FilteredItemModelFactory();
|
dialogFilteredItemModels = new FilteredItemModelFactory();
|
||||||
int id;
|
|
||||||
|
|
||||||
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
||||||
QCheckBox * tmp[CPN_MAX_FLIGHT_MODES] = {ui->cb_FP0, ui->cb_FP1, ui->cb_FP2, ui->cb_FP3, ui->cb_FP4, ui->cb_FP5, ui->cb_FP6, ui->cb_FP7, ui->cb_FP8 };
|
QCheckBox * tmp[CPN_MAX_FLIGHT_MODES] = {ui->cb_FP0, ui->cb_FP1, ui->cb_FP2, ui->cb_FP3, ui->cb_FP4, ui->cb_FP5, ui->cb_FP6, ui->cb_FP7, ui->cb_FP8 };
|
||||||
@@ -51,28 +51,35 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
|
|||||||
RawSourceType srcType = (firmware->getCapability(VirtualInputs) ? SOURCE_TYPE_VIRTUAL_INPUT : SOURCE_TYPE_INPUT);
|
RawSourceType srcType = (firmware->getCapability(VirtualInputs) ? SOURCE_TYPE_VIRTUAL_INPUT : SOURCE_TYPE_INPUT);
|
||||||
setWindowTitle(tr("Edit %1").arg(RawSource(srcType, ed->chn).toString(&model, &generalSettings)));
|
setWindowTitle(tr("Edit %1").arg(RawSource(srcType, ed->chn).toString(&model, &generalSettings)));
|
||||||
|
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_GVarRef)), "GVarRef");
|
int imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
||||||
gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, model, 100, -100, 100, 1.0,
|
(RawSource::AllSourceGroups & ~RawSource::NoneGroup & ~RawSource::ScriptsGroup & ~RawSource::InputsGroup)),
|
||||||
dialogFilteredItemModels->getItemModel(id));
|
"EditorSource");
|
||||||
|
|
||||||
gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, ed->offset, model, 0, -100, 100, 1.0,
|
FilteredItemModel *esMdl = dialogFilteredItemModels->getItemModel(imId);
|
||||||
dialogFilteredItemModels->getItemModel(id));
|
|
||||||
|
weightEditor = new SourceNumRefEditor(ed->weight, ui->chkWeightUseSource, ui->sbWeightValue, ui->cboWeightSource, 100, -100, 100, 1.0,
|
||||||
|
model, esMdl);
|
||||||
|
|
||||||
|
connect(weightEditor, &SourceNumRefEditor::resized, this, [=] () { shrink(); });
|
||||||
|
|
||||||
|
offsetEditor = new SourceNumRefEditor(ed->offset, ui->chkOffsetUseSource, ui->sbOffsetValue, ui->cboOffsetSource, 0, -100, 100, 1.0,
|
||||||
|
model, esMdl);
|
||||||
|
|
||||||
|
connect(offsetEditor, &SourceNumRefEditor::resized, this, [=] () { shrink(); });
|
||||||
|
|
||||||
curveRefFilteredItemModels = new CurveRefFilteredFactory(sharedItemModels,
|
curveRefFilteredItemModels = new CurveRefFilteredFactory(sharedItemModels,
|
||||||
firmware->getCapability(HasInputDiff) ? 0 : FilteredItemModel::PositiveFilter);
|
firmware->getCapability(HasInputDiff) ? 0 : FilteredItemModel::PositiveFilter);
|
||||||
|
|
||||||
curveGroup = new CurveReferenceUIManager(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueSB, ui->curveValueCB, ui->curveImage, ed->curve, model,
|
curveGroup = new CurveReferenceUIManager(ui->cboCurveType, ui->chkCurveUseSource, ui->sbCurveValue, ui->cboCurveSource, ui->cboCurveFunc,
|
||||||
sharedItemModels, curveRefFilteredItemModels, this);
|
ui->imgCurve, ed->curve, model, sharedItemModels, curveRefFilteredItemModels, esMdl, this);
|
||||||
|
|
||||||
|
|
||||||
connect(curveGroup, &CurveReferenceUIManager::resized, this, [=] () {
|
connect(curveGroup, &CurveReferenceUIManager::resized, this, [=] () { shrink(); });
|
||||||
this->adjustSize();
|
|
||||||
this->adjustSize(); // second call seems to be required when hidden fields otherwise not all padding removed
|
|
||||||
});
|
|
||||||
|
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
|
imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
|
||||||
RawSwitch::MixesContext), "RawSwitch");
|
RawSwitch::MixesContext), "RawSwitch");
|
||||||
ui->switchesCB->setModel(dialogFilteredItemModels->getItemModel(id));
|
ui->switchesCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
ui->switchesCB->setModel(dialogFilteredItemModels->getItemModel(imId));
|
||||||
ui->switchesCB->setCurrentIndex(ui->switchesCB->findData(ed->swtch.toValue()));
|
ui->switchesCB->setCurrentIndex(ui->switchesCB->findData(ed->swtch.toValue()));
|
||||||
|
|
||||||
ui->sideCB->setCurrentIndex(ed->mode - 1);
|
ui->sideCB->setCurrentIndex(ed->mode - 1);
|
||||||
@@ -105,12 +112,13 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
|
|||||||
ui->inputName->setMaxLength(firmware->getCapability(InputsLength));
|
ui->inputName->setMaxLength(firmware->getCapability(InputsLength));
|
||||||
int flags = RawSource::InputSourceGroups & ~RawSource::NoneGroup & ~RawSource::InputsGroup;
|
int flags = RawSource::InputSourceGroups & ~RawSource::NoneGroup & ~RawSource::InputsGroup;
|
||||||
flags |= RawSource::GVarsGroup | RawSource::TelemGroup;
|
flags |= RawSource::GVarsGroup | RawSource::TelemGroup;
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
||||||
flags), "RawSource");
|
flags), "RawSource");
|
||||||
ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(id));
|
ui->sourceCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(imId));
|
||||||
ui->sourceCB->setCurrentIndex(ui->sourceCB->findData(ed->srcRaw.toValue()));
|
ui->sourceCB->setCurrentIndex(ui->sourceCB->findData(ed->srcRaw.toValue()));
|
||||||
if (ui->sourceCB->currentIndex() < 0 && ed->srcRaw.toValue() == 0)
|
if (ui->sourceCB->currentIndex() < 0 && ed->srcRaw.toValue() == 0)
|
||||||
ui->sourceCB->setCurrentIndex(ui->sourceCB->count() / 2); // '----' not in list so set to first positive entry
|
ui->sourceCB->setCurrentIndex(Helpers::getFirstPosValueIndex(ui->sourceCB));
|
||||||
ui->inputName->setValidator(new NameValidator(board, this));
|
ui->inputName->setValidator(new NameValidator(board, this));
|
||||||
ui->inputName->setText(inputName);
|
ui->inputName->setText(inputName);
|
||||||
}
|
}
|
||||||
@@ -164,15 +172,16 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
|
|||||||
connect(ui->inputName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
connect(ui->inputName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
}
|
}
|
||||||
|
|
||||||
adjustSize();
|
shrink();
|
||||||
}
|
}
|
||||||
|
|
||||||
ExpoDialog::~ExpoDialog()
|
ExpoDialog::~ExpoDialog()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
delete gvWeightGroup;
|
delete weightEditor;
|
||||||
delete gvOffsetGroup;
|
delete offsetEditor;
|
||||||
delete dialogFilteredItemModels;
|
delete dialogFilteredItemModels;
|
||||||
|
delete curveRefFilteredItemModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ExpoDialog::updateScale()
|
void ExpoDialog::updateScale()
|
||||||
@@ -278,3 +287,9 @@ void ExpoDialog::fmInvertAll()
|
|||||||
lock = false;
|
lock = false;
|
||||||
valuesChanged();
|
valuesChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ExpoDialog::shrink()
|
||||||
|
{
|
||||||
|
this->adjustSize();
|
||||||
|
this->resize(0, 0);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) OpenTX
|
* Copyright (C) EdgeTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
@@ -20,15 +21,15 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QtWidgets>
|
|
||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
#include "modelprinter.h"
|
|
||||||
|
|
||||||
class GVarGroup;
|
#include <QtWidgets>
|
||||||
|
|
||||||
class CompoundItemModelFactory;
|
class CompoundItemModelFactory;
|
||||||
class FilteredItemModelFactory;
|
class FilteredItemModelFactory;
|
||||||
class CurveRefFilteredFactory;
|
class CurveRefFilteredFactory;
|
||||||
class CurveReferenceUIManager;
|
class CurveReferenceUIManager;
|
||||||
|
class SourceNumRefEditor;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ExpoDialog;
|
class ExpoDialog;
|
||||||
@@ -58,13 +59,14 @@ class ExpoDialog : public QDialog {
|
|||||||
Firmware * firmware;
|
Firmware * firmware;
|
||||||
ExpoData * ed;
|
ExpoData * ed;
|
||||||
QString & inputName;
|
QString & inputName;
|
||||||
GVarGroup * gvWeightGroup;
|
SourceNumRefEditor * weightEditor;
|
||||||
GVarGroup * gvOffsetGroup;
|
SourceNumRefEditor * offsetEditor;
|
||||||
CurveReferenceUIManager * curveGroup;
|
CurveReferenceUIManager * curveGroup;
|
||||||
ModelPrinter modelPrinter;
|
|
||||||
bool lock;
|
bool lock;
|
||||||
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
||||||
FilteredItemModelFactory *dialogFilteredItemModels;
|
FilteredItemModelFactory *dialogFilteredItemModels;
|
||||||
CurveRefFilteredFactory *curveRefFilteredItemModels;
|
CurveRefFilteredFactory *curveRefFilteredItemModels;
|
||||||
int carryTrimFilterFlags = 0;
|
int carryTrimFilterFlags = 0;
|
||||||
|
|
||||||
|
void shrink();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>442</width>
|
<width>671</width>
|
||||||
<height>411</height>
|
<height>490</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@@ -29,61 +29,502 @@
|
|||||||
<iconset resource="../companion.qrc">
|
<iconset resource="../companion.qrc">
|
||||||
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
|
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="13" column="1">
|
<item row="0" column="0">
|
||||||
<widget class="QComboBox" name="sideCB">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item>
|
<item row="2" column="0">
|
||||||
<property name="text">
|
<widget class="QLabel" name="sourceLabel">
|
||||||
<string>NEG</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>POS</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>ALL</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1">
|
|
||||||
<layout class="QHBoxLayout" name="offsetLayout" stretch="0,0,1,0">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="offsetGV">
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GV</string>
|
<string>Source</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="5" column="0">
|
||||||
<widget class="QSpinBox" name="offsetSB"/>
|
<widget class="QLabel" name="label_3">
|
||||||
</item>
|
<property name="text">
|
||||||
<item>
|
<string>Weight</string>
|
||||||
<widget class="QComboBox" name="offsetCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>The source for the mixer</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item row="4" column="0">
|
||||||
<spacer name="offsetSpacer">
|
<widget class="QLabel" name="trimLabel">
|
||||||
<property name="orientation">
|
<property name="sizePolicy">
|
||||||
<enum>Qt::Horizontal</enum>
|
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" stdset="0">
|
<property name="text">
|
||||||
<size>
|
<string>Include Trim</string>
|
||||||
<width>40</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="lblScale">
|
||||||
|
<property name="text">
|
||||||
|
<string>Scale</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="lineNameLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Line name</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="inputNameLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Input name</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="0">
|
||||||
|
<widget class="QLabel" name="label_phases">
|
||||||
|
<property name="text">
|
||||||
|
<string>Flight modes</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="0">
|
||||||
|
<widget class="QLabel" name="sideLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Stick Side</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="0">
|
||||||
|
<widget class="QLabel" name="label_curves">
|
||||||
|
<property name="text">
|
||||||
|
<string>Curve</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<widget class="QLabel" name="offsetLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Offset</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="0">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Switch</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1" colspan="2">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QDoubleSpinBox" name="dsbScale">
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="lblScaleUnit">
|
||||||
|
<property name="text">
|
||||||
|
<string>unit</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="1" colspan="3">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="chkWeightUseSource">
|
||||||
|
<property name="text">
|
||||||
|
<string>Source</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="sbWeightValue"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboWeightSource">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_3">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="1" colspan="4">
|
||||||
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="lb_FP1">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">1</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="6">
|
||||||
|
<widget class="QLabel" name="lb_FP6">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">6</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QCheckBox" name="cb_FP1">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="7">
|
||||||
|
<widget class="QLabel" name="lb_FP7">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">7</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="lb_FP0">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">0</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="3">
|
||||||
|
<widget class="QCheckBox" name="cb_FP3">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QCheckBox" name="cb_FP0">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="8">
|
||||||
|
<widget class="QCheckBox" name="cb_FP8">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="6">
|
||||||
|
<widget class="QCheckBox" name="cb_FP6">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="4">
|
||||||
|
<widget class="QCheckBox" name="cb_FP4">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="8">
|
||||||
|
<widget class="QLabel" name="lb_FP8">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">8</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="2">
|
||||||
|
<widget class="QCheckBox" name="cb_FP2">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QLabel" name="lb_FP2">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">2</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="4">
|
||||||
|
<widget class="QLabel" name="lb_FP4">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">4</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="5">
|
||||||
|
<widget class="QLabel" name="lb_FP5">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">5</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="5">
|
||||||
|
<widget class="QCheckBox" name="cb_FP5">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="7">
|
||||||
|
<widget class="QCheckBox" name="cb_FP7">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="3">
|
||||||
|
<widget class="QLabel" name="lb_FP3">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">3</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="9">
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1" colspan="4">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboCurveType">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string>Curve applied to the source.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="chkCurveUseSource">
|
||||||
|
<property name="text">
|
||||||
|
<string>Source</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="sbCurveValue"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboCurveFunc"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboCurveSource">
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="CurveImageWidget" name="imgCurve">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>100</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>100</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>image</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_5">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="1" colspan="3">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="chkOffsetUseSource">
|
||||||
|
<property name="text">
|
||||||
|
<string>Source</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="sbOffsetValue"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboOffsetSource">
|
||||||
|
<property name="minimumSize">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>16777215</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string>The source for the mixer</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_4">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLineEdit" name="inputName">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="lineName">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QComboBox" name="trimCB">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="1">
|
||||||
|
<widget class="QComboBox" name="switchesCB"/>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="1">
|
||||||
|
<widget class="QComboBox" name="sideCB">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>NEG</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>POS</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>ALL</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QComboBox" name="sourceCB"/>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="14" column="0" colspan="2">
|
<item row="1" column="0">
|
||||||
<widget class="QDialogButtonBox" name="buttonBox">
|
<widget class="QDialogButtonBox" name="buttonBox">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -98,394 +539,7 @@
|
|||||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||||
</property>
|
</property>
|
||||||
<property name="centerButtons">
|
<property name="centerButtons">
|
||||||
<bool>true</bool>
|
<bool>false</bool>
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<widget class="QComboBox" name="trimCB"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="lineName">
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0">
|
|
||||||
<widget class="QLabel" name="label_curves">
|
|
||||||
<property name="text">
|
|
||||||
<string>Curve</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="11" column="0">
|
|
||||||
<widget class="QLabel" name="label_7">
|
|
||||||
<property name="text">
|
|
||||||
<string>Switch</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="0">
|
|
||||||
<widget class="QLabel" name="label_phases">
|
|
||||||
<property name="text">
|
|
||||||
<string>Flight modes</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="13" column="0">
|
|
||||||
<widget class="QLabel" name="sideLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Stick Side</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Weight</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1,0">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="weightGV">
|
|
||||||
<property name="text">
|
|
||||||
<string>GV</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSpinBox" name="weightSB"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="weightCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="11" column="1">
|
|
||||||
<widget class="QComboBox" name="switchesCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>Switch used to enable the line.
|
|
||||||
If blank then the input is considered to be "ON" all the time.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="offsetLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Offset</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="sourceLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Source</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="inputNameLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Input name</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QComboBox" name="sourceCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>Source for the mixer.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLineEdit" name="inputName">
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
||||||
<item>
|
|
||||||
<widget class="QDoubleSpinBox" name="dsbScale">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="decimals">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="lblScaleUnit">
|
|
||||||
<property name="text">
|
|
||||||
<string>unit</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="horizontalSpacer_2">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>40</width>
|
|
||||||
<height>20</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="1">
|
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="lb_FP0">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">0</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLabel" name="lb_FP1">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">1</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QLabel" name="lb_FP2">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">2</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="3">
|
|
||||||
<widget class="QLabel" name="lb_FP3">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">3</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="4">
|
|
||||||
<widget class="QLabel" name="lb_FP4">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">4</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="5">
|
|
||||||
<widget class="QLabel" name="lb_FP5">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">5</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="6">
|
|
||||||
<widget class="QLabel" name="lb_FP6">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">6</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="7">
|
|
||||||
<widget class="QLabel" name="lb_FP7">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">7</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="8">
|
|
||||||
<widget class="QLabel" name="lb_FP8">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">8</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QCheckBox" name="cb_FP0">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QCheckBox" name="cb_FP1">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
|
||||||
<widget class="QCheckBox" name="cb_FP2">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="3">
|
|
||||||
<widget class="QCheckBox" name="cb_FP3">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="4">
|
|
||||||
<widget class="QCheckBox" name="cb_FP4">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="5">
|
|
||||||
<widget class="QCheckBox" name="cb_FP5">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="6">
|
|
||||||
<widget class="QCheckBox" name="cb_FP6">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="7">
|
|
||||||
<widget class="QCheckBox" name="cb_FP7">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="8">
|
|
||||||
<widget class="QCheckBox" name="cb_FP8">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="lblScale">
|
|
||||||
<property name="text">
|
|
||||||
<string>Scale</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="1">
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0,0">
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="curveTypeCB">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>Curve applied to the source.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="curveGVarCB">
|
|
||||||
<property name="text">
|
|
||||||
<string>GV</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="curveValueCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSpinBox" name="curveValueSB"/>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="CurveImageWidget" name="curveImage">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>100</width>
|
|
||||||
<height>100</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>100</width>
|
|
||||||
<height>100</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>image</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLabel" name="trimLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Include Trim</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="lineNameLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Line name</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@@ -499,21 +553,6 @@ If blank then the input is considered to be "ON" all the time.</string
|
|||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>inputName</tabstop>
|
|
||||||
<tabstop>lineName</tabstop>
|
|
||||||
<tabstop>sourceCB</tabstop>
|
|
||||||
<tabstop>dsbScale</tabstop>
|
|
||||||
<tabstop>trimCB</tabstop>
|
|
||||||
<tabstop>weightGV</tabstop>
|
|
||||||
<tabstop>weightSB</tabstop>
|
|
||||||
<tabstop>weightCB</tabstop>
|
|
||||||
<tabstop>offsetGV</tabstop>
|
|
||||||
<tabstop>offsetSB</tabstop>
|
|
||||||
<tabstop>offsetCB</tabstop>
|
|
||||||
<tabstop>curveTypeCB</tabstop>
|
|
||||||
<tabstop>curveGVarCB</tabstop>
|
|
||||||
<tabstop>curveValueCB</tabstop>
|
|
||||||
<tabstop>curveValueSB</tabstop>
|
|
||||||
<tabstop>cb_FP0</tabstop>
|
<tabstop>cb_FP0</tabstop>
|
||||||
<tabstop>cb_FP1</tabstop>
|
<tabstop>cb_FP1</tabstop>
|
||||||
<tabstop>cb_FP2</tabstop>
|
<tabstop>cb_FP2</tabstop>
|
||||||
@@ -522,9 +561,6 @@ If blank then the input is considered to be "ON" all the time.</string
|
|||||||
<tabstop>cb_FP5</tabstop>
|
<tabstop>cb_FP5</tabstop>
|
||||||
<tabstop>cb_FP6</tabstop>
|
<tabstop>cb_FP6</tabstop>
|
||||||
<tabstop>cb_FP7</tabstop>
|
<tabstop>cb_FP7</tabstop>
|
||||||
<tabstop>cb_FP8</tabstop>
|
|
||||||
<tabstop>switchesCB</tabstop>
|
|
||||||
<tabstop>sideCB</tabstop>
|
|
||||||
<tabstop>buttonBox</tabstop>
|
<tabstop>buttonBox</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources>
|
<resources>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) OpenTX
|
* Copyright (C) EdgeTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
@@ -24,6 +25,7 @@
|
|||||||
#include "filtereditemmodels.h"
|
#include "filtereditemmodels.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "namevalidator.h"
|
#include "namevalidator.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
|
||||||
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, GeneralSettings & generalSettings, Firmware * firmware,
|
||||||
CompoundItemModelFactory * sharedItemModels) :
|
CompoundItemModelFactory * sharedItemModels) :
|
||||||
@@ -40,7 +42,6 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
|
|||||||
Board::Type board = firmware->getBoard();
|
Board::Type board = firmware->getBoard();
|
||||||
|
|
||||||
dialogFilteredItemModels = new FilteredItemModelFactory();
|
dialogFilteredItemModels = new FilteredItemModelFactory();
|
||||||
int id;
|
|
||||||
|
|
||||||
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
QLabel * lb_fp[CPN_MAX_FLIGHT_MODES] = {ui->lb_FP0, ui->lb_FP1, ui->lb_FP2, ui->lb_FP3, ui->lb_FP4, ui->lb_FP5, ui->lb_FP6, ui->lb_FP7, ui->lb_FP8 };
|
||||||
QCheckBox * tmp[CPN_MAX_FLIGHT_MODES] = {ui->cb_FP0, ui->cb_FP1, ui->cb_FP2, ui->cb_FP3, ui->cb_FP4, ui->cb_FP5, ui->cb_FP6, ui->cb_FP7, ui->cb_FP8 };
|
QCheckBox * tmp[CPN_MAX_FLIGHT_MODES] = {ui->cb_FP0, ui->cb_FP1, ui->cb_FP2, ui->cb_FP3, ui->cb_FP4, ui->cb_FP5, ui->cb_FP6, ui->cb_FP7, ui->cb_FP8 };
|
||||||
@@ -50,34 +51,41 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
|
|||||||
|
|
||||||
this->setWindowTitle(tr("DEST -> %1").arg(RawSource(SOURCE_TYPE_CH, md->destCh - 1).toString(&model, &generalSettings)));
|
this->setWindowTitle(tr("DEST -> %1").arg(RawSource(SOURCE_TYPE_CH, md->destCh - 1).toString(&model, &generalSettings)));
|
||||||
|
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
int imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
||||||
(RawSource::InputSourceGroups & ~RawSource::NoneGroup) | RawSource::ScriptsGroup),
|
(RawSource::InputSourceGroups & ~RawSource::NoneGroup) | RawSource::ScriptsGroup),
|
||||||
"RawSource");
|
"RawSource");
|
||||||
ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(id));
|
|
||||||
|
ui->sourceCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
ui->sourceCB->setModel(dialogFilteredItemModels->getItemModel(imId));
|
||||||
ui->sourceCB->setCurrentIndex(ui->sourceCB->findData(md->srcRaw.toValue()));
|
ui->sourceCB->setCurrentIndex(ui->sourceCB->findData(md->srcRaw.toValue()));
|
||||||
if (ui->sourceCB->currentIndex() < 0 && md->srcRaw.toValue() == 0)
|
if (ui->sourceCB->currentIndex() < 0 && md->srcRaw.toValue() == 0)
|
||||||
ui->sourceCB->setCurrentIndex(ui->sourceCB->count() / 2); // '----' not in list so set to first positive entry
|
ui->sourceCB->setCurrentIndex(Helpers::getFirstPosValueIndex(ui->sourceCB));
|
||||||
|
|
||||||
int limit = firmware->getCapability(OffsetWeight);
|
int limit = firmware->getCapability(OffsetWeight);
|
||||||
|
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_GVarRef)), "GVarRef");
|
imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSource),
|
||||||
|
(RawSource::AllSourceGroups & ~RawSource::NoneGroup & ~RawSource::ScriptsGroup)),
|
||||||
|
"EditorSource");
|
||||||
|
|
||||||
gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, model, 100, -limit, limit, 1.0,
|
FilteredItemModel *esMdl = dialogFilteredItemModels->getItemModel(imId);
|
||||||
dialogFilteredItemModels->getItemModel(id));
|
|
||||||
|
|
||||||
gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, model, 0, -limit, limit, 1.0,
|
weightEditor = new SourceNumRefEditor(md->weight, ui->chkWeightUseSource, ui->sbWeightValue, ui->cboWeightSource, 100, -limit, limit, 1,
|
||||||
dialogFilteredItemModels->getItemModel(id));
|
model, esMdl, this);
|
||||||
|
|
||||||
|
connect(weightEditor, &SourceNumRefEditor::resized, this, [=] () { shrink(); });
|
||||||
|
|
||||||
|
offsetEditor = new SourceNumRefEditor(md->sOffset, ui->chkOffsetUseSource, ui->sbOffsetValue, ui->cboOffsetSource, 0, -limit, limit, 1,
|
||||||
|
model, esMdl, this);
|
||||||
|
|
||||||
|
connect(offsetEditor, &SourceNumRefEditor::resized, this, [=] () { shrink(); });
|
||||||
|
|
||||||
curveRefFilteredItemModels = new CurveRefFilteredFactory(sharedItemModels,
|
curveRefFilteredItemModels = new CurveRefFilteredFactory(sharedItemModels,
|
||||||
firmware->getCapability(HasMixerExpo) ? 0 : FilteredItemModel::PositiveFilter);
|
firmware->getCapability(HasMixerExpo) ? 0 : FilteredItemModel::PositiveFilter);
|
||||||
|
|
||||||
curveGroup = new CurveReferenceUIManager(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueSB, ui->curveValueCB, ui->curveImage, md->curve,
|
curveGroup = new CurveReferenceUIManager(ui->cboCurveType, ui->chkCurveUseSource, ui->sbCurveValue, ui->cboCurveSource, ui->cboCurveFunc,
|
||||||
model, sharedItemModels, curveRefFilteredItemModels, this);
|
ui->imgCurve, md->curve, model, sharedItemModels, curveRefFilteredItemModels, esMdl, this);
|
||||||
|
|
||||||
connect(curveGroup, &CurveReferenceUIManager::resized, this, [=] () {
|
connect(curveGroup, &CurveReferenceUIManager::resized, this, [=] () { shrink(); });
|
||||||
this->adjustSize();
|
|
||||||
this->adjustSize(); // second call seems to be required when hidden fields otherwise not all padding removed
|
|
||||||
});
|
|
||||||
|
|
||||||
ui->MixDR_CB->setChecked(md->noExpo == 0);
|
ui->MixDR_CB->setChecked(md->noExpo == 0);
|
||||||
|
|
||||||
@@ -129,9 +137,11 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
id = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
|
imId = dialogFilteredItemModels->registerItemModel(new FilteredItemModel(sharedItemModels->getItemModel(AbstractItemModel::IMID_RawSwitch),
|
||||||
RawSwitch::MixesContext), "RawSwitch");
|
RawSwitch::MixesContext),
|
||||||
ui->switchesCB->setModel(dialogFilteredItemModels->getItemModel(id));
|
"RawSwitch");
|
||||||
|
ui->switchesCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
||||||
|
ui->switchesCB->setModel(dialogFilteredItemModels->getItemModel(imId));
|
||||||
ui->switchesCB->setCurrentIndex(ui->switchesCB->findData(md->swtch.toValue()));
|
ui->switchesCB->setCurrentIndex(ui->switchesCB->findData(md->swtch.toValue()));
|
||||||
ui->warningCB->setCurrentIndex(md->mixWarn);
|
ui->warningCB->setCurrentIndex(md->mixWarn);
|
||||||
ui->mltpxCB->setCurrentIndex(md->mltpx);
|
ui->mltpxCB->setCurrentIndex(md->mltpx);
|
||||||
@@ -161,32 +171,33 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
|
|||||||
|
|
||||||
valuesChanged();
|
valuesChanged();
|
||||||
|
|
||||||
connect(ui->mixerName,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
connect(ui->mixerName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->sourceCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->trimCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->trimCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->MixDR_CB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
|
connect(ui->MixDR_CB, SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->switchesCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->warningCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->warningCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->mltpxCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->mltpxCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->delayDownSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
connect(ui->delayDownSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
connect(ui->delayUpSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
connect(ui->delayUpSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
connect(ui->speedPrecCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
connect(ui->speedPrecCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
|
||||||
connect(ui->slowDownSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
connect(ui->slowDownSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
connect(ui->slowUpSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
connect(ui->slowUpSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
|
||||||
|
|
||||||
for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
|
for (int i = 0; i < CPN_MAX_FLIGHT_MODES; i++) {
|
||||||
connect(cb_fp[i],SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
|
connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
|
||||||
}
|
}
|
||||||
|
|
||||||
adjustSize();
|
shrink();
|
||||||
}
|
}
|
||||||
|
|
||||||
MixerDialog::~MixerDialog()
|
MixerDialog::~MixerDialog()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
delete gvWeightGroup;
|
delete weightEditor;
|
||||||
delete gvOffsetGroup;
|
delete offsetEditor;
|
||||||
delete dialogFilteredItemModels;
|
delete dialogFilteredItemModels;
|
||||||
|
delete curveRefFilteredItemModels;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MixerDialog::changeEvent(QEvent *e)
|
void MixerDialog::changeEvent(QEvent *e)
|
||||||
@@ -296,3 +307,9 @@ void MixerDialog::fmInvertAll()
|
|||||||
lock = false;
|
lock = false;
|
||||||
valuesChanged();
|
valuesChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MixerDialog::shrink()
|
||||||
|
{
|
||||||
|
this->adjustSize();
|
||||||
|
this->resize(0, 0);
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) OpenTX
|
* Copyright (C) EdgeTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
@@ -23,11 +24,11 @@
|
|||||||
#include <QtWidgets>
|
#include <QtWidgets>
|
||||||
#include "eeprominterface.h"
|
#include "eeprominterface.h"
|
||||||
|
|
||||||
class GVarGroup;
|
|
||||||
class CompoundItemModelFactory;
|
class CompoundItemModelFactory;
|
||||||
class FilteredItemModelFactory;
|
class FilteredItemModelFactory;
|
||||||
class CurveRefFilteredFactory;
|
class CurveRefFilteredFactory;
|
||||||
class CurveReferenceUIManager;
|
class CurveReferenceUIManager;
|
||||||
|
class SourceNumRefEditor;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class MixerDialog;
|
class MixerDialog;
|
||||||
@@ -57,10 +58,12 @@ class MixerDialog : public QDialog {
|
|||||||
Firmware * firmware;
|
Firmware * firmware;
|
||||||
MixData *md;
|
MixData *md;
|
||||||
bool lock;
|
bool lock;
|
||||||
GVarGroup * gvWeightGroup;
|
SourceNumRefEditor * weightEditor;
|
||||||
GVarGroup * gvOffsetGroup;
|
SourceNumRefEditor * offsetEditor;
|
||||||
CurveReferenceUIManager * curveGroup;
|
CurveReferenceUIManager * curveGroup;
|
||||||
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
QCheckBox * cb_fp[CPN_MAX_FLIGHT_MODES];
|
||||||
FilteredItemModelFactory *dialogFilteredItemModels;
|
FilteredItemModelFactory *dialogFilteredItemModels;
|
||||||
CurveRefFilteredFactory *curveRefFilteredItemModels;
|
CurveRefFilteredFactory *curveRefFilteredItemModels;
|
||||||
|
|
||||||
|
void shrink();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>556</width>
|
<width>752</width>
|
||||||
<height>623</height>
|
<height>623</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
@@ -29,46 +29,24 @@
|
|||||||
</property>
|
</property>
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0">
|
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0">
|
||||||
<item row="8" column="1" colspan="2">
|
|
||||||
<widget class="QComboBox" name="switchesCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>Switch used by the mix.
|
|
||||||
If blank then the mix is considered to be "ON" all the time.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1" colspan="2">
|
|
||||||
<widget class="QComboBox" name="sourceCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>The source for the mixer</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="label_curve">
|
|
||||||
<property name="text">
|
|
||||||
<string>Curve</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1" colspan="2">
|
<item row="2" column="1" colspan="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,1">
|
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,1">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="weightGV">
|
<widget class="QCheckBox" name="chkWeightUseSource">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GV</string>
|
<string>Source</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QComboBox" name="weightCB">
|
<widget class="QComboBox" name="cboWeightSource">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>The source for the mixer</string>
|
<string>The source for the mixer</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QSpinBox" name="weightSB"/>
|
<widget class="QSpinBox" name="sbWeightValue"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_2">
|
<spacer name="horizontalSpacer_2">
|
||||||
@@ -85,17 +63,97 @@ If blank then the mix is considered to be "ON" all the time.</string>
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="10" column="1" colspan="2">
|
<item row="11" column="0">
|
||||||
<widget class="QComboBox" name="mltpxCB">
|
<widget class="QLabel" name="label_15">
|
||||||
<property name="whatsThis">
|
<property name="text">
|
||||||
<string>Multiplexer
|
<string>Slow up/dn prec</string>
|
||||||
|
|
||||||
This determines how mixer values are added.
|
|
||||||
|
|
||||||
"+" means the value of the current mix is added to the previous mixes in the same channel.
|
|
||||||
"*" means the value of the current mix is amultiplied with the previous mixes in the same channel.
|
|
||||||
"R" means the value replaces the previous values. If the switch is off the value will be ignored.</string>
|
|
||||||
</property>
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QComboBox" name="sourceCB"/>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="0">
|
||||||
|
<widget class="QLabel" name="trimLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Include Trim</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="11" column="1">
|
||||||
|
<widget class="QComboBox" name="speedPrecCB">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>0.0</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>0.00</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="1">
|
||||||
|
<widget class="QComboBox" name="switchesCB"/>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1" colspan="2">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,1">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="chkOffsetUseSource">
|
||||||
|
<property name="text">
|
||||||
|
<string>Source</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="cboOffsetSource">
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string>The source for the mixer</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QSpinBox" name="sbOffsetValue"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="9" column="0">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Warning</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_3">
|
||||||
|
<property name="text">
|
||||||
|
<string>Weight</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="8" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="text">
|
||||||
|
<string>Switch</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="10" column="1">
|
||||||
|
<widget class="QComboBox" name="mltpxCB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>ADD</string>
|
<string>ADD</string>
|
||||||
@@ -113,39 +171,36 @@ This determines how mixer values are added.
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="1" colspan="2">
|
<item row="6" column="0">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,1">
|
<widget class="QLabel" name="label_MixDR">
|
||||||
<item>
|
<property name="text">
|
||||||
<widget class="QCheckBox" name="offsetGV">
|
<string>Include DR/Expo</string>
|
||||||
<property name="text">
|
</property>
|
||||||
<string>GV</string>
|
</widget>
|
||||||
</property>
|
</item>
|
||||||
</widget>
|
<item row="1" column="0">
|
||||||
</item>
|
<widget class="QLabel" name="label_10">
|
||||||
<item>
|
<property name="text">
|
||||||
<widget class="QComboBox" name="offsetCB">
|
<string>Source</string>
|
||||||
<property name="whatsThis">
|
</property>
|
||||||
<string>The source for the mixer</string>
|
</widget>
|
||||||
</property>
|
</item>
|
||||||
</widget>
|
<item row="10" column="0">
|
||||||
</item>
|
<widget class="QLabel" name="label_7">
|
||||||
<item>
|
<property name="text">
|
||||||
<widget class="QSpinBox" name="offsetSB"/>
|
<string>Multiplex</string>
|
||||||
</item>
|
</property>
|
||||||
<item>
|
</widget>
|
||||||
<spacer name="horizontalSpacer">
|
</item>
|
||||||
<property name="orientation">
|
<item row="4" column="0">
|
||||||
<enum>Qt::Horizontal</enum>
|
<widget class="QLabel" name="label_curve">
|
||||||
</property>
|
<property name="text">
|
||||||
<property name="sizeHint" stdset="0">
|
<string>Curve</string>
|
||||||
<size>
|
</property>
|
||||||
<width>40</width>
|
</widget>
|
||||||
<height>20</height>
|
</item>
|
||||||
</size>
|
<item row="0" column="1">
|
||||||
</property>
|
<widget class="QLineEdit" name="mixerName"/>
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1">
|
<item row="5" column="1">
|
||||||
<widget class="QComboBox" name="trimCB">
|
<widget class="QComboBox" name="trimCB">
|
||||||
@@ -161,32 +216,11 @@ This determines how mixer values are added.
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="1" colspan="2">
|
<item row="4" column="1">
|
||||||
<widget class="QComboBox" name="warningCB">
|
<widget class="QComboBox" name="cboCurveType">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>Mixer warning.
|
<string>The curve used by the mix</string>
|
||||||
Setting this value will cause a beep to be emmitted when this value is active.</string>
|
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>OFF</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>1 Beep</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>2 Beep</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>3 Beep</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="1">
|
<item row="6" column="1">
|
||||||
@@ -196,55 +230,6 @@ Setting this value will cause a beep to be emmitted when this value is active.</
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="label_7">
|
|
||||||
<property name="text">
|
|
||||||
<string>Switch</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_phases">
|
|
||||||
<property name="text">
|
|
||||||
<string>Flight modes</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLabel" name="label_MixDR">
|
|
||||||
<property name="text">
|
|
||||||
<string>Include DR/Expo</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="9" column="0">
|
|
||||||
<widget class="QLabel" name="label_8">
|
|
||||||
<property name="text">
|
|
||||||
<string>Warning</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QComboBox" name="curveTypeCB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string>The curve used by the mix</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="10" column="0">
|
|
||||||
<widget class="QLabel" name="label_9">
|
|
||||||
<property name="text">
|
|
||||||
<string>Multiplex</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="label_2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Source</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_name">
|
<widget class="QLabel" name="label_name">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -252,212 +237,30 @@ Setting this value will cause a beep to be emmitted when this value is active.</
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="1" colspan="2">
|
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="lb_FP0">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">0</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLabel" name="lb_FP1">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">1</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QLabel" name="lb_FP2">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">2</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="3">
|
|
||||||
<widget class="QLabel" name="lb_FP3">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">3</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="4">
|
|
||||||
<widget class="QLabel" name="lb_FP4">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">4</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="5">
|
|
||||||
<widget class="QLabel" name="lb_FP5">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">5</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="6">
|
|
||||||
<widget class="QLabel" name="lb_FP6">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">6</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="7">
|
|
||||||
<widget class="QLabel" name="lb_FP7">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">7</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="8">
|
|
||||||
<widget class="QLabel" name="lb_FP8">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">8</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QCheckBox" name="cb_FP0">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QCheckBox" name="cb_FP1">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
|
||||||
<widget class="QCheckBox" name="cb_FP2">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="3">
|
|
||||||
<widget class="QCheckBox" name="cb_FP3">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="4">
|
|
||||||
<widget class="QCheckBox" name="cb_FP4">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="5">
|
|
||||||
<widget class="QCheckBox" name="cb_FP5">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="6">
|
|
||||||
<widget class="QCheckBox" name="cb_FP6">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="7">
|
|
||||||
<widget class="QCheckBox" name="cb_FP7">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="8">
|
|
||||||
<widget class="QCheckBox" name="cb_FP8">
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Weight</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="text">
|
|
||||||
<string>Offset</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="trimLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Include Trim</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1" colspan="2">
|
|
||||||
<widget class="QLineEdit" name="mixerName">
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="2">
|
<item row="4" column="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,0,0">
|
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,0,0,0,0">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="curveGVarCB">
|
<widget class="QCheckBox" name="chkCurveUseSource">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>GV</string>
|
<string>Source</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QComboBox" name="curveValueCB">
|
<widget class="QComboBox" name="cboCurveSource">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
<string>The source for the mixer</string>
|
<string>The source for the mixer</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QSpinBox" name="curveValueSB"/>
|
<widget class="QSpinBox" name="sbCurveValue"/>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="CurveImageWidget" name="curveImage">
|
<widget class="QComboBox" name="cboCurveFunc"/>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="CurveImageWidget" name="imgCurve">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>100</width>
|
<width>100</width>
|
||||||
@@ -475,27 +278,227 @@ Setting this value will cause a beep to be emmitted when this value is active.</
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_3">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="0">
|
<item row="7" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label_phases">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Slow up/dn prec</string>
|
<string>Flight modes</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="11" column="1" colspan="2">
|
<item row="9" column="1">
|
||||||
<widget class="QComboBox" name="speedPrecCB">
|
<widget class="QComboBox" name="warningCB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0.0</string>
|
<string>OFF</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>0.00</string>
|
<string>1 Beep</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>2 Beeps</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>3 Beeps</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1" colspan="2">
|
||||||
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
|
<item row="0" column="4">
|
||||||
|
<widget class="QLabel" name="lb_FP4">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">4</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="3">
|
||||||
|
<widget class="QLabel" name="lb_FP3">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">3</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="7">
|
||||||
|
<widget class="QLabel" name="lb_FP7">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">7</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QCheckBox" name="cb_FP0">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QLabel" name="lb_FP2">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">2</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="6">
|
||||||
|
<widget class="QCheckBox" name="cb_FP6">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="8">
|
||||||
|
<widget class="QCheckBox" name="cb_FP8">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="8">
|
||||||
|
<widget class="QLabel" name="lb_FP8">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">8</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="7">
|
||||||
|
<widget class="QCheckBox" name="cb_FP7">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QCheckBox" name="cb_FP1">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="5">
|
||||||
|
<widget class="QCheckBox" name="cb_FP5">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="lb_FP1">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">1</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="lb_FP0">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">0</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="6">
|
||||||
|
<widget class="QLabel" name="lb_FP6">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">6</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="2">
|
||||||
|
<widget class="QCheckBox" name="cb_FP2">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="5">
|
||||||
|
<widget class="QLabel" name="lb_FP5">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">5</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="4">
|
||||||
|
<widget class="QCheckBox" name="cb_FP4">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="3">
|
||||||
|
<widget class="QCheckBox" name="cb_FP3">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="9">
|
||||||
|
<spacer name="horizontalSpacer_4">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_4">
|
||||||
|
<property name="text">
|
||||||
|
<string>Offset</string>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
@@ -517,41 +520,7 @@ Setting this value will cause a beep to be emmitted when this value is active.</
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
|
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0,0">
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLabel" name="label_13">
|
|
||||||
<property name="text">
|
|
||||||
<string>Delay</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
|
||||||
<widget class="QLabel" name="label_14">
|
|
||||||
<property name="text">
|
|
||||||
<string>Slow</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="label_12">
|
|
||||||
<property name="text">
|
|
||||||
<string>Up</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_11">
|
|
||||||
<property name="text">
|
|
||||||
<string>Down</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="2">
|
<item row="1" column="2">
|
||||||
<widget class="QDoubleSpinBox" name="slowUpSB">
|
<widget class="QDoubleSpinBox" name="slowUpSB">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
@@ -565,35 +534,6 @@ p, li { white-space: pre-wrap; }
|
|||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="decimals">
|
|
||||||
<number>1</number>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<double>7.500000000000000</double>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<double>0.500000000000000</double>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="2">
|
|
||||||
<widget class="QDoubleSpinBox" name="slowDownSB">
|
|
||||||
<property name="whatsThis">
|
|
||||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
|
||||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
|
||||||
p, li { white-space: pre-wrap; }
|
|
||||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
|
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
@@ -633,6 +573,76 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="2">
|
||||||
|
<widget class="QDoubleSpinBox" name="slowDownSB">
|
||||||
|
<property name="whatsThis">
|
||||||
|
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||||
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||||
|
p, li { white-space: pre-wrap; }
|
||||||
|
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||||
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
|
||||||
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
|
||||||
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix. </p>
|
||||||
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||||
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Delay is not zero the actuation of the mix will be delayed by the specified amount of seconds.</p>
|
||||||
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
|
||||||
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If Slow is not zero then the speed of the mix will be set by the value specified -&gt; the value states the number of seconds it takes to transit from -100 to 100.</p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="maximum">
|
||||||
|
<double>7.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>0.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="3">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_11">
|
||||||
|
<property name="text">
|
||||||
|
<string>Down</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_12">
|
||||||
|
<property name="text">
|
||||||
|
<string>Up</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="label_13">
|
||||||
|
<property name="text">
|
||||||
|
<string>Delay</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QLabel" name="label_14">
|
||||||
|
<property name="text">
|
||||||
|
<string>Slow</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="2" column="1">
|
||||||
<widget class="QDoubleSpinBox" name="delayDownSB">
|
<widget class="QDoubleSpinBox" name="delayDownSB">
|
||||||
<property name="whatsThis">
|
<property name="whatsThis">
|
||||||
@@ -668,18 +678,16 @@ p, li { white-space: pre-wrap; }
|
|||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>mixerName</tabstop>
|
<tabstop>chkWeightUseSource</tabstop>
|
||||||
<tabstop>sourceCB</tabstop>
|
<tabstop>cboWeightSource</tabstop>
|
||||||
<tabstop>weightGV</tabstop>
|
<tabstop>sbWeightValue</tabstop>
|
||||||
<tabstop>weightCB</tabstop>
|
<tabstop>chkOffsetUseSource</tabstop>
|
||||||
<tabstop>weightSB</tabstop>
|
<tabstop>cboOffsetSource</tabstop>
|
||||||
<tabstop>offsetGV</tabstop>
|
<tabstop>sbOffsetValue</tabstop>
|
||||||
<tabstop>offsetCB</tabstop>
|
<tabstop>cboCurveType</tabstop>
|
||||||
<tabstop>offsetSB</tabstop>
|
<tabstop>chkCurveUseSource</tabstop>
|
||||||
<tabstop>curveTypeCB</tabstop>
|
<tabstop>cboCurveSource</tabstop>
|
||||||
<tabstop>curveGVarCB</tabstop>
|
<tabstop>sbCurveValue</tabstop>
|
||||||
<tabstop>curveValueCB</tabstop>
|
|
||||||
<tabstop>curveValueSB</tabstop>
|
|
||||||
<tabstop>trimCB</tabstop>
|
<tabstop>trimCB</tabstop>
|
||||||
<tabstop>MixDR_CB</tabstop>
|
<tabstop>MixDR_CB</tabstop>
|
||||||
<tabstop>cb_FP0</tabstop>
|
<tabstop>cb_FP0</tabstop>
|
||||||
@@ -691,9 +699,6 @@ p, li { white-space: pre-wrap; }
|
|||||||
<tabstop>cb_FP6</tabstop>
|
<tabstop>cb_FP6</tabstop>
|
||||||
<tabstop>cb_FP7</tabstop>
|
<tabstop>cb_FP7</tabstop>
|
||||||
<tabstop>cb_FP8</tabstop>
|
<tabstop>cb_FP8</tabstop>
|
||||||
<tabstop>switchesCB</tabstop>
|
|
||||||
<tabstop>warningCB</tabstop>
|
|
||||||
<tabstop>mltpxCB</tabstop>
|
|
||||||
<tabstop>delayUpSB</tabstop>
|
<tabstop>delayUpSB</tabstop>
|
||||||
<tabstop>delayDownSB</tabstop>
|
<tabstop>delayDownSB</tabstop>
|
||||||
<tabstop>slowUpSB</tabstop>
|
<tabstop>slowUpSB</tabstop>
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
#include "appdata.h"
|
#include "appdata.h"
|
||||||
#include "adjustmentreference.h"
|
#include "adjustmentreference.h"
|
||||||
#include "curveimage.h"
|
#include "curveimage.h"
|
||||||
|
#include "sourcenumref.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
@@ -366,9 +367,9 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
|
|||||||
str += " " + tr("Scale(%1)").arg(input.scale * range.step).toHtmlEscaped();
|
str += " " + tr("Scale(%1)").arg(input.scale * range.step).toHtmlEscaped();
|
||||||
}
|
}
|
||||||
|
|
||||||
str += " " + tr("Weight(%1)").arg(AdjustmentReference(input.weight).toString(&model, true)).toHtmlEscaped();
|
str += " " + tr("Weight(%1)").arg(SourceNumRef(input.weight).toString(&model, &generalSettings)).toHtmlEscaped();
|
||||||
if (input.curve.value)
|
if (input.curve.value)
|
||||||
str += " " + input.curve.toString(&model).toHtmlEscaped();
|
str += " " + input.curve.toString(&model, true, &generalSettings).toHtmlEscaped();
|
||||||
|
|
||||||
QString flightModesStr = printFlightModes(input.flightModes);
|
QString flightModesStr = printFlightModes(input.flightModes);
|
||||||
if (!flightModesStr.isEmpty())
|
if (!flightModesStr.isEmpty())
|
||||||
@@ -386,7 +387,7 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (input.offset)
|
if (input.offset)
|
||||||
str += " " + tr("Offset(%1)").arg(AdjustmentReference(input.offset).toString(&model)).toHtmlEscaped();
|
str += " " + tr("Offset(%1)").arg(SourceNumRef(input.offset).toString(&model, &generalSettings)).toHtmlEscaped();
|
||||||
if (firmware->getCapability(HasExpoNames) && input.name[0])
|
if (firmware->getCapability(HasExpoNames) && input.name[0])
|
||||||
str += QString(" [%1]").arg(input.name).toHtmlEscaped();
|
str += QString(" [%1]").arg(input.name).toHtmlEscaped();
|
||||||
|
|
||||||
@@ -417,7 +418,7 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
|
|||||||
if (mix.mltpx == MLTPX_MUL && !showMultiplex)
|
if (mix.mltpx == MLTPX_MUL && !showMultiplex)
|
||||||
str += " " + tr("MULT!").toHtmlEscaped();
|
str += " " + tr("MULT!").toHtmlEscaped();
|
||||||
else
|
else
|
||||||
str += " " + tr("Weight(%1)").arg(AdjustmentReference(mix.weight).toString(&model, true)).toHtmlEscaped();
|
str += " " + tr("Weight(%1)").arg(SourceNumRef(mix.weight).toString(&model, &generalSettings)).toHtmlEscaped();
|
||||||
|
|
||||||
QString flightModesStr = printFlightModes(mix.flightModes);
|
QString flightModesStr = printFlightModes(mix.flightModes);
|
||||||
if (!flightModesStr.isEmpty())
|
if (!flightModesStr.isEmpty())
|
||||||
@@ -434,9 +435,9 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
|
|||||||
if (firmware->getCapability(HasNoExpo) && mix.noExpo)
|
if (firmware->getCapability(HasNoExpo) && mix.noExpo)
|
||||||
str += " " + tr("No DR/Expo").toHtmlEscaped();
|
str += " " + tr("No DR/Expo").toHtmlEscaped();
|
||||||
if (mix.sOffset)
|
if (mix.sOffset)
|
||||||
str += " " + tr("Offset(%1)").arg(AdjustmentReference(mix.sOffset).toString(&model)).toHtmlEscaped();
|
str += " " + tr("Offset(%1)").arg(SourceNumRef(mix.sOffset).toString(&model, &generalSettings)).toHtmlEscaped();
|
||||||
if (mix.curve.value)
|
if (mix.curve.value)
|
||||||
str += " " + mix.curve.toString(&model).toHtmlEscaped();
|
str += " " + mix.curve.toString(&model, true, &generalSettings).toHtmlEscaped();
|
||||||
int scale = firmware->getCapability(SlowScale);
|
int scale = firmware->getCapability(SlowScale);
|
||||||
if (scale == 0)
|
if (scale == 0)
|
||||||
scale = 1;
|
scale = 1;
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ void CurveImageWidget::set(ModelData * model, Firmware * firmware, CompoundItemM
|
|||||||
|
|
||||||
void CurveImageWidget::setIndex(int index)
|
void CurveImageWidget::setIndex(int index)
|
||||||
{
|
{
|
||||||
this->index = (index >= 0 && index < CPN_MAX_CURVES) ? index : -1;
|
this->index = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CurveImageWidget::setGrid(QColor color, qreal width)
|
void CurveImageWidget::setGrid(QColor color, qreal width)
|
||||||
@@ -63,8 +63,8 @@ int CurveImageWidget::edit()
|
|||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (index >= 0 && index < CPN_MAX_CURVES) {
|
if (abs(index) > 0 && abs(index) <= CPN_MAX_CURVES) {
|
||||||
CurveDialog *dlg = new CurveDialog(this, *model, index, firmware, sharedItemModels);
|
CurveDialog *dlg = new CurveDialog(this, *model, abs(index) - 1, firmware, sharedItemModels);
|
||||||
ret = dlg->exec();
|
ret = dlg->exec();
|
||||||
delete dlg;
|
delete dlg;
|
||||||
}
|
}
|
||||||
@@ -74,11 +74,13 @@ int CurveImageWidget::edit()
|
|||||||
|
|
||||||
void CurveImageWidget::draw()
|
void CurveImageWidget::draw()
|
||||||
{
|
{
|
||||||
if (index >= 0 && index < CPN_MAX_CURVES) {
|
if (abs(index) > 0 && abs(index) <= CPN_MAX_CURVES) {
|
||||||
CurveImage *curveImage = new CurveImage(gridColor, gridWidth);
|
CurveImage *curveImage = new CurveImage(gridColor, gridWidth);
|
||||||
curveImage->drawCurve(model->curves[index], penColor, penWidth);
|
curveImage->drawCurve(model->curves[abs(index) - 1], penColor, penWidth);
|
||||||
|
|
||||||
QImage image = curveImage->get();
|
QImage image = curveImage->get();
|
||||||
|
if (index < 0)
|
||||||
|
image = image.mirrored(true, false);
|
||||||
setPixmap(QPixmap::fromImage(image.scaled(height(), width())));
|
setPixmap(QPixmap::fromImage(image.scaled(height(), width())));
|
||||||
|
|
||||||
delete curveImage;
|
delete curveImage;
|
||||||
|
|||||||
@@ -34,7 +34,8 @@ class CurveImageWidget : public QLabel
|
|||||||
CurveImageWidget(QWidget * parent);
|
CurveImageWidget(QWidget * parent);
|
||||||
virtual ~CurveImageWidget() {}
|
virtual ~CurveImageWidget() {}
|
||||||
|
|
||||||
void set(ModelData * model, Firmware * firmware, CompoundItemModelFactory * sharedItemModels, int index, QColor penColor = Qt::black, qreal penWidth = 2);
|
void set(ModelData * model, Firmware * firmware, CompoundItemModelFactory * sharedItemModels, int index, QColor penColor = Qt::black,
|
||||||
|
qreal penWidth = 2);
|
||||||
void setIndex(int index);
|
void setIndex(int index);
|
||||||
void setGrid(QColor color = Qt::darkGray, qreal width = 1);
|
void setGrid(QColor color = Qt::darkGray, qreal width = 1);
|
||||||
void setPen(QColor color = Qt::black, qreal width = 2);
|
void setPen(QColor color = Qt::black, qreal width = 2);
|
||||||
|
|||||||
+17
-9
@@ -25,6 +25,8 @@
|
|||||||
#include "libopenui.h"
|
#include "libopenui.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern int32_t getSourceNumFieldValue(int16_t val, int16_t min, int16_t max);
|
||||||
|
|
||||||
constexpr int DEFAULT_POINTS = 5;
|
constexpr int DEFAULT_POINTS = 5;
|
||||||
constexpr int STD_CURVE_POINTS(int p) { return p + DEFAULT_POINTS; }
|
constexpr int STD_CURVE_POINTS(int p) { return p + DEFAULT_POINTS; }
|
||||||
constexpr int CUSTOM_CURVE_POINTS(int p) { return 2 * p + (2 * DEFAULT_POINTS - 2); }
|
constexpr int CUSTOM_CURVE_POINTS(int p) { return 2 * p + (2 * DEFAULT_POINTS - 2); }
|
||||||
@@ -318,10 +320,13 @@ int intpol(int x, uint8_t idx) // -100, -75, -50, -25, 0 ,25 ,50, 75, 100
|
|||||||
|
|
||||||
int applyCurve(int x, CurveRef & curve)
|
int applyCurve(int x, CurveRef & curve)
|
||||||
{
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = curve.value;
|
||||||
|
|
||||||
switch (curve.type) {
|
switch (curve.type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
{
|
{
|
||||||
int curveParam = GET_GVAR_PREC1(curve.value, -100, 100, mixerCurrentFlightMode);
|
int curveParam = getSourceNumFieldValue(curve.value, -100, 100);
|
||||||
if (curveParam > 0 && x < 0)
|
if (curveParam > 0 && x < 0)
|
||||||
x = (x * (1000 - curveParam)) / 1000;
|
x = (x * (1000 - curveParam)) / 1000;
|
||||||
else if (curveParam < 0 && x > 0)
|
else if (curveParam < 0 && x > 0)
|
||||||
@@ -331,12 +336,12 @@ int applyCurve(int x, CurveRef & curve)
|
|||||||
|
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
{
|
{
|
||||||
int curveParam = GET_GVAR_PREC1(curve.value, -100, 100, mixerCurrentFlightMode) / 10;
|
int curveParam = getSourceNumFieldValue(curve.value, -100, 100) / 10;
|
||||||
return expo(x, curveParam);
|
return expo(x, curveParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
switch (curve.value) {
|
switch (v.value) {
|
||||||
case CURVE_X_GT0:
|
case CURVE_X_GT0:
|
||||||
if (x < 0) x = 0; //x|x>0
|
if (x < 0) x = 0; //x|x>0
|
||||||
return x;
|
return x;
|
||||||
@@ -356,7 +361,7 @@ int applyCurve(int x, CurveRef & curve)
|
|||||||
|
|
||||||
case CURVE_REF_CUSTOM:
|
case CURVE_REF_CUSTOM:
|
||||||
{
|
{
|
||||||
int curveParam = curve.value;
|
int curveParam = v.value;
|
||||||
if (curveParam < 0) {
|
if (curveParam < 0) {
|
||||||
x = -x;
|
x = -x;
|
||||||
curveParam = -curveParam;
|
curveParam = -curveParam;
|
||||||
@@ -423,24 +428,27 @@ char *getCurveRefString(char *dest, size_t len, const CurveRef& curve)
|
|||||||
if (!len) return dest;
|
if (!len) return dest;
|
||||||
char *s = dest;
|
char *s = dest;
|
||||||
|
|
||||||
if (curve.value != 0) {
|
SourceNumVal v;
|
||||||
|
v.rawValue = curve.value;
|
||||||
|
|
||||||
|
if (v.value != 0) {
|
||||||
switch (curve.type) {
|
switch (curve.type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
*(s++) = 'D'; if (--len == 0) return dest;
|
*(s++) = 'D'; if (--len == 0) return dest;
|
||||||
getValueOrGVarString(s, len, curve.value, -100, 100, 0, "%");
|
getValueOrSrcVarString(s, len, curve.value, -100, 100, 0, "%");
|
||||||
return dest;
|
return dest;
|
||||||
|
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
*(s++) = 'E'; if (--len == 0) return dest;
|
*(s++) = 'E'; if (--len == 0) return dest;
|
||||||
getValueOrGVarString(s, len, curve.value, -100, 100, 0, "%");
|
getValueOrSrcVarString(s, len, curve.value, -100, 100, 0, "%");
|
||||||
return dest;
|
return dest;
|
||||||
|
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
strAppend(dest, STR_VCURVEFUNC[curve.value], len);
|
strAppend(dest, STR_VCURVEFUNC[v.value], len);
|
||||||
return dest;
|
return dest;
|
||||||
|
|
||||||
case CURVE_REF_CUSTOM:
|
case CURVE_REF_CUSTOM:
|
||||||
return getCurveString(dest, curve.value);
|
return getCurveString(dest, v.value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -541,6 +541,7 @@ enum MixSources {
|
|||||||
MIXSRC_LAST_TELEM SKIP = MIXSRC_FIRST_TELEM + 3 * MAX_TELEMETRY_SENSORS - 1,
|
MIXSRC_LAST_TELEM SKIP = MIXSRC_FIRST_TELEM + 3 * MAX_TELEMETRY_SENSORS - 1,
|
||||||
|
|
||||||
MIXSRC_INVERT SKIP,
|
MIXSRC_INVERT SKIP,
|
||||||
|
MIXSRC_VALUE SKIP, // Special case to trigger source as value conversion
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+10
-10
@@ -42,7 +42,7 @@ static inline void check_struct()
|
|||||||
CHKSIZE(CurveRef, 2);
|
CHKSIZE(CurveRef, 2);
|
||||||
CHKSIZE(VarioData, 5);
|
CHKSIZE(VarioData, 5);
|
||||||
CHKSIZE(MixData, 20);
|
CHKSIZE(MixData, 20);
|
||||||
CHKSIZE(ExpoData, 17);
|
CHKSIZE(ExpoData, 18);
|
||||||
CHKSIZE(SwashRingData, 8);
|
CHKSIZE(SwashRingData, 8);
|
||||||
CHKSIZE(CurveHeader, 4);
|
CHKSIZE(CurveHeader, 4);
|
||||||
CHKSIZE(LogicalSwitchData, 9);
|
CHKSIZE(LogicalSwitchData, 9);
|
||||||
@@ -91,23 +91,23 @@ static inline void check_struct()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2)
|
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2)
|
||||||
CHKSIZE(ModelData, 6290);
|
CHKSIZE(ModelData, 6354);
|
||||||
#elif defined(RADIO_FAMILY_T20)
|
#elif defined(RADIO_FAMILY_T20)
|
||||||
CHKSIZE(ModelData, 6326);
|
CHKSIZE(ModelData, 6390);
|
||||||
#elif defined(PCBX9E)
|
#elif defined(PCBX9E)
|
||||||
CHKSIZE(ModelData, 6707);
|
CHKSIZE(ModelData, 6771);
|
||||||
#elif defined(PCBX9D) || defined(PCBX9DP)
|
#elif defined(PCBX9D) || defined(PCBX9DP)
|
||||||
CHKSIZE(ModelData, 6706);
|
CHKSIZE(ModelData, 6770);
|
||||||
#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
|
#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
|
||||||
CHKSIZE(ModelData, 6265);
|
CHKSIZE(ModelData, 6329);
|
||||||
#elif defined(PCBNV14)
|
#elif defined(PCBNV14)
|
||||||
CHKSIZE(ModelData, 15591);
|
CHKSIZE(ModelData, 15655);
|
||||||
#elif defined(PCBPL18)
|
#elif defined(PCBPL18)
|
||||||
CHKSIZE(ModelData, 15771);
|
CHKSIZE(ModelData, 15835);
|
||||||
#elif defined(RADIO_T15)
|
#elif defined(RADIO_T15)
|
||||||
CHKSIZE(ModelData, 15760);
|
CHKSIZE(ModelData, 15824);
|
||||||
#elif defined(PCBHORUS)
|
#elif defined(PCBHORUS)
|
||||||
CHKSIZE(ModelData, 15735);
|
CHKSIZE(ModelData, 15799);
|
||||||
#else
|
#else
|
||||||
#error CHKSIZE not set up
|
#error CHKSIZE not set up
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -62,26 +62,43 @@
|
|||||||
|
|
||||||
#include "storage/yaml/yaml_defs.h"
|
#include "storage/yaml/yaml_defs.h"
|
||||||
|
|
||||||
|
PACK(union SourceNumVal {
|
||||||
|
struct {
|
||||||
|
int16_t value:10;
|
||||||
|
bool isSource:1;
|
||||||
|
};
|
||||||
|
uint16_t rawValue:11;
|
||||||
|
});
|
||||||
|
|
||||||
|
inline uint16_t makeSourceNumVal(int16_t val, bool isSource = false)
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.value = val;
|
||||||
|
v.isSource= isSource;
|
||||||
|
return v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mixer structure
|
* Mixer structure
|
||||||
*/
|
*/
|
||||||
|
|
||||||
PACK(struct CurveRef {
|
PACK(struct CurveRef {
|
||||||
uint8_t type;
|
uint16_t type:5;
|
||||||
int8_t value CUST(in_read_weight,in_write_weight);
|
int16_t value:11 CUST(r_sourceNumVal,w_sourceNumVal);
|
||||||
});
|
});
|
||||||
|
|
||||||
PACK(struct MixData {
|
PACK(struct MixData {
|
||||||
int16_t weight:11 CUST(in_read_weight,in_write_weight); // GV1=-1024, -GV1=1023
|
|
||||||
uint16_t destCh:5;
|
uint16_t destCh:5;
|
||||||
int16_t srcRaw:10 CUST(r_mixSrcRawEx,w_mixSrcRawEx); // srcRaw=0 means not used
|
int16_t srcRaw:10 CUST(r_mixSrcRawEx,w_mixSrcRawEx); // srcRaw=0 means not used
|
||||||
uint16_t carryTrim:1;
|
uint16_t carryTrim:1;
|
||||||
uint16_t mixWarn:2; // mixer warning
|
uint16_t mixWarn:2; // mixer warning
|
||||||
uint16_t mltpx:2 ENUM(MixerMultiplex);
|
uint16_t mltpx:2 ENUM(MixerMultiplex);
|
||||||
uint16_t speedPrec:1;
|
uint16_t speedPrec:1;
|
||||||
int32_t offset:13 CUST(in_read_weight,in_write_weight);
|
uint16_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
||||||
|
uint16_t spare:2;
|
||||||
|
uint32_t weight:11 CUST(r_sourceNumVal,w_sourceNumVal);
|
||||||
|
uint32_t offset:11 CUST(r_sourceNumVal,w_sourceNumVal);
|
||||||
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
||||||
uint32_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
|
||||||
CurveRef curve;
|
CurveRef curve;
|
||||||
uint8_t delayUp;
|
uint8_t delayUp;
|
||||||
uint8_t delayDown;
|
uint8_t delayDown;
|
||||||
@@ -100,13 +117,14 @@ PACK(struct ExpoData {
|
|||||||
CUST_ATTR(carryTrim, r_carryTrim, nullptr); //pre 2.9
|
CUST_ATTR(carryTrim, r_carryTrim, nullptr); //pre 2.9
|
||||||
int16_t trimSource:6;
|
int16_t trimSource:6;
|
||||||
int16_t srcRaw:10 ENUM(MixSources) CUST(r_mixSrcRawEx,w_mixSrcRawEx);
|
int16_t srcRaw:10 ENUM(MixSources) CUST(r_mixSrcRawEx,w_mixSrcRawEx);
|
||||||
uint32_t chn:5;
|
uint32_t weight:11 CUST(r_sourceNumVal,w_sourceNumVal);
|
||||||
|
uint32_t offset:11 CUST(r_sourceNumVal,w_sourceNumVal);
|
||||||
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
||||||
uint32_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
|
||||||
int32_t weight:8 CUST(in_read_weight,in_write_weight);
|
|
||||||
NOBACKUP(char name[LEN_EXPOMIX_NAME]);
|
|
||||||
int8_t offset CUST(in_read_weight,in_write_weight);
|
|
||||||
CurveRef curve;
|
CurveRef curve;
|
||||||
|
uint16_t chn:5;
|
||||||
|
uint16_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
||||||
|
uint16_t spare:2;
|
||||||
|
NOBACKUP(char name[LEN_EXPOMIX_NAME]);
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
#define CURVE_CENTER_X (LCD_W-CURVE_SIDE_WIDTH-3)
|
#define CURVE_CENTER_X (LCD_W-CURVE_SIDE_WIDTH-3)
|
||||||
#define CURVE_CENTER_Y (LCD_H/2)
|
#define CURVE_CENTER_Y (LCD_H/2)
|
||||||
|
|
||||||
#define MIXES_2ND_COLUMN (12*FW)
|
#define MIXES_2ND_COLUMN (10*FW)
|
||||||
|
|
||||||
// Temporary no highlight
|
// Temporary no highlight
|
||||||
extern uint8_t noHighlightCounter;
|
extern uint8_t noHighlightCounter;
|
||||||
@@ -80,6 +80,10 @@ uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label,
|
|||||||
swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr,
|
swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr,
|
||||||
event_t event);
|
event_t event);
|
||||||
|
|
||||||
|
uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t value,
|
||||||
|
int16_t min, int16_t max, LcdFlags attr, event_t event,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin);
|
||||||
|
|
||||||
#if defined(GVARS)
|
#if defined(GVARS)
|
||||||
|
|
||||||
#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) \
|
#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) \
|
||||||
@@ -110,8 +114,6 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t event);
|
|
||||||
|
|
||||||
void editName(coord_t x, coord_t y, char *name, uint8_t size, event_t event,
|
void editName(coord_t x, coord_t y, char *name, uint8_t size, event_t event,
|
||||||
uint8_t active, LcdFlags attr, uint8_t old_editMode);
|
uint8_t active, LcdFlags attr, uint8_t old_editMode);
|
||||||
|
|
||||||
@@ -198,7 +200,8 @@ void showAlertBox(const char * title, const char * text, const char * action , u
|
|||||||
#define IS_TELEMETRY_VIEW_DISPLAYED() menuHandlers[0] == menuViewTelemetry
|
#define IS_TELEMETRY_VIEW_DISPLAYED() menuHandlers[0] == menuViewTelemetry
|
||||||
#define IS_OTHER_VIEW_DISPLAYED() menuHandlers[0] == menuChannelsView
|
#define IS_OTHER_VIEW_DISPLAYED() menuHandlers[0] == menuChannelsView
|
||||||
|
|
||||||
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags);
|
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin);
|
||||||
|
|
||||||
#if defined(FLIGHT_MODES)
|
#if defined(FLIGHT_MODES)
|
||||||
void displayFlightModes(coord_t x, coord_t y, FlightModesType value);
|
void displayFlightModes(coord_t x, coord_t y, FlightModesType value);
|
||||||
|
|||||||
@@ -662,55 +662,6 @@ void putsVBat(coord_t x, coord_t y, LcdFlags att)
|
|||||||
putsVolts(x, y, g_vbat100mV, att);
|
putsVolts(x, y, g_vbat100mV, att);
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att)
|
|
||||||
{
|
|
||||||
uint16_t aidx = abs(idx);
|
|
||||||
bool inverted = idx < 0;
|
|
||||||
|
|
||||||
if (aidx == MIXSRC_NONE) {
|
|
||||||
lcdDrawText(x, y, STR_EMPTY, att);
|
|
||||||
}
|
|
||||||
else if (aidx <= MIXSRC_LAST_INPUT) {
|
|
||||||
if (inverted) {
|
|
||||||
lcdDrawChar(x, y, '!');
|
|
||||||
x += 2;
|
|
||||||
}
|
|
||||||
lcdDrawChar(x+2, y+1, CHR_INPUT, TINSIZE);
|
|
||||||
lcdDrawSolidFilledRect(x, y, 7, 7);
|
|
||||||
if (g_model.inputNames[aidx-MIXSRC_FIRST_INPUT][0])
|
|
||||||
lcdDrawSizedText(x+8, y, g_model.inputNames[aidx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, att);
|
|
||||||
else
|
|
||||||
lcdDrawNumber(x+8, y, aidx, att|LEADING0|LEFT, 2);
|
|
||||||
}
|
|
||||||
#if defined(LUA_INPUTS)
|
|
||||||
else if (aidx <= MIXSRC_LAST_LUA) {
|
|
||||||
div_t qr = div((uint16_t)(aidx-MIXSRC_FIRST_LUA), MAX_SCRIPT_OUTPUTS);
|
|
||||||
#if defined(LUA_MODEL_SCRIPTS)
|
|
||||||
if (inverted) {
|
|
||||||
lcdDrawChar(x, y, '!');
|
|
||||||
x += 2;
|
|
||||||
}
|
|
||||||
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
|
|
||||||
lcdDrawChar(x+2, y+1, '1'+qr.quot, TINSIZE);
|
|
||||||
lcdDrawFilledRect(x, y, 7, 7, 0);
|
|
||||||
lcdDrawSizedText(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
drawStringWithIndex(x, y, "LUA", qr.quot+1, att);
|
|
||||||
lcdDrawChar(lcdLastRightPos, y, 'a' + qr.rem, att);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
else {
|
|
||||||
const char* s = getSourceString(idx);
|
|
||||||
if (idx >= MIXSRC_FIRST_TELEM && idx <= MIXSRC_LAST_TELEM)
|
|
||||||
s += strlen(STR_CHAR_TELEMETRY);
|
|
||||||
lcdDrawText(x, y, s, att);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
|
void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
|
||||||
{
|
{
|
||||||
lcdDrawText(x, y, getAnalogShortLabel(idx), att);
|
lcdDrawText(x, y, getAnalogShortLabel(idx), att);
|
||||||
|
|||||||
@@ -116,7 +116,6 @@ void lcdDraw8bitsNumber(coord_t x, coord_t y, int8_t val);
|
|||||||
void drawModelName(coord_t x, coord_t y, char * name, uint8_t id, LcdFlags att);
|
void drawModelName(coord_t x, coord_t y, char * name, uint8_t id, LcdFlags att);
|
||||||
#if !defined(BOOT) // TODO not here ...
|
#if !defined(BOOT) // TODO not here ...
|
||||||
void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags att=0, bool autoBold = true);
|
void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags att=0, bool autoBold = true);
|
||||||
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att=0);
|
|
||||||
#endif
|
#endif
|
||||||
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
|
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
|
||||||
void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0);
|
void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
#define EXPO_ONE_2ND_COLUMN (7*FW+3*FW+2)
|
#define EXPO_ONE_2ND_COLUMN (6*FW+1)
|
||||||
|
|
||||||
int expoFn(int x)
|
int expoFn(int x)
|
||||||
{
|
{
|
||||||
@@ -91,39 +91,39 @@ void menuModelExpoOne(event_t event)
|
|||||||
|
|
||||||
switch (i) {
|
switch (i) {
|
||||||
case EXPO_FIELD_INPUT_NAME:
|
case EXPO_FIELD_INPUT_NAME:
|
||||||
editSingleName(EXPO_ONE_2ND_COLUMN - LEN_INPUT_NAME * FW, y,
|
editSingleName(EXPO_ONE_2ND_COLUMN, y,
|
||||||
STR_INPUTNAME, g_model.inputNames[ed->chn],
|
STR_INPUTNAME, g_model.inputNames[ed->chn],
|
||||||
LEN_INPUT_NAME, event, (attr != 0), old_editMode);
|
LEN_INPUT_NAME, event, (attr != 0), old_editMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_LINE_NAME:
|
case EXPO_FIELD_LINE_NAME:
|
||||||
editSingleName(EXPO_ONE_2ND_COLUMN - LEN_EXPOMIX_NAME * FW, y,
|
editSingleName(EXPO_ONE_2ND_COLUMN, y,
|
||||||
STR_EXPONAME, ed->name, LEN_EXPOMIX_NAME, event,
|
STR_EXPONAME, ed->name, LEN_EXPOMIX_NAME, event,
|
||||||
(attr != 0), old_editMode);
|
(attr != 0), old_editMode);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_SOURCE:
|
case EXPO_FIELD_SOURCE:
|
||||||
lcdDrawTextAlignedLeft(y, STR_SOURCE);
|
lcdDrawTextAlignedLeft(y, STR_SOURCE);
|
||||||
drawSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, RIGHT|STREXPANDED|attr);
|
drawSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, STREXPANDED|attr);
|
||||||
if (attr)
|
if (attr)
|
||||||
ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS, isSourceAvailableInInputs);
|
ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS, isSourceAvailableInInputs);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_SCALE:
|
case EXPO_FIELD_SCALE:
|
||||||
lcdDrawTextAlignedLeft(y, STR_SCALE);
|
lcdDrawTextAlignedLeft(y, STR_SCALE);
|
||||||
drawSensorCustomValue(EXPO_ONE_2ND_COLUMN, y, (abs(ed->srcRaw) - MIXSRC_FIRST_TELEM)/3, convertTelemValue(abs(ed->srcRaw) - MIXSRC_FIRST_TELEM + 1, ed->scale), RIGHT | attr);
|
drawSensorCustomValue(EXPO_ONE_2ND_COLUMN, y, (abs(ed->srcRaw) - MIXSRC_FIRST_TELEM)/3, convertTelemValue(abs(ed->srcRaw) - MIXSRC_FIRST_TELEM + 1, ed->scale), attr);
|
||||||
if (attr)
|
if (attr)
|
||||||
ed->scale = checkIncDec(event, ed->scale, 0, maxTelemValue(abs(ed->srcRaw) - MIXSRC_FIRST_TELEM + 1), EE_MODEL);
|
ed->scale = checkIncDec(event, ed->scale, 0, maxTelemValue(abs(ed->srcRaw) - MIXSRC_FIRST_TELEM + 1), EE_MODEL);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_WEIGHT:
|
case EXPO_FIELD_WEIGHT:
|
||||||
lcdDrawTextAlignedLeft(y, STR_WEIGHT);
|
ed->weight = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_WEIGHT, ed->weight,
|
||||||
ed->weight = GVAR_MENU_ITEM(EXPO_ONE_2ND_COLUMN, y, ed->weight, -100, 100, RIGHT | attr, 0, event);
|
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_OFFSET:
|
case EXPO_FIELD_OFFSET:
|
||||||
lcdDrawTextAlignedLeft(y, STR_OFFSET);
|
ed->offset = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_OFFSET, ed->offset,
|
||||||
ed->offset = GVAR_MENU_ITEM(EXPO_ONE_2ND_COLUMN, y, ed->offset, -100, 100, RIGHT | attr, 0, event);
|
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_CURVE_LABEL:
|
case EXPO_FIELD_CURVE_LABEL:
|
||||||
@@ -131,7 +131,7 @@ void menuModelExpoOne(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_CURVE:
|
case EXPO_FIELD_CURVE:
|
||||||
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, RIGHT | attr);
|
editCurveRef(FW + 1, y, ed->curve, event, attr, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(FLIGHT_MODES)
|
#if defined(FLIGHT_MODES)
|
||||||
@@ -140,23 +140,23 @@ void menuModelExpoOne(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_FLIGHT_MODES:
|
case EXPO_FIELD_FLIGHT_MODES:
|
||||||
ed->flightModes = editFlightModes(EXPO_ONE_2ND_COLUMN-9*FW+1, y, event, ed->flightModes, attr);
|
ed->flightModes = editFlightModes(EXPO_ONE_2ND_COLUMN-5*FW-2, y, event, ed->flightModes, attr);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case EXPO_FIELD_SWITCH:
|
case EXPO_FIELD_SWITCH:
|
||||||
ed->swtch = editSwitch(EXPO_ONE_2ND_COLUMN, y, ed->swtch, RIGHT | attr, event);
|
ed->swtch = editSwitch(EXPO_ONE_2ND_COLUMN, y, ed->swtch, attr, event);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_SIDE:
|
case EXPO_FIELD_SIDE:
|
||||||
ed->mode = 4 - editChoice(EXPO_ONE_2ND_COLUMN, y, STR_SIDE, STR_VCURVEFUNC, 4-ed->mode, 1, 3, RIGHT | attr, event);
|
ed->mode = 4 - editChoice(EXPO_ONE_2ND_COLUMN, y, STR_SIDE, STR_VCURVEFUNC, 4-ed->mode, 1, 3, attr, event);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_TRIM:
|
case EXPO_FIELD_TRIM:
|
||||||
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
||||||
{
|
{
|
||||||
const char* trim_str = getTrimSourceLabel(abs(ed->srcRaw), ed->trimSource);
|
const char* trim_str = getTrimSourceLabel(abs(ed->srcRaw), ed->trimSource);
|
||||||
LcdFlags flags = RIGHT | (menuHorizontalPosition==0 ? attr : 0);
|
LcdFlags flags = (menuHorizontalPosition==0 ? attr : 0);
|
||||||
lcdDrawText(EXPO_ONE_2ND_COLUMN, y, trim_str, flags);
|
lcdDrawText(EXPO_ONE_2ND_COLUMN, y, trim_str, flags);
|
||||||
|
|
||||||
if (attr) {
|
if (attr) {
|
||||||
|
|||||||
@@ -43,13 +43,15 @@ enum MixFields {
|
|||||||
|
|
||||||
extern uint8_t FM_ROW(uint8_t);
|
extern uint8_t FM_ROW(uint8_t);
|
||||||
|
|
||||||
|
extern int32_t getSourceNumFieldValue(int16_t val, int16_t min, int16_t max);
|
||||||
|
|
||||||
void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
|
void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
|
||||||
{
|
{
|
||||||
const int gaugeWidth = 33;
|
const int gaugeWidth = 33;
|
||||||
const int gaugeHeight = 6;
|
const int gaugeHeight = 6;
|
||||||
|
|
||||||
int offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int offset = getSourceNumFieldValue(md->offset, MIX_OFFSET_MIN, MIX_OFFSET_MAX) / 10;
|
||||||
int weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int weight = getSourceNumFieldValue(md->weight, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX) / 10;
|
||||||
int barMin = offset - weight;
|
int barMin = offset - weight;
|
||||||
int barMax = offset + weight;
|
int barMax = offset + weight;
|
||||||
if (y > 15) {
|
if (y > 15) {
|
||||||
@@ -137,20 +139,15 @@ void menuModelMixOne(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MIX_FIELD_WEIGHT:
|
case MIX_FIELD_WEIGHT:
|
||||||
lcdDrawTextAlignedLeft(y, STR_WEIGHT);
|
md2->weight = editSrcVarFieldValue(MIXES_2ND_COLUMN, y, STR_WEIGHT, md2->weight,
|
||||||
gvarWeightItem(MIXES_2ND_COLUMN, y, md2, attr|LEFT, event);
|
MIX_WEIGHT_MIN, MIX_WEIGHT_MAX, attr, event, isSourceAvailable, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIX_FIELD_OFFSET:
|
case MIX_FIELD_OFFSET:
|
||||||
{
|
md2->offset = editSrcVarFieldValue(MIXES_2ND_COLUMN, y, STR_OFFSET, md2->offset,
|
||||||
lcdDrawTextAlignedLeft(y, STR_OFFSET);
|
MIX_OFFSET_MIN, MIX_OFFSET_MAX, attr, event, isSourceAvailable, 1);
|
||||||
u_int8int16_t offset;
|
drawOffsetBar(LCD_W - 33, y, md2);
|
||||||
MD_OFFSET_TO_UNION(md2, offset);
|
|
||||||
offset.word = GVAR_MENU_ITEM(MIXES_2ND_COLUMN, y, offset.word, MIX_OFFSET_MIN, MIX_OFFSET_MAX, attr|LEFT, 0, event);
|
|
||||||
MD_UNION_TO_OFFSET(offset, md2);
|
|
||||||
drawOffsetBar(MIXES_2ND_COLUMN+22, y, md2);
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case MIX_FIELD_TRIM:
|
case MIX_FIELD_TRIM:
|
||||||
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
||||||
@@ -162,7 +159,7 @@ void menuModelMixOne(event_t event)
|
|||||||
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
||||||
s_currSrcRaw = md2->srcRaw;
|
s_currSrcRaw = md2->srcRaw;
|
||||||
s_currScale = 0;
|
s_currScale = 0;
|
||||||
editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, event, attr);
|
editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, event, attr, isSourceAvailable, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(FLIGHT_MODES)
|
#if defined(FLIGHT_MODES)
|
||||||
|
|||||||
@@ -162,6 +162,30 @@ void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
|
|||||||
drawSlider(x, y, 5*FW - 1, value, max, attr);
|
drawSlider(x, y, 5*FW - 1, value, max, attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t value,
|
||||||
|
int16_t min, int16_t max, LcdFlags attr, event_t event,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin)
|
||||||
|
{
|
||||||
|
if (title)
|
||||||
|
lcdDrawTextAlignedLeft(y, title);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = value;
|
||||||
|
if (v.isSource) {
|
||||||
|
drawSource(x, y, v.value, attr);
|
||||||
|
if (attr & (~RIGHT)) {
|
||||||
|
value = checkIncDec(event, value, sourceMin, MIXSRC_LAST,
|
||||||
|
EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_VALUE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS, isValueAvailable);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lcdDrawNumber(x, y, v.value, attr);
|
||||||
|
if (attr & (~RIGHT)) {
|
||||||
|
value = checkIncDec(event, value, min, max,
|
||||||
|
EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS|(sourceMin == INPUTSRC_FIRST ? INCDEC_SOURCE_NOINPUTS : 0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(GVARS)
|
#if defined(GVARS)
|
||||||
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
|
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -91,6 +91,10 @@ uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label,
|
|||||||
swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr,
|
swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr,
|
||||||
event_t event);
|
event_t event);
|
||||||
|
|
||||||
|
uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t value,
|
||||||
|
int16_t min, int16_t max, LcdFlags attr, event_t event,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin);
|
||||||
|
|
||||||
#if defined(GVARS)
|
#if defined(GVARS)
|
||||||
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value,
|
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value,
|
||||||
LcdFlags flags = 0);
|
LcdFlags flags = 0);
|
||||||
@@ -117,9 +121,8 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t event);
|
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin);
|
||||||
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags);
|
|
||||||
|
|
||||||
extern uint8_t editNameCursorPos;
|
extern uint8_t editNameCursorPos;
|
||||||
|
|
||||||
|
|||||||
@@ -632,51 +632,6 @@ void drawMainControlLabel(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
|
|||||||
lcdDrawSizedText(x, y, getMainControlLabel(idx), UINT8_MAX, att);
|
lcdDrawSizedText(x, y, getMainControlLabel(idx), UINT8_MAX, att);
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att)
|
|
||||||
{
|
|
||||||
uint16_t aidx = abs(idx);
|
|
||||||
bool inverted = idx < 0;
|
|
||||||
|
|
||||||
if (aidx == MIXSRC_NONE) {
|
|
||||||
lcdDrawText(x, y, STR_EMPTY, att);
|
|
||||||
}
|
|
||||||
else if (aidx <= MIXSRC_LAST_INPUT) {
|
|
||||||
if (inverted) {
|
|
||||||
lcdDrawChar(x, y, '!');
|
|
||||||
x += 2;
|
|
||||||
}
|
|
||||||
lcdDrawChar(x+2, y+1, CHR_INPUT, TINSIZE);
|
|
||||||
lcdDrawFilledRect(x, y, 7, 7);
|
|
||||||
if (ZEXIST(g_model.inputNames[aidx-MIXSRC_FIRST_INPUT]))
|
|
||||||
lcdDrawSizedText(x+8, y, g_model.inputNames[aidx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, att);
|
|
||||||
else
|
|
||||||
lcdDrawNumber(x+8, y, aidx, att|LEADING0|LEFT, 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (aidx <= MIXSRC_LAST_LUA) {
|
|
||||||
div_t qr = div((uint16_t)(aidx-MIXSRC_FIRST_LUA), MAX_SCRIPT_OUTPUTS);
|
|
||||||
#if defined(LUA_MODEL_SCRIPTS)
|
|
||||||
if (inverted) {
|
|
||||||
lcdDrawChar(x, y, '!');
|
|
||||||
x += 2;
|
|
||||||
}
|
|
||||||
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
|
|
||||||
lcdDrawChar(x+2, y+1, '1'+qr.quot, TINSIZE);
|
|
||||||
lcdDrawFilledRect(x, y, 7, 7);
|
|
||||||
lcdDrawSizedText(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
drawStringWithIndex(x, y, "LUA", qr.quot+1, att);
|
|
||||||
lcdDrawChar(lcdLastRightPos, y, 'a'+qr.rem, att);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
lcdDrawText(x, y, getSourceString(idx), att);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
|
void putsChnLetter(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
|
||||||
{
|
{
|
||||||
lcdDrawText(x, y, getAnalogShortLabel(idx), att);
|
lcdDrawText(x, y, getAnalogShortLabel(idx), att);
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode=0);
|
|||||||
void drawModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
|
void drawModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
|
||||||
void drawSwitch(coord_t x, coord_t y, int32_t swtch, LcdFlags att=0, bool autoBold = true);
|
void drawSwitch(coord_t x, coord_t y, int32_t swtch, LcdFlags att=0, bool autoBold = true);
|
||||||
void drawMainControlLabel(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
|
void drawMainControlLabel(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
|
||||||
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att=0);
|
|
||||||
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
|
void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
|
||||||
void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0);
|
void drawTimerMode(coord_t x, coord_t y, swsrc_t mode, LcdFlags att=0);
|
||||||
|
|
||||||
|
|||||||
@@ -119,18 +119,18 @@ void menuModelExpoOne(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_WEIGHT:
|
case EXPO_FIELD_WEIGHT:
|
||||||
lcdDrawTextAlignedLeft(y, STR_WEIGHT);
|
ed->weight = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_WEIGHT, ed->weight,
|
||||||
ed->weight = GVAR_MENU_ITEM(EXPO_ONE_2ND_COLUMN, y, ed->weight, -100, 100, LEFT|attr, 0, event);
|
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_OFFSET:
|
case EXPO_FIELD_OFFSET:
|
||||||
lcdDrawTextAlignedLeft(y, STR_OFFSET);
|
ed->offset = editSrcVarFieldValue(EXPO_ONE_2ND_COLUMN, y, STR_OFFSET, ed->offset,
|
||||||
ed->offset = GVAR_MENU_ITEM(EXPO_ONE_2ND_COLUMN, y, ed->offset, -100, 100, LEFT|attr, 0, event);
|
-100, 100, attr, event, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EXPO_FIELD_CURVE:
|
case EXPO_FIELD_CURVE:
|
||||||
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
||||||
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, attr);
|
editCurveRef(EXPO_ONE_2ND_COLUMN, y, ed->curve, event, attr, isSourceAvailableInInputs, INPUTSRC_FIRST);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(FLIGHT_MODES)
|
#if defined(FLIGHT_MODES)
|
||||||
|
|||||||
@@ -43,13 +43,15 @@ enum MixFields {
|
|||||||
|
|
||||||
extern uint8_t FM_ROW(uint8_t);
|
extern uint8_t FM_ROW(uint8_t);
|
||||||
|
|
||||||
|
extern int32_t getSourceNumFieldValue(int16_t val, int16_t min, int16_t max);
|
||||||
|
|
||||||
void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
|
void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
|
||||||
{
|
{
|
||||||
const int gaugeWidth = 33;
|
const int gaugeWidth = 33;
|
||||||
const int gaugeHeight = 6;
|
const int gaugeHeight = 6;
|
||||||
|
|
||||||
int offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int offset = getSourceNumFieldValue(md->offset, MIX_OFFSET_MIN, MIX_OFFSET_MAX) / 10;
|
||||||
int weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int weight = getSourceNumFieldValue(md->weight, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX) / 10;
|
||||||
int barMin = offset - weight;
|
int barMin = offset - weight;
|
||||||
int barMax = offset + weight;
|
int barMax = offset + weight;
|
||||||
if (y > 15) {
|
if (y > 15) {
|
||||||
@@ -130,20 +132,15 @@ void menuModelMixOne(event_t event)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case MIX_FIELD_WEIGHT:
|
case MIX_FIELD_WEIGHT:
|
||||||
lcdDrawTextAlignedLeft(y, STR_WEIGHT);
|
md2->weight = editSrcVarFieldValue(MIXES_2ND_COLUMN, y, STR_WEIGHT, md2->weight,
|
||||||
gvarWeightItem(MIXES_2ND_COLUMN, y, md2, attr|LEFT, event);
|
MIX_WEIGHT_MIN, MIX_WEIGHT_MAX, attr, event, isSourceAvailable, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIX_FIELD_OFFSET:
|
case MIX_FIELD_OFFSET:
|
||||||
{
|
md2->offset = editSrcVarFieldValue(MIXES_2ND_COLUMN, y, STR_OFFSET, md2->offset,
|
||||||
lcdDrawTextAlignedLeft(y, STR_OFFSET);
|
MIX_OFFSET_MIN, MIX_OFFSET_MAX, attr, event, isSourceAvailable, 1);
|
||||||
u_int8int16_t offset;
|
|
||||||
MD_OFFSET_TO_UNION(md2, offset);
|
|
||||||
offset.word = GVAR_MENU_ITEM(MIXES_2ND_COLUMN, y, offset.word, MIX_OFFSET_MIN, MIX_OFFSET_MAX, attr|LEFT, 0, event);
|
|
||||||
MD_UNION_TO_OFFSET(offset, md2);
|
|
||||||
drawOffsetBar(MIXES_2ND_COLUMN+35, y, md2);
|
drawOffsetBar(MIXES_2ND_COLUMN+35, y, md2);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case MIX_FIELD_TRIM:
|
case MIX_FIELD_TRIM:
|
||||||
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
lcdDrawTextAlignedLeft(y, STR_TRIM);
|
||||||
@@ -157,7 +154,7 @@ void menuModelMixOne(event_t event)
|
|||||||
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
||||||
s_currSrcRaw = md2->srcRaw;
|
s_currSrcRaw = md2->srcRaw;
|
||||||
s_currScale = 0;
|
s_currScale = 0;
|
||||||
editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, event, attr);
|
editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, event, attr, isSourceAvailable, 1);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(FLIGHT_MODES)
|
#if defined(FLIGHT_MODES)
|
||||||
|
|||||||
@@ -120,6 +120,30 @@ void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
|
|||||||
if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
|
if (attr && (!(attr & BLINK) || !BLINK_ON_PHASE)) lcdDrawFilledRect(x, y, 5*FW-1, FH-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t value,
|
||||||
|
int16_t min, int16_t max, LcdFlags attr, event_t event,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin)
|
||||||
|
{
|
||||||
|
if (title)
|
||||||
|
lcdDrawTextAlignedLeft(y, title);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = value;
|
||||||
|
if (v.isSource) {
|
||||||
|
drawSource(x, y, v.value, attr);
|
||||||
|
if (attr & (~RIGHT)) {
|
||||||
|
value = checkIncDec(event, value, sourceMin,
|
||||||
|
MIXSRC_LAST, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_VALUE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS, isValueAvailable);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
lcdDrawNumber(x, y, v.value, attr);
|
||||||
|
if (attr & (~RIGHT)) {
|
||||||
|
value = checkIncDec(event, value, min, max,
|
||||||
|
EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS|(sourceMin == INPUTSRC_FIRST ? INCDEC_SOURCE_NOINPUTS : 0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(GVARS)
|
#if defined(GVARS)
|
||||||
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
|
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ set(GUI_SRC
|
|||||||
radio_tools.cpp
|
radio_tools.cpp
|
||||||
radio_trainer.cpp
|
radio_trainer.cpp
|
||||||
radio_version.cpp
|
radio_version.cpp
|
||||||
|
source_numberedit.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
macro(add_gui_src src)
|
macro(add_gui_src src)
|
||||||
|
|||||||
@@ -243,7 +243,11 @@ void Curve::clearPoints()
|
|||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Curve::update() { base.update(); }
|
void Curve::update()
|
||||||
|
{
|
||||||
|
base.update();
|
||||||
|
updatePosition();
|
||||||
|
}
|
||||||
|
|
||||||
void Curve::checkEvents()
|
void Curve::checkEvents()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "curve_param.h"
|
#include "curve_param.h"
|
||||||
|
|
||||||
#include "gvar_numberedit.h"
|
#include "gvar_numberedit.h"
|
||||||
|
#include "source_numberedit.h"
|
||||||
#include "model_curves.h"
|
#include "model_curves.h"
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
@@ -37,21 +38,12 @@ void CurveParam::LongPressHandler(void* data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CurveParam::value_changed(lv_event_t* e)
|
|
||||||
{
|
|
||||||
auto obj = lv_event_get_target(e);
|
|
||||||
auto param = (CurveParam*)lv_obj_get_user_data(obj);
|
|
||||||
if (!param) return;
|
|
||||||
|
|
||||||
param->update();
|
|
||||||
}
|
|
||||||
|
|
||||||
class CurveChoice : public Choice
|
class CurveChoice : public Choice
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CurveChoice(Window* parent, CurveRef* ref, std::function<void(int32_t)> setRefValue, std::function<void(void)> refreshView) :
|
CurveChoice(Window* parent, std::function<int()> getRefValue, std::function<void(int32_t)> setRefValue, std::function<void(void)> refreshView) :
|
||||||
Choice(parent, rect_t{}, -MAX_CURVES, MAX_CURVES, GET_DEFAULT(ref->value), setRefValue),
|
Choice(parent, rect_t{}, -MAX_CURVES, MAX_CURVES, getRefValue, setRefValue),
|
||||||
ref(ref), refreshView(refreshView)
|
refreshView(std::move(refreshView))
|
||||||
{
|
{
|
||||||
setTextHandler([](int value) { return getCurveString(value); });
|
setTextHandler([](int value) { return getCurveString(value); });
|
||||||
}
|
}
|
||||||
@@ -59,21 +51,21 @@ class CurveChoice : public Choice
|
|||||||
bool onLongPress() override
|
bool onLongPress() override
|
||||||
{
|
{
|
||||||
if (modelCurvesEnabled()) {
|
if (modelCurvesEnabled()) {
|
||||||
if (ref->value) {
|
if (_getValue()) {
|
||||||
ModelCurvesPage::pushEditCurve(abs(ref->value) - 1, refreshView);
|
ModelCurvesPage::pushEditCurve(abs(_getValue()) - 1, refreshView);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
CurveRef* ref;
|
|
||||||
std::function<void(void)> refreshView;
|
std::function<void(void)> refreshView;
|
||||||
};
|
};
|
||||||
|
|
||||||
CurveParam::CurveParam(Window* parent, const rect_t& rect, CurveRef* ref,
|
CurveParam::CurveParam(Window* parent, const rect_t& rect, CurveRef* ref,
|
||||||
std::function<void(int32_t)> setRefValue, std::function<void(void)> refreshView) :
|
std::function<void(int32_t)> setRefValue, int16_t sourceMin,
|
||||||
Window(parent, rect), ref(ref)
|
std::function<void(void)> refreshView) :
|
||||||
|
Window(parent, rect), ref(ref), refreshView(std::move(refreshView))
|
||||||
{
|
{
|
||||||
padAll(PAD_TINY);
|
padAll(PAD_TINY);
|
||||||
lv_obj_set_flex_flow(lvobj, LV_FLEX_FLOW_ROW_WRAP);
|
lv_obj_set_flex_flow(lvobj, LV_FLEX_FLOW_ROW_WRAP);
|
||||||
@@ -85,23 +77,42 @@ CurveParam::CurveParam(Window* parent, const rect_t& rect, CurveRef* ref,
|
|||||||
ref->type = newValue;
|
ref->type = newValue;
|
||||||
ref->value = 0;
|
ref->value = 0;
|
||||||
SET_DIRTY();
|
SET_DIRTY();
|
||||||
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
update();
|
||||||
});
|
});
|
||||||
lv_obj_add_event_cb(lvobj, CurveParam::value_changed, LV_EVENT_VALUE_CHANGED,
|
|
||||||
nullptr);
|
|
||||||
|
|
||||||
// CURVE_REF_DIFF
|
// CURVE_REF_DIFF
|
||||||
// CURVE_REF_EXPO
|
// CURVE_REF_EXPO
|
||||||
auto gv = new GVarNumberEdit(this, -100, 100, GET_DEFAULT(ref->value), setRefValue);
|
auto gv = new SourceNumberEdit(this, -100, 100, GET_DEFAULT(ref->value), setRefValue, sourceMin);
|
||||||
gv->setSuffix("%");
|
gv->setSuffix("%");
|
||||||
value_edit = gv;
|
value_edit = gv;
|
||||||
|
|
||||||
// CURVE_REF_FUNC
|
// CURVE_REF_FUNC
|
||||||
func_choice = new Choice(this, rect_t{}, STR_VCURVEFUNC, 0, CURVE_BASE - 1,
|
func_choice = new Choice(this, rect_t{}, STR_VCURVEFUNC, 0, CURVE_BASE - 1,
|
||||||
GET_DEFAULT(ref->value), setRefValue);
|
[=]() {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = ref->value;
|
||||||
|
return v.value;
|
||||||
|
},
|
||||||
|
[=](int32_t newValue) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = false;
|
||||||
|
v.value = newValue;
|
||||||
|
setRefValue(v.rawValue);
|
||||||
|
});
|
||||||
|
|
||||||
// CURVE_REF_CUSTOM
|
// CURVE_REF_CUSTOM
|
||||||
cust_choice = new CurveChoice(this, ref, setRefValue, refreshView);
|
cust_choice = new CurveChoice(this,
|
||||||
|
[=]() {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = ref->value;
|
||||||
|
return v.value;
|
||||||
|
},
|
||||||
|
[=](int32_t newValue) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = false;
|
||||||
|
v.value = newValue;
|
||||||
|
setRefValue(v.rawValue);
|
||||||
|
}, refreshView);
|
||||||
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
@@ -117,14 +128,17 @@ void CurveParam::update()
|
|||||||
switch (ref->type) {
|
switch (ref->type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
|
value_edit->update();
|
||||||
act_field = value_edit;
|
act_field = value_edit;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
|
func_choice->update();
|
||||||
act_field = func_choice;
|
act_field = func_choice;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CURVE_REF_CUSTOM:
|
case CURVE_REF_CUSTOM:
|
||||||
|
cust_choice->update();
|
||||||
act_field = cust_choice;
|
act_field = cust_choice;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -133,10 +147,11 @@ void CurveParam::update()
|
|||||||
}
|
}
|
||||||
|
|
||||||
act_field->show();
|
act_field->show();
|
||||||
|
if (refreshView)
|
||||||
|
refreshView();
|
||||||
|
|
||||||
auto act_obj = act_field->getLvObj();
|
auto act_obj = act_field->getLvObj();
|
||||||
if (has_focus) {
|
if (has_focus) {
|
||||||
lv_group_focus_obj(act_obj);
|
lv_group_focus_obj(act_obj);
|
||||||
}
|
}
|
||||||
lv_event_send(act_obj, LV_EVENT_VALUE_CHANGED, nullptr);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,24 +24,30 @@
|
|||||||
#include "window.h"
|
#include "window.h"
|
||||||
|
|
||||||
struct CurveRef;
|
struct CurveRef;
|
||||||
|
class Choice;
|
||||||
|
class SourceNumberEdit;
|
||||||
|
|
||||||
class CurveParam : public Window
|
class CurveParam : public Window
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
|
CurveParam(Window* parent, const rect_t& rect, CurveRef* ref,
|
||||||
|
std::function<void(int32_t)> setRefValue,
|
||||||
|
int16_t sourceMin,
|
||||||
|
std::function<void(void)> refreshView = nullptr);
|
||||||
|
|
||||||
|
protected:
|
||||||
// Curve
|
// Curve
|
||||||
CurveRef* ref;
|
CurveRef* ref;
|
||||||
|
|
||||||
// Controls
|
// Controls
|
||||||
Window* value_edit;
|
SourceNumberEdit* value_edit;
|
||||||
Window* func_choice;
|
Choice* func_choice;
|
||||||
Window* cust_choice;
|
Choice* cust_choice;
|
||||||
Window* act_field = nullptr;
|
Window* act_field = nullptr;
|
||||||
|
|
||||||
void update();
|
std::function<void(void)> refreshView;
|
||||||
static void value_changed(lv_event_t* e);
|
|
||||||
static void LongPressHandler(void* data);
|
|
||||||
|
|
||||||
public:
|
void update();
|
||||||
CurveParam(Window* parent, const rect_t& rect, CurveRef* ref,
|
|
||||||
std::function<void(int32_t)> setRefValue,
|
static void LongPressHandler(void* data);
|
||||||
std::function<void(void)> refreshView = nullptr);
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#include "curve_param.h"
|
#include "curve_param.h"
|
||||||
#include "curveedit.h"
|
#include "curveedit.h"
|
||||||
#include "gvar_numberedit.h"
|
#include "gvar_numberedit.h"
|
||||||
|
#include "source_numberedit.h"
|
||||||
#include "input_edit_adv.h"
|
#include "input_edit_adv.h"
|
||||||
#include "input_source.h"
|
#include "input_source.h"
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
@@ -106,23 +107,23 @@ void InputEditWindow::buildBody(Window* form)
|
|||||||
line = form->newLine(grid);
|
line = form->newLine(grid);
|
||||||
new StaticText(line, rect_t{}, STR_WEIGHT);
|
new StaticText(line, rect_t{}, STR_WEIGHT);
|
||||||
auto gvar =
|
auto gvar =
|
||||||
new GVarNumberEdit(line, -100, 100, GET_DEFAULT(input->weight),
|
new SourceNumberEdit(line, -100, 100, GET_DEFAULT(input->weight),
|
||||||
[=](int32_t newValue) {
|
[=](int32_t newValue) {
|
||||||
input->weight = newValue;
|
input->weight = newValue;
|
||||||
preview->update();
|
preview->update();
|
||||||
SET_DIRTY();
|
SET_DIRTY();
|
||||||
});
|
}, INPUTSRC_FIRST);
|
||||||
gvar->setSuffix("%");
|
gvar->setSuffix("%");
|
||||||
|
|
||||||
// Offset
|
// Offset
|
||||||
line = form->newLine(grid);
|
line = form->newLine(grid);
|
||||||
new StaticText(line, rect_t{}, STR_OFFSET);
|
new StaticText(line, rect_t{}, STR_OFFSET);
|
||||||
gvar = new GVarNumberEdit(line, -100, 100,
|
gvar = new SourceNumberEdit(line, -100, 100,
|
||||||
GET_DEFAULT(input->offset), [=](int32_t newValue) {
|
GET_DEFAULT(input->offset), [=](int32_t newValue) {
|
||||||
input->offset = newValue;
|
input->offset = newValue;
|
||||||
preview->update();
|
preview->update();
|
||||||
SET_DIRTY();
|
SET_DIRTY();
|
||||||
});
|
}, INPUTSRC_FIRST);
|
||||||
gvar->setSuffix("%");
|
gvar->setSuffix("%");
|
||||||
|
|
||||||
// Switch
|
// Switch
|
||||||
@@ -138,11 +139,13 @@ void InputEditWindow::buildBody(Window* form)
|
|||||||
new CurveParam(line, rect_t{}, &input->curve,
|
new CurveParam(line, rect_t{}, &input->curve,
|
||||||
[=](int32_t newValue) {
|
[=](int32_t newValue) {
|
||||||
input->curve.value = newValue;
|
input->curve.value = newValue;
|
||||||
preview->update();
|
if (preview)
|
||||||
|
preview->update();
|
||||||
SET_DIRTY();
|
SET_DIRTY();
|
||||||
},
|
}, INPUTSRC_FIRST,
|
||||||
[=]() {
|
[=]() {
|
||||||
preview->update();
|
if (preview)
|
||||||
|
preview->update();
|
||||||
});
|
});
|
||||||
lv_obj_set_style_grid_cell_x_align(param->getLvObj(), LV_GRID_ALIGN_STRETCH,
|
lv_obj_set_style_grid_cell_x_align(param->getLvObj(), LV_GRID_ALIGN_STRETCH,
|
||||||
0);
|
0);
|
||||||
@@ -164,3 +167,44 @@ void InputEditWindow::deleteLater(bool detach, bool trash)
|
|||||||
Page::deleteLater(detach, trash);
|
Page::deleteLater(detach, trash);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InputEditWindow::checkEvents()
|
||||||
|
{
|
||||||
|
ExpoData* input = expoAddress(index);
|
||||||
|
|
||||||
|
bool updatePreview = false;
|
||||||
|
getvalue_t val;
|
||||||
|
SourceNumVal v;
|
||||||
|
|
||||||
|
v.rawValue = input->weight;
|
||||||
|
if (v.isSource) {
|
||||||
|
val = getValue(v.value);
|
||||||
|
if (val != lastWeightVal) {
|
||||||
|
lastWeightVal = val;
|
||||||
|
updatePreview = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
v.rawValue = input->offset;
|
||||||
|
if (v.isSource) {
|
||||||
|
val = getValue(v.value);
|
||||||
|
if (val != lastOffsetVal) {
|
||||||
|
lastOffsetVal = val;
|
||||||
|
updatePreview = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
v.rawValue = input->curve.value;
|
||||||
|
if (v.isSource) {
|
||||||
|
val = getValue(v.value);
|
||||||
|
if (val != lastCurveVal) {
|
||||||
|
lastCurveVal = val;
|
||||||
|
updatePreview = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (updatePreview)
|
||||||
|
preview->update();
|
||||||
|
|
||||||
|
Page::checkEvents();
|
||||||
|
}
|
||||||
|
|||||||
@@ -38,9 +38,13 @@ class InputEditWindow : public Page
|
|||||||
protected:
|
protected:
|
||||||
uint8_t input;
|
uint8_t input;
|
||||||
uint8_t index;
|
uint8_t index;
|
||||||
Curve* preview;
|
Curve* preview = nullptr;
|
||||||
|
getvalue_t lastWeightVal = 0;
|
||||||
|
getvalue_t lastOffsetVal = 0;
|
||||||
|
getvalue_t lastCurveVal = 0;
|
||||||
|
|
||||||
void buildBody(Window *window);
|
void buildBody(Window *window);
|
||||||
|
|
||||||
|
void checkEvents() override;
|
||||||
void deleteLater(bool detach = true, bool trash = true) override;
|
void deleteLater(bool detach = true, bool trash = true) override;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ InputMixButtonBase::InputMixButtonBase(Window* parent, uint8_t index) :
|
|||||||
weight = lv_label_create(lvobj);
|
weight = lv_label_create(lvobj);
|
||||||
lv_obj_set_pos(weight, WGT_X, WGT_Y);
|
lv_obj_set_pos(weight, WGT_X, WGT_Y);
|
||||||
lv_obj_set_size(weight, WGT_W, WGT_H);
|
lv_obj_set_size(weight, WGT_W, WGT_H);
|
||||||
|
etx_font(weight, FONT_XS_INDEX, LV_STATE_USER_1);
|
||||||
|
|
||||||
source = lv_label_create(lvobj);
|
source = lv_label_create(lvobj);
|
||||||
lv_obj_set_pos(source, SRC_X, SRC_Y);
|
lv_obj_set_pos(source, SRC_X, SRC_Y);
|
||||||
@@ -79,6 +80,7 @@ InputMixButtonBase::InputMixButtonBase(Window* parent, uint8_t index) :
|
|||||||
opts = lv_label_create(lvobj);
|
opts = lv_label_create(lvobj);
|
||||||
lv_obj_set_pos(opts, OPT_X, OPT_Y);
|
lv_obj_set_pos(opts, OPT_X, OPT_Y);
|
||||||
lv_obj_set_size(opts, OPT_W, OPT_H);
|
lv_obj_set_size(opts, OPT_W, OPT_H);
|
||||||
|
etx_font(opts, FONT_XS_INDEX, LV_STATE_USER_1);
|
||||||
}
|
}
|
||||||
|
|
||||||
InputMixButtonBase::~InputMixButtonBase()
|
InputMixButtonBase::~InputMixButtonBase()
|
||||||
@@ -89,7 +91,12 @@ InputMixButtonBase::~InputMixButtonBase()
|
|||||||
void InputMixButtonBase::setWeight(gvar_t value, gvar_t min, gvar_t max)
|
void InputMixButtonBase::setWeight(gvar_t value, gvar_t min, gvar_t max)
|
||||||
{
|
{
|
||||||
char s[32];
|
char s[32];
|
||||||
getValueOrGVarString(s, sizeof(s), value, min, max, 0, "%");
|
getValueOrSrcVarString(s, sizeof(s), value, min, max, 0, "%");
|
||||||
|
if (getTextWidth(s, 0, FONT(STD)) > WGT_W)
|
||||||
|
lv_obj_add_state(weight, LV_STATE_USER_1);
|
||||||
|
else
|
||||||
|
lv_obj_clear_state(weight, LV_STATE_USER_1);
|
||||||
|
|
||||||
lv_label_set_text(weight, s);
|
lv_label_set_text(weight, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,6 +106,16 @@ void InputMixButtonBase::setSource(mixsrc_t idx)
|
|||||||
lv_label_set_text(source, s);
|
lv_label_set_text(source, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void InputMixButtonBase::setOpts(const char* s)
|
||||||
|
{
|
||||||
|
if (getTextWidth(s, 0, FONT(STD)) > OPT_W)
|
||||||
|
lv_obj_add_state(opts, LV_STATE_USER_1);
|
||||||
|
else
|
||||||
|
lv_obj_clear_state(opts, LV_STATE_USER_1);
|
||||||
|
|
||||||
|
lv_label_set_text(opts, s);
|
||||||
|
}
|
||||||
|
|
||||||
void InputMixButtonBase::setFlightModes(uint16_t modes)
|
void InputMixButtonBase::setFlightModes(uint16_t modes)
|
||||||
{
|
{
|
||||||
if (!modelFMEnabled()) return;
|
if (!modelFMEnabled()) return;
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ class InputMixButtonBase : public ListLineButton
|
|||||||
|
|
||||||
void setWeight(gvar_t value, gvar_t min, gvar_t max);
|
void setWeight(gvar_t value, gvar_t min, gvar_t max);
|
||||||
void setSource(mixsrc_t idx);
|
void setSource(mixsrc_t idx);
|
||||||
|
void setOpts(const char* s);
|
||||||
void setFlightModes(uint16_t modes);
|
void setFlightModes(uint16_t modes);
|
||||||
|
|
||||||
virtual void updatePos(coord_t x, coord_t y) = 0;
|
virtual void updatePos(coord_t x, coord_t y) = 0;
|
||||||
@@ -66,7 +67,7 @@ class InputMixButtonBase : public ListLineButton
|
|||||||
static LAYOUT_VAL(BTN_W, 389, 229)
|
static LAYOUT_VAL(BTN_W, 389, 229)
|
||||||
static constexpr coord_t WGT_X = PAD_TINY;
|
static constexpr coord_t WGT_X = PAD_TINY;
|
||||||
static constexpr coord_t WGT_Y = PAD_TINY;
|
static constexpr coord_t WGT_Y = PAD_TINY;
|
||||||
static LAYOUT_VAL(WGT_W, 43, 43)
|
static LAYOUT_VAL(WGT_W, 50, 50)
|
||||||
static LAYOUT_VAL(WGT_H, 21, 21)
|
static LAYOUT_VAL(WGT_H, 21, 21)
|
||||||
static constexpr coord_t SRC_X = WGT_X + WGT_W + PAD_TINY;
|
static constexpr coord_t SRC_X = WGT_X + WGT_W + PAD_TINY;
|
||||||
static constexpr coord_t SRC_Y = WGT_Y;
|
static constexpr coord_t SRC_Y = WGT_Y;
|
||||||
@@ -74,7 +75,7 @@ class InputMixButtonBase : public ListLineButton
|
|||||||
static constexpr coord_t SRC_H = WGT_H;
|
static constexpr coord_t SRC_H = WGT_H;
|
||||||
static constexpr coord_t OPT_X = SRC_X + SRC_W + PAD_TINY;
|
static constexpr coord_t OPT_X = SRC_X + SRC_W + PAD_TINY;
|
||||||
static constexpr coord_t OPT_Y = WGT_Y;
|
static constexpr coord_t OPT_Y = WGT_Y;
|
||||||
static LAYOUT_VAL(OPT_W, 171, 106)
|
static LAYOUT_VAL(OPT_W, 164, 99)
|
||||||
static constexpr coord_t OPT_H = WGT_H;
|
static constexpr coord_t OPT_H = WGT_H;
|
||||||
static LAYOUT_VAL(LN_X, 73, 73)
|
static LAYOUT_VAL(LN_X, 73, 73)
|
||||||
static LAYOUT_VAL(FM_X, (OPT_X + OPT_W + PAD_TINY), 12)
|
static LAYOUT_VAL(FM_X, (OPT_X + OPT_W + PAD_TINY), 12)
|
||||||
|
|||||||
@@ -22,8 +22,9 @@
|
|||||||
#include "mixer_edit.h"
|
#include "mixer_edit.h"
|
||||||
|
|
||||||
#include "channel_bar.h"
|
#include "channel_bar.h"
|
||||||
#include "curve_param.h"
|
|
||||||
#include "gvar_numberedit.h"
|
#include "gvar_numberedit.h"
|
||||||
|
#include "source_numberedit.h"
|
||||||
|
#include "curve_param.h"
|
||||||
#include "mixer_edit_adv.h"
|
#include "mixer_edit_adv.h"
|
||||||
#include "mixes.h"
|
#include "mixes.h"
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
@@ -108,14 +109,14 @@ void MixEditWindow::buildBody(Window *form)
|
|||||||
// Weight
|
// Weight
|
||||||
line = form->newLine(grid);
|
line = form->newLine(grid);
|
||||||
new StaticText(line, rect_t{}, STR_WEIGHT);
|
new StaticText(line, rect_t{}, STR_WEIGHT);
|
||||||
auto gvar = new GVarNumberEdit(line, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX,
|
auto svar = new SourceNumberEdit(line, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX,
|
||||||
GET_SET_DEFAULT(mix->weight));
|
GET_SET_DEFAULT(mix->weight), 0);
|
||||||
gvar->setSuffix("%");
|
svar->setSuffix("%");
|
||||||
|
|
||||||
// Offset
|
// Offset
|
||||||
new StaticText(line, rect_t{}, STR_OFFSET);
|
new StaticText(line, rect_t{}, STR_OFFSET);
|
||||||
gvar = new GVarNumberEdit(line, MIX_OFFSET_MIN, MIX_OFFSET_MAX,
|
auto gvar = new SourceNumberEdit(line, MIX_OFFSET_MIN, MIX_OFFSET_MAX,
|
||||||
GET_SET_DEFAULT(mix->offset));
|
GET_SET_DEFAULT(mix->offset), 0);
|
||||||
gvar->setSuffix("%");
|
gvar->setSuffix("%");
|
||||||
|
|
||||||
// Switch
|
// Switch
|
||||||
@@ -126,7 +127,7 @@ void MixEditWindow::buildBody(Window *form)
|
|||||||
|
|
||||||
// Curve
|
// Curve
|
||||||
new StaticText(line, rect_t{}, STR_CURVE);
|
new StaticText(line, rect_t{}, STR_CURVE);
|
||||||
new CurveParam(line, rect_t{}, &mix->curve, SET_DEFAULT(mix->curve.value));
|
new CurveParam(line, rect_t{}, &mix->curve, SET_DEFAULT(mix->curve.value), 0);
|
||||||
|
|
||||||
line = form->newLine(grid);
|
line = form->newLine(grid);
|
||||||
line->padAll(PAD_LARGE);
|
line->padAll(PAD_LARGE);
|
||||||
|
|||||||
@@ -129,29 +129,29 @@ class InputLineButton : public InputMixButtonBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line.swtch || line.curve.value) {
|
if (line.swtch) {
|
||||||
if (line.swtch) {
|
char* sw_pos = getSwitchPositionName(line.swtch);
|
||||||
char* sw_pos = getSwitchPositionName(line.swtch);
|
int cnt = lv_snprintf(s, maxlen, "%s ", sw_pos);
|
||||||
int cnt = lv_snprintf(s, maxlen, "%s ", sw_pos);
|
if ((size_t)cnt >= maxlen)
|
||||||
if ((size_t)cnt >= maxlen)
|
maxlen = 0;
|
||||||
maxlen = 0;
|
else {
|
||||||
else {
|
maxlen -= cnt;
|
||||||
maxlen -= cnt;
|
s += cnt;
|
||||||
s += cnt;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (line.curve.value != 0) {
|
|
||||||
getCurveRefString(s, maxlen, line.curve);
|
|
||||||
int cnt = strnlen(s, maxlen);
|
|
||||||
if ((size_t)cnt >= maxlen)
|
|
||||||
maxlen = 0;
|
|
||||||
else {
|
|
||||||
maxlen -= cnt;
|
|
||||||
s += cnt;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
lv_label_set_text_fmt(opts, "%.*s", (int)sizeof(tmp_str), tmp_str);
|
|
||||||
|
if (line.curve.value != 0) {
|
||||||
|
getCurveRefString(s, maxlen, line.curve);
|
||||||
|
int cnt = strnlen(s, maxlen);
|
||||||
|
if ((size_t)cnt >= maxlen)
|
||||||
|
maxlen = 0;
|
||||||
|
else {
|
||||||
|
maxlen -= cnt;
|
||||||
|
s += cnt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setOpts(s);
|
||||||
|
|
||||||
setFlightModes(line.flightModes);
|
setFlightModes(line.flightModes);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,32 +98,25 @@ class MixLineButton : public InputMixButtonBase
|
|||||||
setSource(line.srcRaw);
|
setSource(line.srcRaw);
|
||||||
|
|
||||||
char tmp_str[64];
|
char tmp_str[64];
|
||||||
size_t maxlen = sizeof(tmp_str);
|
|
||||||
|
|
||||||
char *s = tmp_str;
|
char *s = tmp_str;
|
||||||
*s = '\0';
|
*s = '\0';
|
||||||
|
|
||||||
if (line.name[0]) {
|
if (line.name[0]) {
|
||||||
int cnt = lv_snprintf(s, maxlen, "%.*s ", (int)sizeof(line.name), line.name);
|
s = strAppend(s, line.name, LEN_EXPOMIX_NAME);
|
||||||
if ((size_t)cnt >= maxlen) maxlen = 0;
|
|
||||||
else { maxlen -= cnt; s += cnt; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line.swtch || line.curve.value) {
|
if (line.swtch) {
|
||||||
if (line.swtch) {
|
if (tmp_str[0]) s = strAppend(s, " ");
|
||||||
char* sw_pos = getSwitchPositionName(line.swtch);
|
char* sw_pos = getSwitchPositionName(line.swtch);
|
||||||
int cnt = lv_snprintf(s, maxlen, "%s ", sw_pos);
|
s = strAppend(s, sw_pos);
|
||||||
if ((size_t)cnt >= maxlen) maxlen = 0;
|
|
||||||
else { maxlen -= cnt; s += cnt; }
|
|
||||||
}
|
|
||||||
if (line.curve.value != 0) {
|
|
||||||
getCurveRefString(s, maxlen, line.curve);
|
|
||||||
int cnt = strnlen(s, maxlen);
|
|
||||||
if ((size_t)cnt >= maxlen) maxlen = 0;
|
|
||||||
else { maxlen -= cnt; s += cnt; }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
lv_label_set_text_fmt(opts, "%.*s", (int)sizeof(tmp_str), tmp_str);
|
|
||||||
|
if (line.curve.value != 0) {
|
||||||
|
if (tmp_str[0]) s = strAppend(s, " ");
|
||||||
|
getCurveRefString(s, sizeof(tmp_str) - (s - tmp_str), line.curve);
|
||||||
|
}
|
||||||
|
|
||||||
|
setOpts(tmp_str);
|
||||||
|
|
||||||
mplex->refresh();
|
mplex->refresh();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,147 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) EdgeTX
|
||||||
|
*
|
||||||
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
|
* th9x - http://code.google.com/p/th9x
|
||||||
|
* er9x - http://code.google.com/p/er9x
|
||||||
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
|
*
|
||||||
|
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "source_numberedit.h"
|
||||||
|
|
||||||
|
#include "opentx.h"
|
||||||
|
#include "sourcechoice.h"
|
||||||
|
|
||||||
|
void SourceNumberEdit::value_changed(lv_event_t* e)
|
||||||
|
{
|
||||||
|
auto obj = lv_event_get_target(e);
|
||||||
|
auto edit = (SourceNumberEdit*)lv_obj_get_user_data(obj);
|
||||||
|
if (!edit) return;
|
||||||
|
|
||||||
|
edit->update();
|
||||||
|
}
|
||||||
|
|
||||||
|
SourceNumberEdit::SourceNumberEdit(Window* parent,
|
||||||
|
int32_t vmin, int32_t vmax,
|
||||||
|
std::function<int32_t()> getValue,
|
||||||
|
std::function<void(int32_t)> setValue,
|
||||||
|
int16_t sourceMin,
|
||||||
|
LcdFlags textFlags, int32_t voffset,
|
||||||
|
int32_t vdefault) :
|
||||||
|
Window(parent, {0, 0, NUM_EDIT_W + SRC_BTN_W + PAD_TINY * 3, EdgeTxStyles::UI_ELEMENT_HEIGHT + PAD_TINY * 2}),
|
||||||
|
vmin(vmin),
|
||||||
|
vmax(vmax),
|
||||||
|
getValue(getValue),
|
||||||
|
setValue(setValue),
|
||||||
|
textFlags(textFlags),
|
||||||
|
voffset(voffset)
|
||||||
|
{
|
||||||
|
padAll(PAD_TINY);
|
||||||
|
lv_obj_set_flex_flow(lvobj, LV_FLEX_FLOW_ROW_WRAP);
|
||||||
|
lv_obj_set_style_flex_cross_place(lvobj, LV_FLEX_ALIGN_CENTER, 0);
|
||||||
|
lv_obj_set_size(lvobj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
|
||||||
|
|
||||||
|
// Source field
|
||||||
|
source_field = new SourceChoice(
|
||||||
|
this, {0, 0, NUM_EDIT_W, 0}, sourceMin, INPUTSRC_LAST,
|
||||||
|
[=]() {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = getValue();
|
||||||
|
return v.value;
|
||||||
|
},
|
||||||
|
[=](int newValue) {
|
||||||
|
SourceNumVal v = {(int16_t)newValue, true};
|
||||||
|
setValue(v.rawValue);
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
num_field = new NumberEdit(
|
||||||
|
this, {0, 0, NUM_EDIT_W, 0}, vmin, vmax,
|
||||||
|
[=]() {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = getValue();
|
||||||
|
return v.value;
|
||||||
|
},
|
||||||
|
[=](int newValue) {
|
||||||
|
SourceNumVal v = {(int16_t)newValue, false};
|
||||||
|
setValue(v.rawValue);
|
||||||
|
},
|
||||||
|
textFlags);
|
||||||
|
num_field->setDefault(vdefault);
|
||||||
|
|
||||||
|
// The Source button
|
||||||
|
m_srcBtn = new TextButton(this, {NUM_EDIT_W + PAD_TINY, 0, SRC_BTN_W, 0}, "SRC", [=]() {
|
||||||
|
switchSourceMode();
|
||||||
|
return isSource();
|
||||||
|
});
|
||||||
|
m_srcBtn->check(isSource());
|
||||||
|
|
||||||
|
lv_obj_add_event_cb(lvobj, SourceNumberEdit::value_changed,
|
||||||
|
LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
|
|
||||||
|
// update field type based on value
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool SourceNumberEdit::isSource()
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = getValue();
|
||||||
|
return v.isSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumberEdit::switchSourceMode()
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = getValue();
|
||||||
|
v.isSource = !v.isSource;
|
||||||
|
// TODO: convert value???
|
||||||
|
v.value = 0;
|
||||||
|
setValue(v.rawValue);
|
||||||
|
|
||||||
|
// update field type based on value
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumberEdit::setSuffix(std::string value)
|
||||||
|
{
|
||||||
|
num_field->setSuffix(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SourceNumberEdit::update()
|
||||||
|
{
|
||||||
|
bool has_focus = act_field && act_field->hasFocus();
|
||||||
|
|
||||||
|
source_field->hide();
|
||||||
|
num_field->hide();
|
||||||
|
|
||||||
|
if (isSource()) {
|
||||||
|
// Source mode
|
||||||
|
act_field = source_field;
|
||||||
|
source_field->show();
|
||||||
|
source_field->update();
|
||||||
|
lv_event_send(source_field->getLvObj(), LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
|
} else {
|
||||||
|
// number edit mode
|
||||||
|
act_field = num_field;
|
||||||
|
num_field->show();
|
||||||
|
num_field->update();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_srcBtn->check(isSource());
|
||||||
|
|
||||||
|
if (has_focus) {
|
||||||
|
lv_group_focus_obj(act_field->getLvObj());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) EdgeTX
|
||||||
|
*
|
||||||
|
* Based on code named
|
||||||
|
* opentx - https://github.com/opentx/opentx
|
||||||
|
* th9x - http://code.google.com/p/th9x
|
||||||
|
* er9x - http://code.google.com/p/er9x
|
||||||
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
|
*
|
||||||
|
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "choice.h"
|
||||||
|
#include "form.h"
|
||||||
|
#include "numberedit.h"
|
||||||
|
|
||||||
|
class TextButton;
|
||||||
|
|
||||||
|
class SourceNumberEdit : public Window
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
SourceNumberEdit(Window* parent, int32_t vmin, int32_t vmax,
|
||||||
|
std::function<int32_t()> getValue,
|
||||||
|
std::function<void(int32_t)> setValue,
|
||||||
|
int16_t sourceMin,
|
||||||
|
LcdFlags textFlags = 0, int32_t voffset = 0,
|
||||||
|
int32_t vdefault = 0);
|
||||||
|
|
||||||
|
void switchSourceMode();
|
||||||
|
void setSuffix(std::string value);
|
||||||
|
|
||||||
|
void setFastStep(int value) { num_field->setFastStep(value); }
|
||||||
|
void setAccelFactor(int value) { num_field->setAccelFactor(value); }
|
||||||
|
|
||||||
|
void update();
|
||||||
|
|
||||||
|
static LAYOUT_VAL(NUM_EDIT_W, 84, 74)
|
||||||
|
static LAYOUT_VAL(SRC_BTN_W, 38, 38)
|
||||||
|
|
||||||
|
protected:
|
||||||
|
Choice* source_field = nullptr;
|
||||||
|
NumberEdit* num_field = nullptr;
|
||||||
|
FormField* act_field = nullptr;
|
||||||
|
TextButton* m_srcBtn = nullptr;
|
||||||
|
|
||||||
|
int32_t vmin;
|
||||||
|
int32_t vmax;
|
||||||
|
std::function<int32_t()> getValue;
|
||||||
|
std::function<void(int32_t)> setValue;
|
||||||
|
LcdFlags textFlags;
|
||||||
|
int32_t voffset;
|
||||||
|
|
||||||
|
bool isSource();
|
||||||
|
|
||||||
|
static void value_changed(lv_event_t* e);
|
||||||
|
};
|
||||||
@@ -292,14 +292,6 @@ void editName(coord_t x, coord_t y, char* name, uint8_t size, event_t event,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t event)
|
|
||||||
{
|
|
||||||
u_int8int16_t weight;
|
|
||||||
MD_WEIGHT_TO_UNION(md, weight);
|
|
||||||
weight.word = GVAR_MENU_ITEM(x, y, weight.word, MIX_WEIGHT_MIN, MIX_WEIGHT_MAX, attr, 0, event);
|
|
||||||
MD_UNION_TO_WEIGHT(weight, md);
|
|
||||||
}
|
|
||||||
|
|
||||||
void drawGVarName(coord_t x, coord_t y, int8_t idx, LcdFlags flags)
|
void drawGVarName(coord_t x, coord_t y, int8_t idx, LcdFlags flags)
|
||||||
{
|
{
|
||||||
char s[8];
|
char s[8];
|
||||||
@@ -405,12 +397,12 @@ void drawCurveRef(coord_t x, coord_t y, CurveRef & curve, LcdFlags att)
|
|||||||
switch (curve.type) {
|
switch (curve.type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
lcdDrawText(x, y, "D", att);
|
lcdDrawText(x, y, "D", att);
|
||||||
GVAR_MENU_ITEM(lcdNextPos, y, curve.value, -100, 100, LEFT|att, 0, 0);
|
editSrcVarFieldValue(lcdNextPos, y, nullptr, curve.value, -100, 100, LEFT|att, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
lcdDrawText(x, y, "E", att);
|
lcdDrawText(x, y, "E", att);
|
||||||
GVAR_MENU_ITEM(lcdNextPos, y, curve.value, -100, 100, LEFT|att, 0, 0);
|
editSrcVarFieldValue(lcdNextPos, y, nullptr, curve.value, -100, 100, LEFT|att, 0, 0, 0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
@@ -543,3 +535,88 @@ void runFatalErrorScreen(const char * message)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att)
|
||||||
|
{
|
||||||
|
uint16_t aidx = abs(idx);
|
||||||
|
bool inverted = idx < 0;
|
||||||
|
|
||||||
|
if (aidx == MIXSRC_NONE) {
|
||||||
|
lcdDrawText(x, y, STR_EMPTY, att);
|
||||||
|
}
|
||||||
|
else if (aidx <= MIXSRC_LAST_INPUT) {
|
||||||
|
if (att & RIGHT) {
|
||||||
|
if (g_model.inputNames[aidx-MIXSRC_FIRST_INPUT][0])
|
||||||
|
lcdDrawSizedText(x, y, g_model.inputNames[aidx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, att);
|
||||||
|
else
|
||||||
|
lcdDrawNumber(x, y, aidx, att|LEADING0, 2);
|
||||||
|
x = lcdLastLeftPos - 5;
|
||||||
|
if (inverted)
|
||||||
|
lcdDrawChar(x-5, y, '-');
|
||||||
|
lcdDrawChar(x, y+1, CHR_INPUT, RIGHT|TINSIZE);
|
||||||
|
lcdDrawSolidFilledRect(x-1, y, 5, 7);
|
||||||
|
} else {
|
||||||
|
if (inverted) {
|
||||||
|
lcdDrawChar(x-1, y, '-');
|
||||||
|
x += 3;
|
||||||
|
}
|
||||||
|
lcdDrawChar(x+1, y+1, CHR_INPUT, TINSIZE);
|
||||||
|
lcdDrawSolidFilledRect(x, y, 5, 7);
|
||||||
|
if (g_model.inputNames[aidx-MIXSRC_FIRST_INPUT][0])
|
||||||
|
lcdDrawSizedText(x+6, y, g_model.inputNames[aidx-MIXSRC_FIRST_INPUT], LEN_INPUT_NAME, att);
|
||||||
|
else
|
||||||
|
lcdDrawNumber(x+6, y, aidx, att|LEADING0, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#if defined(LUA_INPUTS)
|
||||||
|
else if (aidx <= MIXSRC_LAST_LUA) {
|
||||||
|
div_t qr = div((uint16_t)(aidx-MIXSRC_FIRST_LUA), MAX_SCRIPT_OUTPUTS);
|
||||||
|
if (att & RIGHT) {
|
||||||
|
#if defined(LUA_MODEL_SCRIPTS)
|
||||||
|
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
|
||||||
|
lcdDrawSizedText(x, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
|
||||||
|
x = lcdLastLeftPos - 4;
|
||||||
|
if (inverted)
|
||||||
|
lcdDrawChar(x-5, y, '-');
|
||||||
|
lcdDrawChar(x, y+1, '1'+qr.quot, TINSIZE);
|
||||||
|
lcdDrawFilledRect(x-1, y, 5, 7, SOLID);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
lcdDrawChar(x, y, 'a' + qr.rem, att);
|
||||||
|
drawStringWithIndex(lcdLastLeftPos, y, "LUA", qr.quot+1, att);
|
||||||
|
#if defined(LUA_MODEL_SCRIPTS)
|
||||||
|
if (inverted)
|
||||||
|
lcdDrawChar(lcdLastLeftPos, y, '-', att);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
#if defined(LUA_MODEL_SCRIPTS)
|
||||||
|
if (inverted) {
|
||||||
|
lcdDrawChar(x-1, y, '-');
|
||||||
|
x += 3;
|
||||||
|
}
|
||||||
|
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
|
||||||
|
lcdDrawChar(x+1, y+1, '1'+qr.quot, TINSIZE);
|
||||||
|
lcdDrawFilledRect(x, y, 5, 7, SOLID);
|
||||||
|
lcdDrawSizedText(x+5, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
drawStringWithIndex(x, y, "LUA", qr.quot+1, att);
|
||||||
|
lcdDrawChar(lcdLastRightPos, y, 'a' + qr.rem, att);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
else {
|
||||||
|
const char* s = getSourceString(idx);
|
||||||
|
#if LCD_W < 212
|
||||||
|
if (idx >= MIXSRC_FIRST_TELEM && idx <= MIXSRC_LAST_TELEM)
|
||||||
|
s += strlen(STR_CHAR_TELEMETRY);
|
||||||
|
#endif
|
||||||
|
lcdDrawText(x, y, s, att);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,8 +19,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _STDLCD_DRAW_FUNCTIONS_H_
|
#pragma once
|
||||||
#define _STDLCD_DRAW_FUNCTIONS_H_
|
|
||||||
|
|
||||||
#include "lcd.h"
|
#include "lcd.h"
|
||||||
void lcdDrawMultiProtocolString(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t protocol, LcdFlags flags = 0);
|
void lcdDrawMultiProtocolString(coord_t x, coord_t y, uint8_t moduleIdx, uint8_t protocol, LcdFlags flags = 0);
|
||||||
@@ -55,4 +54,4 @@ void drawFunction(FnFuncP fn, uint8_t offset = 0);
|
|||||||
void drawCursor(FnFuncP fn, uint8_t offset = 0);
|
void drawCursor(FnFuncP fn, uint8_t offset = 0);
|
||||||
void drawCurve(coord_t offset = 0);
|
void drawCurve(coord_t offset = 0);
|
||||||
|
|
||||||
#endif // _STDLCD_DRAW_FUNCTIONS_H_
|
void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att=0);
|
||||||
|
|||||||
@@ -96,7 +96,8 @@ void menuModelCurvesAll(event_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags)
|
void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags,
|
||||||
|
IsValueAvailable isValueAvailable, int16_t sourceMin)
|
||||||
{
|
{
|
||||||
coord_t x1 = x;
|
coord_t x1 = x;
|
||||||
LcdFlags flags1 = flags;
|
LcdFlags flags1 = flags;
|
||||||
@@ -126,24 +127,36 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlag
|
|||||||
switch (curve.type) {
|
switch (curve.type) {
|
||||||
case CURVE_REF_DIFF:
|
case CURVE_REF_DIFF:
|
||||||
case CURVE_REF_EXPO:
|
case CURVE_REF_EXPO:
|
||||||
curve.value = GVAR_MENU_ITEM(x, y, curve.value, -100, 100, LEFT | flags, 0, event);
|
curve.value = editSrcVarFieldValue(x, y, nullptr, curve.value, -100, 100, flags, event, isValueAvailable, sourceMin);
|
||||||
break;
|
break;
|
||||||
case CURVE_REF_FUNC:
|
case CURVE_REF_FUNC:
|
||||||
lcdDrawTextAtIndex(x, y, STR_VCURVEFUNC, curve.value, flags);
|
{
|
||||||
if (active && menuHorizontalPosition==1) CHECK_INCDEC_MODELVAR_ZERO(event, curve.value, CURVE_BASE-1);
|
SourceNumVal v;
|
||||||
|
v.rawValue = curve.value;
|
||||||
|
lcdDrawTextAtIndex(x, y, STR_VCURVEFUNC, v.value, flags);
|
||||||
|
if (active && menuHorizontalPosition==1) {
|
||||||
|
CHECK_INCDEC_MODELVAR_ZERO(event, v.value, CURVE_BASE-1);
|
||||||
|
curve.value = v.rawValue;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
case CURVE_REF_CUSTOM:
|
case CURVE_REF_CUSTOM:
|
||||||
drawCurveName(x, y, curve.value, flags);
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = curve.value;
|
||||||
|
drawCurveName(x, y, v.value, flags);
|
||||||
if (active && menuHorizontalPosition == 1) {
|
if (active && menuHorizontalPosition == 1) {
|
||||||
if (event == EVT_KEY_LONG(KEY_ENTER) && curve.value != 0) {
|
if (event == EVT_KEY_LONG(KEY_ENTER) && v.value != 0) {
|
||||||
s_currIdxSubMenu = abs(curve.value) - 1;
|
s_currIdxSubMenu = abs(curve.value) - 1;
|
||||||
pushMenu(menuModelCurveOne);
|
pushMenu(menuModelCurveOne);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
CHECK_INCDEC_MODELVAR(event, curve.value, -MAX_CURVES, MAX_CURVES);
|
CHECK_INCDEC_MODELVAR(event, v.value, -MAX_CURVES, MAX_CURVES);
|
||||||
|
curve.value = v.rawValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -391,7 +391,7 @@ void menuModelExposAll(event_t event)
|
|||||||
coord_t y = MENU_HEADER_HEIGHT+1+(cur-menuVerticalOffset)*FH;
|
coord_t y = MENU_HEADER_HEIGHT+1+(cur-menuVerticalOffset)*FH;
|
||||||
if (i<MAX_EXPOS && (ed=expoAddress(i))->chn+1 == ch && EXPO_VALID(ed)) {
|
if (i<MAX_EXPOS && (ed=expoAddress(i))->chn+1 == ch && EXPO_VALID(ed)) {
|
||||||
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
||||||
drawSource(0, y, ch, 0);
|
drawSource(0, y, ch, ((s_copyMode || sub != cur) ? 0 : INVERS));
|
||||||
}
|
}
|
||||||
uint8_t mixCnt = 0;
|
uint8_t mixCnt = 0;
|
||||||
do {
|
do {
|
||||||
@@ -410,10 +410,10 @@ void menuModelExposAll(event_t event)
|
|||||||
s_currIdx = i;
|
s_currIdx = i;
|
||||||
}
|
}
|
||||||
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
||||||
LcdFlags attr = ((s_copyMode || sub != cur) ? 0 : INVERS);
|
editSrcVarFieldValue(EXPO_LINE_WEIGHT_POS, y, nullptr, ed->weight,
|
||||||
|
-100, 100, RIGHT | (isExpoActive(i) ? BOLD : 0),
|
||||||
GVAR_MENU_ITEM(EXPO_LINE_WEIGHT_POS, y, ed->weight, -100, 100, RIGHT | attr | (isExpoActive(i) ? BOLD : 0), 0, 0);
|
0, 0, 0);
|
||||||
displayExpoLine(y, ed, attr);
|
displayExpoLine(y, ed, 0);
|
||||||
|
|
||||||
if (s_copyMode) {
|
if (s_copyMode) {
|
||||||
if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
||||||
@@ -422,11 +422,14 @@ void menuModelExposAll(event_t event)
|
|||||||
}
|
}
|
||||||
if (cur == sub) {
|
if (cur == sub) {
|
||||||
/* invert the raw when it's the current one */
|
/* invert the raw when it's the current one */
|
||||||
lcdDrawSolidFilledRect(EXPO_LINE_SELECT_POS+1, y, LCD_W-EXPO_LINE_SELECT_POS-2, 7);
|
lcdDrawSolidFilledRect(0, y, LCD_W, 7);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cur++; y+=FH; mixCnt++; i++; ed++;
|
cur++; y+=FH; mixCnt++; i++; ed++;
|
||||||
|
if (sub == cur && ed->chn+1 == ch) {
|
||||||
|
lcdDrawText(INDENT_WIDTH, y, "->", ((s_copyMode || sub != cur) ? 0 : INVERS));
|
||||||
|
}
|
||||||
} while (i<MAX_EXPOS && ed->chn+1 == ch && EXPO_VALID(ed));
|
} while (i<MAX_EXPOS && ed->chn+1 == ch && EXPO_VALID(ed));
|
||||||
if (s_copyMode == MOVE_MODE && cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
if (s_copyMode == MOVE_MODE && cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
||||||
lcdDrawRect(EXPO_LINE_SELECT_POS, y-1, LCD_W-EXPO_LINE_SELECT_POS, 9, DOTTED);
|
lcdDrawRect(EXPO_LINE_SELECT_POS, y-1, LCD_W-EXPO_LINE_SELECT_POS, 9, DOTTED);
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ void menuModelMixAll(event_t event)
|
|||||||
MixData * md = mixAddress(i);
|
MixData * md = mixAddress(i);
|
||||||
if (i < getMixCount() && (md->destCh + 1 == ch)) {
|
if (i < getMixCount() && (md->destCh + 1 == ch)) {
|
||||||
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
||||||
putsChn(0, y, ch, 0); // show CHx
|
putsChn(0, y, ch, ((s_copyMode || sub != cur) ? 0 : INVERS)); // show CHx
|
||||||
}
|
}
|
||||||
uint8_t mixCnt = 0;
|
uint8_t mixCnt = 0;
|
||||||
do {
|
do {
|
||||||
@@ -326,17 +326,17 @@ void menuModelMixAll(event_t event)
|
|||||||
s_currIdx = i;
|
s_currIdx = i;
|
||||||
}
|
}
|
||||||
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
|
||||||
LcdFlags attr = ((s_copyMode || sub != cur) ? 0 : INVERS);
|
if (mixCnt > 0) lcdDrawTextAtIndex(FW, y, STR_VMLTPX2, md->mltpx, ((s_copyMode || sub != cur) ? 0 : INVERS));
|
||||||
|
|
||||||
if (mixCnt > 0) lcdDrawTextAtIndex(FW, y, STR_VMLTPX2, md->mltpx, 0);
|
|
||||||
|
|
||||||
drawSource(MIX_LINE_SRC_POS, y, md->srcRaw, 0);
|
drawSource(MIX_LINE_SRC_POS, y, md->srcRaw, 0);
|
||||||
|
|
||||||
if (mixCnt == 0 && md->mltpx == 1) {
|
if (mixCnt == 0 && md->mltpx == 1) {
|
||||||
lcdDrawText(MIX_LINE_WEIGHT_POS, y, "MULT!", RIGHT | attr | (isMixActive(i) ? BOLD : 0));
|
lcdDrawText(MIX_LINE_WEIGHT_POS, y, "MULT!", RIGHT | ((isMixActive(i) ? BOLD : 0)));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), 0);
|
editSrcVarFieldValue(MIX_LINE_WEIGHT_POS, y, nullptr, md->weight,
|
||||||
|
MIX_WEIGHT_MIN, MIX_WEIGHT_MAX, RIGHT | ((isMixActive(i) ? BOLD : 0)),
|
||||||
|
0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if LCD_W >= 212
|
#if LCD_W >= 212
|
||||||
@@ -352,7 +352,7 @@ void menuModelMixAll(event_t event)
|
|||||||
}
|
}
|
||||||
if (cur == sub) {
|
if (cur == sub) {
|
||||||
/* invert the raw when it's the current one */
|
/* invert the raw when it's the current one */
|
||||||
lcdDrawSolidFilledRect(23, y, LCD_W-24, 7);
|
lcdDrawSolidFilledRect(0, y, LCD_W, 7);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,6 +117,8 @@ void onSourceLongEnterPress(const char * result)
|
|||||||
}
|
}
|
||||||
} else if (result == STR_MENU_INVERT) {
|
} else if (result == STR_MENU_INVERT) {
|
||||||
checkIncDecSelection = MIXSRC_INVERT;
|
checkIncDecSelection = MIXSRC_INVERT;
|
||||||
|
} else if (result == STR_CONSTANT) {
|
||||||
|
checkIncDecSelection = MIXSRC_VALUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -74,6 +74,8 @@ extern int8_t s_editMode; // global editmode
|
|||||||
#define INCDEC_REP10 0x40
|
#define INCDEC_REP10 0x40
|
||||||
#define NO_DBLKEYS 0x80
|
#define NO_DBLKEYS 0x80
|
||||||
#define INCDEC_SOURCE_INVERT 0x100
|
#define INCDEC_SOURCE_INVERT 0x100
|
||||||
|
#define INCDEC_SOURCE_VALUE 0x200 // Field can be source or value
|
||||||
|
#define INCDEC_SOURCE_NOINPUTS 0x400 // Do not allow Inputs in source selection
|
||||||
|
|
||||||
int checkIncDec(event_t event, int val, int i_min, int i_max,
|
int checkIncDec(event_t event, int val, int i_min, int i_max,
|
||||||
unsigned int i_flags = 0, IsValueAvailable isValueAvailable = nullptr,
|
unsigned int i_flags = 0, IsValueAvailable isValueAvailable = nullptr,
|
||||||
|
|||||||
@@ -51,7 +51,26 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
{
|
{
|
||||||
int newval = val;
|
int newval = val;
|
||||||
|
|
||||||
|
bool isSource = false;
|
||||||
|
bool origIsSource = false;
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = val;
|
||||||
|
// Save isSource flag;
|
||||||
|
origIsSource = isSource = v.isSource;
|
||||||
|
// Remove isSource flag;
|
||||||
|
val = v.value;
|
||||||
|
newval = v.value;
|
||||||
|
}
|
||||||
|
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
|
bool invert = false;
|
||||||
|
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
||||||
|
invert = true;
|
||||||
|
newval = -newval;
|
||||||
|
val = -val;
|
||||||
|
}
|
||||||
|
|
||||||
if (event == EVT_KEY_FIRST(KEY_UP) || event == EVT_KEY_REPT(KEY_UP) ||
|
if (event == EVT_KEY_FIRST(KEY_UP) || event == EVT_KEY_REPT(KEY_UP) ||
|
||||||
event == EVT_KEY_FIRST(KEY_RIGHT) || event == EVT_KEY_REPT(KEY_RIGHT)) {
|
event == EVT_KEY_FIRST(KEY_RIGHT) || event == EVT_KEY_REPT(KEY_RIGHT)) {
|
||||||
do {
|
do {
|
||||||
@@ -94,10 +113,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(AUTOSOURCE)
|
#if defined(AUTOSOURCE)
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE|INCDEC_SOURCE_VALUE)) {
|
||||||
int8_t source = GET_MOVED_SOURCE(i_min, i_max);
|
int source = GET_MOVED_SOURCE(i_min, i_max);
|
||||||
if (source) {
|
if (source) {
|
||||||
newval = source;
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (isSource) {
|
||||||
|
// Only use moved source if already a source value
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#if defined(AUTOSWITCH)
|
#if defined(AUTOSWITCH)
|
||||||
else {
|
else {
|
||||||
@@ -109,6 +135,11 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (invert) {
|
||||||
|
newval = -newval;
|
||||||
|
val = -val;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i_min == 0 && i_max == 1 &&
|
if (i_min == 0 && i_max == 1 &&
|
||||||
@@ -117,6 +148,75 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
newval = !val;
|
newval = !val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i_flags & (INCDEC_SOURCE | INCDEC_SOURCE_VALUE)) {
|
||||||
|
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
|
checkIncDecSelection = MIXSRC_NONE;
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE && isSource) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
||||||
|
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
|
||||||
|
(i_flags & INCDEC_SOURCE_NOINPUTS) == 0) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#if defined(LUA_MODEL_SCRIPTS)
|
||||||
|
if (i_min <= MIXSRC_FIRST_LUA && i_max >= MIXSRC_FIRST_LUA) {
|
||||||
|
if (getFirstAvailable(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable) != MIXSRC_NONE) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_MENU_LUA);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (i_min <= MIXSRC_FIRST_STICK && i_max >= MIXSRC_FIRST_STICK) POPUP_MENU_ADD_ITEM(STR_MENU_STICKS);
|
||||||
|
if (i_min <= MIXSRC_FIRST_POT && i_max >= MIXSRC_FIRST_POT) POPUP_MENU_ADD_ITEM(STR_MENU_POTS);
|
||||||
|
if (i_min <= MIXSRC_MIN && i_max >= MIXSRC_MIN) POPUP_MENU_ADD_ITEM(STR_MENU_MIN);
|
||||||
|
if (i_min <= MIXSRC_MAX && i_max >= MIXSRC_MAX) POPUP_MENU_ADD_ITEM(STR_MENU_MAX);
|
||||||
|
#if defined(HELI)
|
||||||
|
if (modelHeliEnabled())
|
||||||
|
if (i_min <= MIXSRC_FIRST_HELI && i_max >= MIXSRC_FIRST_HELI && isValueAvailable && isValueAvailable(MIXSRC_FIRST_HELI))
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_MENU_HELI);
|
||||||
|
#endif
|
||||||
|
if (i_min <= MIXSRC_FIRST_TRIM && i_max >= MIXSRC_FIRST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
|
||||||
|
if (i_min <= MIXSRC_FIRST_SWITCH && i_max >= MIXSRC_FIRST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
|
||||||
|
if (i_min <= MIXSRC_FIRST_TRAINER && i_max >= MIXSRC_FIRST_TRAINER) POPUP_MENU_ADD_ITEM(STR_MENU_TRAINER);
|
||||||
|
if (i_min <= MIXSRC_FIRST_CH && i_max >= MIXSRC_FIRST_CH) POPUP_MENU_ADD_ITEM(STR_MENU_CHANNELS);
|
||||||
|
if (i_min <= MIXSRC_FIRST_GVAR && i_max >= MIXSRC_FIRST_GVAR && isValueAvailable && isValueAvailable(MIXSRC_FIRST_GVAR)) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_MENU_GVARS);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modelTelemetryEnabled() && i_min <= MIXSRC_FIRST_TELEM && i_max >= MIXSRC_FIRST_TELEM) {
|
||||||
|
for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) {
|
||||||
|
TelemetrySensor * sensor = & g_model.telemetrySensors[i];
|
||||||
|
if (sensor->isAvailable()) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_MENU_TELEMETRY);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i_flags & INCDEC_SOURCE_INVERT) POPUP_MENU_ADD_ITEM(STR_MENU_INVERT);
|
||||||
|
POPUP_MENU_START(onSourceLongEnterPress);
|
||||||
|
}
|
||||||
|
if (checkIncDecSelection != 0) {
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (checkIncDecSelection == MIXSRC_VALUE) {
|
||||||
|
newval = 0;
|
||||||
|
isSource = false;
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
if (checkIncDecSelection != MIXSRC_INVERT)
|
||||||
|
isSource = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
}
|
||||||
|
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
||||||
|
s_editMode = EDIT_MODIFY_FIELD;
|
||||||
|
checkIncDecSelection = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (newval != val) {
|
if (newval != val) {
|
||||||
if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) &&
|
if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) &&
|
||||||
(newval != i_min) && stops.contains(newval)) {
|
(newval != i_min) && stops.contains(newval)) {
|
||||||
@@ -136,6 +236,13 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
checkIncDec_Ret = 0;
|
checkIncDec_Ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = isSource;
|
||||||
|
v.value = newval;
|
||||||
|
newval = v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
return newval;
|
return newval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
bool isSource = false;
|
||||||
|
bool origIsSource = false;
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = val;
|
||||||
|
// Save isSource flag;
|
||||||
|
origIsSource = isSource = v.isSource;
|
||||||
|
// Remove isSource flag;
|
||||||
|
val = v.value;
|
||||||
|
newval = v.value;
|
||||||
|
}
|
||||||
|
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
bool invert = false;
|
bool invert = false;
|
||||||
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
||||||
@@ -111,10 +123,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(AUTOSOURCE)
|
#if defined(AUTOSOURCE)
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE|INCDEC_SOURCE_VALUE)) {
|
||||||
int source = GET_MOVED_SOURCE(i_min, i_max);
|
int source = GET_MOVED_SOURCE(i_min, i_max);
|
||||||
if (source) {
|
if (source) {
|
||||||
newval = source;
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (isSource) {
|
||||||
|
// Only use moved source if already a source value
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#if defined(AUTOSWITCH)
|
#if defined(AUTOSWITCH)
|
||||||
else {
|
else {
|
||||||
@@ -139,18 +158,24 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
newval = !val;
|
newval = !val;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE | INCDEC_SOURCE_VALUE)) {
|
||||||
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
checkIncDecSelection = MIXSRC_NONE;
|
checkIncDecSelection = MIXSRC_NONE;
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE && isSource) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
|
||||||
|
}
|
||||||
|
|
||||||
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
||||||
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
|
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
|
||||||
|
(i_flags & INCDEC_SOURCE_NOINPUTS) == 0) {
|
||||||
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if defined(LUA_MODEL_SCRIPTS)
|
#if defined(LUA_MODEL_SCRIPTS)
|
||||||
if (i_min <= MIXSRC_FIRST_LUA && i_max >= MIXSRC_FIRST_LUA) {
|
if (i_min <= MIXSRC_FIRST_LUA && i_max >= MIXSRC_FIRST_LUA) {
|
||||||
if (getFirstAvailable(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable) != MIXSRC_NONE) {
|
if (getFirstAvailable(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable) != MIXSRC_NONE &&
|
||||||
|
(i_flags & INCDEC_SOURCE_NOINPUTS) == 0) {
|
||||||
POPUP_MENU_ADD_ITEM(STR_MENU_LUA);
|
POPUP_MENU_ADD_ITEM(STR_MENU_LUA);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -185,7 +210,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
POPUP_MENU_START(onSourceLongEnterPress);
|
POPUP_MENU_START(onSourceLongEnterPress);
|
||||||
}
|
}
|
||||||
if (checkIncDecSelection != 0) {
|
if (checkIncDecSelection != 0) {
|
||||||
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (checkIncDecSelection == MIXSRC_VALUE) {
|
||||||
|
newval = 0;
|
||||||
|
isSource = false;
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
if (checkIncDecSelection != MIXSRC_INVERT)
|
||||||
|
isSource = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
}
|
||||||
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
||||||
s_editMode = EDIT_MODIFY_FIELD;
|
s_editMode = EDIT_MODIFY_FIELD;
|
||||||
checkIncDecSelection = 0;
|
checkIncDecSelection = 0;
|
||||||
@@ -216,7 +252,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newval != val) {
|
if (newval != val || isSource != origIsSource) {
|
||||||
storageDirty(i_flags & (EE_GENERAL|EE_MODEL));
|
storageDirty(i_flags & (EE_GENERAL|EE_MODEL));
|
||||||
checkIncDec_Ret = (newval > val ? 1 : -1);
|
checkIncDec_Ret = (newval > val ? 1 : -1);
|
||||||
}
|
}
|
||||||
@@ -224,6 +260,13 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
checkIncDec_Ret = 0;
|
checkIncDec_Ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = isSource;
|
||||||
|
v.value = newval;
|
||||||
|
newval = v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
return newval;
|
return newval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
bool isSource = false;
|
||||||
|
bool origIsSource = false;
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = val;
|
||||||
|
// Save isSource flag;
|
||||||
|
origIsSource = isSource = v.isSource;
|
||||||
|
// Remove isSource flag;
|
||||||
|
val = v.value;
|
||||||
|
newval = v.value;
|
||||||
|
}
|
||||||
|
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
bool invert = false;
|
bool invert = false;
|
||||||
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
||||||
@@ -111,10 +123,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(AUTOSOURCE)
|
#if defined(AUTOSOURCE)
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE|INCDEC_SOURCE_VALUE)) {
|
||||||
int source = GET_MOVED_SOURCE(i_min, i_max);
|
int source = GET_MOVED_SOURCE(i_min, i_max);
|
||||||
if (source) {
|
if (source) {
|
||||||
newval = source;
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (isSource) {
|
||||||
|
// Only use moved source if already a source value
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#if defined(AUTOSWITCH)
|
#if defined(AUTOSWITCH)
|
||||||
else {
|
else {
|
||||||
@@ -139,12 +158,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
newval = !val;
|
newval = !val;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE | INCDEC_SOURCE_VALUE)) {
|
||||||
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
if (event == EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
checkIncDecSelection = MIXSRC_NONE;
|
checkIncDecSelection = MIXSRC_NONE;
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE && isSource) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
|
||||||
|
}
|
||||||
|
|
||||||
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
||||||
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
|
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
|
||||||
|
(i_flags & INCDEC_SOURCE_NOINPUTS) == 0) {
|
||||||
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -185,7 +209,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
POPUP_MENU_START(onSourceLongEnterPress);
|
POPUP_MENU_START(onSourceLongEnterPress);
|
||||||
}
|
}
|
||||||
if (checkIncDecSelection != 0) {
|
if (checkIncDecSelection != 0) {
|
||||||
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (checkIncDecSelection == MIXSRC_VALUE) {
|
||||||
|
newval = 0;
|
||||||
|
isSource = false;
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
if (checkIncDecSelection != MIXSRC_INVERT)
|
||||||
|
isSource = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
}
|
||||||
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
||||||
s_editMode = EDIT_MODIFY_FIELD;
|
s_editMode = EDIT_MODIFY_FIELD;
|
||||||
checkIncDecSelection = 0;
|
checkIncDecSelection = 0;
|
||||||
@@ -258,6 +293,13 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
checkIncDec_Ret = 0;
|
checkIncDec_Ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = isSource;
|
||||||
|
v.value = newval;
|
||||||
|
newval = v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
return newval;
|
return newval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,6 +49,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
{
|
{
|
||||||
int newval = val;
|
int newval = val;
|
||||||
|
|
||||||
|
bool isSource = false;
|
||||||
|
bool origIsSource = false;
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = val;
|
||||||
|
// Save isSource flag;
|
||||||
|
origIsSource = isSource = v.isSource;
|
||||||
|
// Remove isSource flag;
|
||||||
|
val = v.value;
|
||||||
|
newval = v.value;
|
||||||
|
}
|
||||||
|
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
bool invert = false;
|
bool invert = false;
|
||||||
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
if ((i_flags & INCDEC_SOURCE_INVERT) && (newval < 0)) {
|
||||||
@@ -101,10 +113,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(AUTOSOURCE)
|
#if defined(AUTOSOURCE)
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE|INCDEC_SOURCE_VALUE)) {
|
||||||
int8_t source = GET_MOVED_SOURCE(i_min, i_max);
|
int source = GET_MOVED_SOURCE(i_min, i_max);
|
||||||
if (source) {
|
if (source) {
|
||||||
newval = source;
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (isSource) {
|
||||||
|
// Only use moved source if already a source value
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = source;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#if defined(AUTOSWITCH)
|
#if defined(AUTOSWITCH)
|
||||||
else {
|
else {
|
||||||
@@ -148,12 +167,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
checkIncDec_Ret = 0;
|
checkIncDec_Ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i_flags & INCDEC_SOURCE) {
|
if (i_flags & (INCDEC_SOURCE | INCDEC_SOURCE_VALUE)) {
|
||||||
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
|
if (event == EVT_KEY_LONG(KEY_ENTER) && !keysGetState(KEY_SHIFT)) {
|
||||||
checkIncDecSelection = MIXSRC_NONE;
|
checkIncDecSelection = MIXSRC_NONE;
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE && isSource) {
|
||||||
|
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
|
||||||
|
}
|
||||||
|
|
||||||
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
|
||||||
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
|
if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
|
||||||
|
(i_flags & INCDEC_SOURCE_NOINPUTS) == 0) {
|
||||||
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -194,7 +218,18 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
POPUP_MENU_START(onSourceLongEnterPress);
|
POPUP_MENU_START(onSourceLongEnterPress);
|
||||||
}
|
}
|
||||||
if (checkIncDecSelection != 0) {
|
if (checkIncDecSelection != 0) {
|
||||||
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
if (checkIncDecSelection == MIXSRC_VALUE) {
|
||||||
|
newval = 0;
|
||||||
|
isSource = false;
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
if (checkIncDecSelection != MIXSRC_INVERT)
|
||||||
|
isSource = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
newval = (checkIncDecSelection == MIXSRC_INVERT ? -newval : checkIncDecSelection);
|
||||||
|
}
|
||||||
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
if (checkIncDecSelection != MIXSRC_MIN && checkIncDecSelection != MIXSRC_MAX)
|
||||||
s_editMode = EDIT_MODIFY_FIELD;
|
s_editMode = EDIT_MODIFY_FIELD;
|
||||||
checkIncDecSelection = 0;
|
checkIncDecSelection = 0;
|
||||||
@@ -225,6 +260,13 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (i_flags & INCDEC_SOURCE_VALUE) {
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = isSource;
|
||||||
|
v.value = newval;
|
||||||
|
newval = v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
return newval;
|
return newval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -681,10 +681,18 @@ static int luaModelInsertInput(lua_State *L)
|
|||||||
expo->scale = luaL_checkinteger(L, -1);
|
expo->scale = luaL_checkinteger(L, -1);
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "weight")) {
|
else if (!strcmp(key, "weight")) {
|
||||||
expo->weight = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
expo->weight = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "offset")) {
|
else if (!strcmp(key, "offset")) {
|
||||||
expo->offset = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
expo->offset = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "switch")) {
|
else if (!strcmp(key, "switch")) {
|
||||||
expo->swtch = luaL_checkinteger(L, -1);
|
expo->swtch = luaL_checkinteger(L, -1);
|
||||||
@@ -693,7 +701,11 @@ static int luaModelInsertInput(lua_State *L)
|
|||||||
expo->curve.type = luaL_checkinteger(L, -1);
|
expo->curve.type = luaL_checkinteger(L, -1);
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "curveValue")) {
|
else if (!strcmp(key, "curveValue")) {
|
||||||
expo->curve.value = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
expo->curve.value = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "trimSource")) {
|
else if (!strcmp(key, "trimSource")) {
|
||||||
expo->trimSource = - luaL_checkinteger(L, -1);
|
expo->trimSource = - luaL_checkinteger(L, -1);
|
||||||
@@ -904,10 +916,18 @@ static int luaModelInsertMix(lua_State *L)
|
|||||||
mix->srcRaw = luaL_checkinteger(L, -1);
|
mix->srcRaw = luaL_checkinteger(L, -1);
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "weight")) {
|
else if (!strcmp(key, "weight")) {
|
||||||
mix->weight = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
mix->weight = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "offset")) {
|
else if (!strcmp(key, "offset")) {
|
||||||
mix->offset = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
mix->offset = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "switch")) {
|
else if (!strcmp(key, "switch")) {
|
||||||
mix->swtch = luaL_checkinteger(L, -1);
|
mix->swtch = luaL_checkinteger(L, -1);
|
||||||
@@ -916,7 +936,11 @@ static int luaModelInsertMix(lua_State *L)
|
|||||||
mix->curve.type = luaL_checkinteger(L, -1);
|
mix->curve.type = luaL_checkinteger(L, -1);
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "curveValue")) {
|
else if (!strcmp(key, "curveValue")) {
|
||||||
mix->curve.value = luaL_checkinteger(L, -1);
|
int val = luaL_checkinteger(L, -1);
|
||||||
|
SourceNumVal v;
|
||||||
|
v.isSource = (abs(val) >= 1024);
|
||||||
|
v.value = val;
|
||||||
|
mix->curve.value = v.rawValue;
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "multiplex")) {
|
else if (!strcmp(key, "multiplex")) {
|
||||||
mix->mltpx = luaL_checkinteger(L, -1);
|
mix->mltpx = luaL_checkinteger(L, -1);
|
||||||
|
|||||||
+23
-4
@@ -53,6 +53,25 @@ int16_t ex_chans[MAX_OUTPUT_CHANNELS] = {0}; // Outputs (before LIMITS) of the l
|
|||||||
int16_t cyc_anas[3] = {0};
|
int16_t cyc_anas[3] = {0};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// TOOD: find better home for this.
|
||||||
|
int32_t getSourceNumFieldValue(int16_t val, int16_t min, int16_t max)
|
||||||
|
{
|
||||||
|
int32_t result;
|
||||||
|
SourceNumVal v; v.rawValue = val;
|
||||||
|
if (v.isSource) {
|
||||||
|
result = getValue(v.value);
|
||||||
|
if (v.value >= MIXSRC_FIRST_GVAR && v.value <= MIXSRC_LAST_GVAR) {
|
||||||
|
// Mimic behviour of GET_GVAR_PREC1
|
||||||
|
result = result * 10;
|
||||||
|
} else {
|
||||||
|
result = calcRESXto1000(result);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
result = v.value * 10;
|
||||||
|
}
|
||||||
|
return limit<int>(min * 10, result, max * 10);
|
||||||
|
}
|
||||||
|
|
||||||
// #define EXTENDED_EXPO
|
// #define EXTENDED_EXPO
|
||||||
// increases range of expo curve but costs about 82 bytes flash
|
// increases range of expo curve but costs about 82 bytes flash
|
||||||
|
|
||||||
@@ -193,11 +212,11 @@ void applyExpos(int16_t * anas, uint8_t mode, int16_t ovwrIdx, int16_t ovwrValue
|
|||||||
}
|
}
|
||||||
|
|
||||||
//========== WEIGHT ===============
|
//========== WEIGHT ===============
|
||||||
int32_t weight = GET_GVAR_PREC1(ed->weight, -100, 100, mixerCurrentFlightMode);
|
int32_t weight = getSourceNumFieldValue(ed->weight, -100, 100);
|
||||||
v = divRoundClosest((int32_t)v * weight, 1000);
|
v = divRoundClosest((int32_t)v * weight, 1000);
|
||||||
|
|
||||||
//========== OFFSET ===============
|
//========== OFFSET ===============
|
||||||
int32_t offset = GET_GVAR_PREC1(ed->offset, -100, 100, mixerCurrentFlightMode);
|
int32_t offset = getSourceNumFieldValue(ed->offset, -100, 100);
|
||||||
if (offset) v += divRoundClosest(calc100toRESX(offset), 10);
|
if (offset) v += divRoundClosest(calc100toRESX(offset), 10);
|
||||||
|
|
||||||
//========== TRIMS ================
|
//========== TRIMS ================
|
||||||
@@ -951,7 +970,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t weight = GET_GVAR_PREC1(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int32_t weight = getSourceNumFieldValue(md->weight, -RESX, RESX);
|
||||||
weight = calc100to256_16Bits(weight);
|
weight = calc100to256_16Bits(weight);
|
||||||
//========== SPEED ===============
|
//========== SPEED ===============
|
||||||
// now its on input side, but without weight compensation. More like other remote controls
|
// now its on input side, but without weight compensation. More like other remote controls
|
||||||
@@ -1006,7 +1025,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
|
|||||||
|
|
||||||
//========== OFFSET / AFTER ===============
|
//========== OFFSET / AFTER ===============
|
||||||
if (applyOffsetAndCurve) {
|
if (applyOffsetAndCurve) {
|
||||||
int32_t offset = GET_GVAR_PREC1(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
|
int32_t offset = getSourceNumFieldValue(md->offset, -RESX, RESX);
|
||||||
if (offset) dv += divRoundClosest(calc100toRESX_16Bits(offset), 10) << 8;
|
if (offset) dv += divRoundClosest(calc100toRESX_16Bits(offset), 10) << 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -272,14 +272,6 @@ enum DisplayTrims
|
|||||||
extern RadioData g_eeGeneral;
|
extern RadioData g_eeGeneral;
|
||||||
extern ModelData g_model;
|
extern ModelData g_model;
|
||||||
|
|
||||||
PACK(union u_int8int16_t {
|
|
||||||
struct {
|
|
||||||
int8_t lo;
|
|
||||||
uint8_t hi;
|
|
||||||
} bytes_t;
|
|
||||||
int16_t word;
|
|
||||||
});
|
|
||||||
|
|
||||||
constexpr uint8_t EE_GENERAL = 0x01;
|
constexpr uint8_t EE_GENERAL = 0x01;
|
||||||
constexpr uint8_t EE_MODEL = 0x02;
|
constexpr uint8_t EE_MODEL = 0x02;
|
||||||
constexpr uint8_t EE_LABELS = 0x04;
|
constexpr uint8_t EE_LABELS = 0x04;
|
||||||
|
|||||||
@@ -391,21 +391,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -433,13 +434,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -798,7 +800,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -463,6 +463,40 @@ static bool w_mixSrcRawEx(const YamlNode* node, uint32_t val, yaml_writer_func w
|
|||||||
return wf(opaque, "\"", 1);
|
return wf(opaque, "\"", 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint32_t r_sourceNumVal(const YamlNode* node, const char* val, uint8_t val_len)
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
|
||||||
|
if (((val[0] == '-') && (val[1] >= '0' && val[1] <= '9')) || (val[0] >= '0' && val[0] <= '9')) {
|
||||||
|
v.isSource = 0;
|
||||||
|
v.value = (uint32_t)yaml_str2int(val, val_len);
|
||||||
|
} else if ((val[0] == '-') && (val[1] == 'G')) {
|
||||||
|
v.isSource = 1;
|
||||||
|
v.value = -((val[3] - '0') + MIXSRC_FIRST_GVAR - 1);
|
||||||
|
} else if (val[0] == 'G') {
|
||||||
|
v.isSource = 1;
|
||||||
|
v.value = (val[2] - '0') + MIXSRC_FIRST_GVAR - 1;
|
||||||
|
} else {
|
||||||
|
v.isSource = 1;
|
||||||
|
v.value = r_mixSrcRawEx(node, val, val_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
return v.rawValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool w_sourceNumVal(const YamlNode* node, uint32_t val, yaml_writer_func wf,
|
||||||
|
void* opaque)
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = val;
|
||||||
|
|
||||||
|
if (v.isSource)
|
||||||
|
return w_mixSrcRawEx(node, v.value, wf, opaque);
|
||||||
|
|
||||||
|
char* s = yaml_signed2str(v.value);
|
||||||
|
return wf(opaque, s, strlen(s));
|
||||||
|
}
|
||||||
|
|
||||||
static void r_rssiDisabled(void* user, uint8_t* data, uint32_t bitoffs,
|
static void r_rssiDisabled(void* user, uint8_t* data, uint32_t bitoffs,
|
||||||
const char* val, uint8_t val_len)
|
const char* val, uint8_t val_len)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -417,21 +417,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -459,13 +460,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -832,7 +834,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -417,21 +417,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -459,13 +460,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -832,7 +834,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -419,21 +419,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -461,13 +462,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -838,7 +840,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -391,21 +391,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -433,13 +434,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -798,7 +800,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -391,21 +391,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -433,13 +434,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -798,7 +800,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -419,21 +419,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -461,13 +462,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -833,7 +835,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -419,21 +419,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -461,13 +462,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -833,7 +835,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -390,21 +390,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -432,13 +433,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -797,7 +799,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -391,21 +391,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -433,13 +434,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -798,7 +800,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 104, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -394,21 +394,22 @@ static const struct YamlNode struct_TimerData[] = {
|
|||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveRef[] = {
|
static const struct YamlNode struct_CurveRef[] = {
|
||||||
YAML_UNSIGNED( "type", 8 ),
|
YAML_UNSIGNED( "type", 5 ),
|
||||||
YAML_SIGNED_CUST( "value", 8, in_read_weight, in_write_weight ),
|
YAML_SIGNED_CUST( "value", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_MixData[] = {
|
static const struct YamlNode struct_MixData[] = {
|
||||||
YAML_SIGNED_CUST( "weight", 11, in_read_weight, in_write_weight ),
|
|
||||||
YAML_UNSIGNED( "destCh", 5 ),
|
YAML_UNSIGNED( "destCh", 5 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "carryTrim", 1 ),
|
YAML_UNSIGNED( "carryTrim", 1 ),
|
||||||
YAML_UNSIGNED( "mixWarn", 2 ),
|
YAML_UNSIGNED( "mixWarn", 2 ),
|
||||||
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
YAML_ENUM("mltpx", 2, enum_MixerMultiplex),
|
||||||
YAML_UNSIGNED( "speedPrec", 1 ),
|
YAML_UNSIGNED( "speedPrec", 1 ),
|
||||||
YAML_SIGNED_CUST( "offset", 13, in_read_weight, in_write_weight ),
|
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
YAML_UNSIGNED( "delayUp", 8 ),
|
YAML_UNSIGNED( "delayUp", 8 ),
|
||||||
YAML_UNSIGNED( "delayDown", 8 ),
|
YAML_UNSIGNED( "delayDown", 8 ),
|
||||||
@@ -436,13 +437,14 @@ static const struct YamlNode struct_ExpoData[] = {
|
|||||||
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
YAML_CUSTOM("carryTrim",r_carryTrim,nullptr),
|
||||||
YAML_SIGNED( "trimSource", 6 ),
|
YAML_SIGNED( "trimSource", 6 ),
|
||||||
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
YAML_SIGNED_CUST( "srcRaw", 10, r_mixSrcRawEx, w_mixSrcRawEx ),
|
||||||
YAML_UNSIGNED( "chn", 5 ),
|
YAML_UNSIGNED_CUST( "weight", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
|
YAML_UNSIGNED_CUST( "offset", 11, r_sourceNumVal, w_sourceNumVal ),
|
||||||
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
YAML_SIGNED_CUST( "swtch", 10, r_swtchSrc, w_swtchSrc ),
|
||||||
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
|
||||||
YAML_SIGNED_CUST( "weight", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRING("name", 6),
|
|
||||||
YAML_SIGNED_CUST( "offset", 8, in_read_weight, in_write_weight ),
|
|
||||||
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
YAML_STRUCT("curve", 16, struct_CurveRef, NULL),
|
||||||
|
YAML_UNSIGNED( "chn", 5 ),
|
||||||
|
YAML_UNSIGNED_CUST( "flightModes", 9, r_flightModes, w_flightModes ),
|
||||||
|
YAML_UNSIGNED( "spare", 2 ),
|
||||||
|
YAML_STRING("name", 6),
|
||||||
YAML_END
|
YAML_END
|
||||||
};
|
};
|
||||||
static const struct YamlNode struct_CurveHeader[] = {
|
static const struct YamlNode struct_CurveHeader[] = {
|
||||||
@@ -801,7 +803,7 @@ static const struct YamlNode struct_ModelData[] = {
|
|||||||
YAML_UNSIGNED( "beepANACenter", 16 ),
|
YAML_UNSIGNED( "beepANACenter", 16 ),
|
||||||
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
YAML_ARRAY("mixData", 160, 64, struct_MixData, NULL),
|
||||||
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
YAML_ARRAY("limitData", 88, 32, struct_LimitData, NULL),
|
||||||
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
|
YAML_ARRAY("expoData", 144, 64, struct_ExpoData, NULL),
|
||||||
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
|
||||||
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
|
||||||
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
|
||||||
|
|||||||
@@ -380,7 +380,7 @@ char *getCurveString(char *dest, int idx)
|
|||||||
|
|
||||||
char *s = dest;
|
char *s = dest;
|
||||||
if (idx < 0) {
|
if (idx < 0) {
|
||||||
*s++ = '!';
|
*s++ = '-';
|
||||||
idx = -idx;
|
idx = -idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,6 +429,24 @@ char *getValueOrGVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
|
|||||||
formatNumberAsString(dest, len, value, flags, 0, nullptr, suffix);
|
formatNumberAsString(dest, len, value, flags, 0, nullptr, suffix);
|
||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char *getValueOrSrcVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
|
||||||
|
gvar_t vmax, LcdFlags flags, const char *suffix,
|
||||||
|
gvar_t offset, bool usePPMUnit)
|
||||||
|
{
|
||||||
|
SourceNumVal v;
|
||||||
|
v.rawValue = value;
|
||||||
|
if (v.isSource) {
|
||||||
|
const char* s = getSourceString(v.value);
|
||||||
|
strncpy(dest, s, len);
|
||||||
|
} else {
|
||||||
|
v.value += offset;
|
||||||
|
if (usePPMUnit && g_eeGeneral.ppmunit == PPM_US)
|
||||||
|
v.value = v.value * 128 / 25;
|
||||||
|
formatNumberAsString(dest, len, v.value, flags, 0, nullptr, suffix);
|
||||||
|
}
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char *getFlightModeString(char *dest, int8_t idx)
|
char *getFlightModeString(char *dest, int8_t idx)
|
||||||
@@ -640,7 +658,7 @@ char *getSourceString(char (&destRef)[L], mixsrc_t idx)
|
|||||||
|
|
||||||
if (idx < 0) {
|
if (idx < 0) {
|
||||||
idx = -idx;
|
idx = -idx;
|
||||||
dest[0] = '!';
|
dest[0] = '-';
|
||||||
dest += 1;
|
dest += 1;
|
||||||
dest_len -= 1;
|
dest_len -= 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,6 +98,9 @@ char *getGVarString(int idx);
|
|||||||
char *getValueOrGVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
|
char *getValueOrGVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
|
||||||
gvar_t vmax, LcdFlags flags = 0,
|
gvar_t vmax, LcdFlags flags = 0,
|
||||||
const char *suffix = nullptr, gvar_t offset = 0, bool usePPMUnit = false);
|
const char *suffix = nullptr, gvar_t offset = 0, bool usePPMUnit = false);
|
||||||
|
char *getValueOrSrcVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
|
||||||
|
gvar_t vmax, LcdFlags flags = 0,
|
||||||
|
const char *suffix = nullptr, gvar_t offset = 0, bool usePPMUnit = false);
|
||||||
const char *getSwitchWarnSymbol(uint8_t pos);
|
const char *getSwitchWarnSymbol(uint8_t pos);
|
||||||
const char *getSwitchPositionSymbol(uint8_t pos);
|
const char *getSwitchPositionSymbol(uint8_t pos);
|
||||||
char *getSwitchPositionName(char *dest, swsrc_t idx);
|
char *getSwitchPositionName(char *dest, swsrc_t idx);
|
||||||
|
|||||||
@@ -134,7 +134,9 @@ TEST(Lua, testModelInputs)
|
|||||||
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
|
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
|
||||||
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
|
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
|
||||||
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
|
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
|
||||||
EXPECT_EQ(-56, g_model.expoData[0].weight);
|
SourceNumVal v;
|
||||||
|
v.rawValue = g_model.expoData[0].weight;
|
||||||
|
EXPECT_EQ(-56, v.value);
|
||||||
EXPECT_EQ(0, g_model.expoData[0].offset);
|
EXPECT_EQ(0, g_model.expoData[0].offset);
|
||||||
EXPECT_EQ(0, g_model.expoData[0].swtch);
|
EXPECT_EQ(0, g_model.expoData[0].swtch);
|
||||||
|
|
||||||
@@ -155,7 +157,8 @@ TEST(Lua, testModelInputs)
|
|||||||
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
|
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
|
||||||
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
|
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
|
||||||
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
|
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
|
||||||
EXPECT_EQ(-56, g_model.expoData[0].weight);
|
v.rawValue = g_model.expoData[0].weight;
|
||||||
|
EXPECT_EQ(-56, v.value);
|
||||||
EXPECT_EQ(0, g_model.expoData[0].offset);
|
EXPECT_EQ(0, g_model.expoData[0].offset);
|
||||||
EXPECT_EQ(0, g_model.expoData[0].swtch);
|
EXPECT_EQ(0, g_model.expoData[0].swtch);
|
||||||
|
|
||||||
|
|||||||
+34
-34
@@ -279,7 +279,7 @@ TEST_F(TrimsTest, throttleTrimWithZeroWeightOnThrottle)
|
|||||||
g_model.thrTrim = 1;
|
g_model.thrTrim = 1;
|
||||||
// the input already exists
|
// the input already exists
|
||||||
ExpoData *expo = expoAddress(THR_STICK);
|
ExpoData *expo = expoAddress(THR_STICK);
|
||||||
expo->weight = 0;
|
expo->weight = makeSourceNumVal(0);
|
||||||
// stick max + trim max
|
// stick max + trim max
|
||||||
anaSetFiltered(THR_STICK, +1024);
|
anaSetFiltered(THR_STICK, +1024);
|
||||||
setTrimValue(0, THR_STICK, TRIM_MAX);
|
setTrimValue(0, THR_STICK, TRIM_MAX);
|
||||||
@@ -350,7 +350,7 @@ TEST_F(TrimsTest, invertedThrottlePlusthrottleTrimWithZeroWeightOnThrottle)
|
|||||||
g_model.thrTrim = 1;
|
g_model.thrTrim = 1;
|
||||||
// the input already exists
|
// the input already exists
|
||||||
ExpoData *expo = expoAddress(THR_STICK);
|
ExpoData *expo = expoAddress(THR_STICK);
|
||||||
expo->weight = 0;
|
expo->weight = makeSourceNumVal(0);
|
||||||
// stick max + trim max
|
// stick max + trim max
|
||||||
anaSetFiltered(THR_STICK, +1024);
|
anaSetFiltered(THR_STICK, +1024);
|
||||||
setTrimValue(0, THR_STICK, TRIM_MAX);
|
setTrimValue(0, THR_STICK, TRIM_MAX);
|
||||||
@@ -579,7 +579,7 @@ TEST_F(TrimsTest, InstantTrimNegativeCurve)
|
|||||||
{
|
{
|
||||||
ExpoData *expo = expoAddress(AIL_STICK);
|
ExpoData *expo = expoAddress(AIL_STICK);
|
||||||
expo->curve.type = CURVE_REF_CUSTOM;
|
expo->curve.type = CURVE_REF_CUSTOM;
|
||||||
expo->curve.value = 1;
|
expo->curve.value = makeSourceNumVal(1);
|
||||||
g_model.points[0] = -100;
|
g_model.points[0] = -100;
|
||||||
g_model.points[1] = -75;
|
g_model.points[1] = -75;
|
||||||
g_model.points[2] = -50;
|
g_model.points[2] = -50;
|
||||||
@@ -616,13 +616,13 @@ TEST_F(MixerTest, InfiniteRecursiveChannels)
|
|||||||
{
|
{
|
||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH + 1;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH + 1;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 1;
|
g_model.mixData[1].destCh = 1;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_FIRST_CH + 2;
|
g_model.mixData[1].srcRaw = MIXSRC_FIRST_CH + 2;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[2].destCh = 2;
|
g_model.mixData[2].destCh = 2;
|
||||||
g_model.mixData[2].srcRaw = MIXSRC_FIRST_CH;
|
g_model.mixData[2].srcRaw = MIXSRC_FIRST_CH;
|
||||||
g_model.mixData[2].weight = 100;
|
g_model.mixData[2].weight = makeSourceNumVal(100);
|
||||||
evalFlightModeMixes(e_perout_mode_normal, 0);
|
evalFlightModeMixes(e_perout_mode_normal, 0);
|
||||||
EXPECT_EQ(chans[2], 0);
|
EXPECT_EQ(chans[2], 0);
|
||||||
EXPECT_EQ(chans[1], 0);
|
EXPECT_EQ(chans[1], 0);
|
||||||
@@ -633,7 +633,7 @@ TEST_F(MixerTest, BlockingChannel)
|
|||||||
{
|
{
|
||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
evalFlightModeMixes(e_perout_mode_normal, 0);
|
evalFlightModeMixes(e_perout_mode_normal, 0);
|
||||||
EXPECT_EQ(chans[0], 0);
|
EXPECT_EQ(chans[0], 0);
|
||||||
}
|
}
|
||||||
@@ -643,14 +643,14 @@ TEST_F(MixerTest, RecursiveAddChannel)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 50;
|
g_model.mixData[0].weight = makeSourceNumVal(50);
|
||||||
g_model.mixData[1].destCh = 0;
|
g_model.mixData[1].destCh = 0;
|
||||||
g_model.mixData[1].mltpx = MLTPX_ADD;
|
g_model.mixData[1].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_FIRST_CH + 1;
|
g_model.mixData[1].srcRaw = MIXSRC_FIRST_CH + 1;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[2].destCh = 1;
|
g_model.mixData[2].destCh = 1;
|
||||||
g_model.mixData[2].srcRaw = MIXSRC_FIRST_STICK;
|
g_model.mixData[2].srcRaw = MIXSRC_FIRST_STICK;
|
||||||
g_model.mixData[2].weight = 100;
|
g_model.mixData[2].weight = makeSourceNumVal(100);
|
||||||
|
|
||||||
anaSetFiltered(0, 0);
|
anaSetFiltered(0, 0);
|
||||||
evalFlightModeMixes(e_perout_mode_normal, 0);
|
evalFlightModeMixes(e_perout_mode_normal, 0);
|
||||||
@@ -665,15 +665,15 @@ TEST_F(MixerTest, RecursiveAddChannelAfterInactivePhase)
|
|||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH + 1;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_CH + 1;
|
||||||
g_model.mixData[0].flightModes = 0b11110;
|
g_model.mixData[0].flightModes = 0b11110;
|
||||||
g_model.mixData[0].weight = 50;
|
g_model.mixData[0].weight = makeSourceNumVal(50);
|
||||||
g_model.mixData[1].destCh = 0;
|
g_model.mixData[1].destCh = 0;
|
||||||
g_model.mixData[1].mltpx = MLTPX_ADD;
|
g_model.mixData[1].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[1].flightModes = 0b11101;
|
g_model.mixData[1].flightModes = 0b11101;
|
||||||
g_model.mixData[1].weight = 50;
|
g_model.mixData[1].weight = makeSourceNumVal(50);
|
||||||
g_model.mixData[2].destCh = 1;
|
g_model.mixData[2].destCh = 1;
|
||||||
g_model.mixData[2].srcRaw = MIXSRC_MAX;
|
g_model.mixData[2].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[2].weight = 100;
|
g_model.mixData[2].weight = makeSourceNumVal(100);
|
||||||
simuSetSwitch(3, -1);
|
simuSetSwitch(3, -1);
|
||||||
evalMixes(1);
|
evalMixes(1);
|
||||||
EXPECT_EQ(chans[0], CHANNEL_MAX/2);
|
EXPECT_EQ(chans[0], CHANNEL_MAX/2);
|
||||||
@@ -691,7 +691,7 @@ TEST_F(MixerTest, SlowOnPhase)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
|
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
|
||||||
g_model.mixData[0].speedUp = 50;
|
g_model.mixData[0].speedUp = 50;
|
||||||
g_model.mixData[0].speedDown = 50;
|
g_model.mixData[0].speedDown = 50;
|
||||||
@@ -714,7 +714,7 @@ TEST_F(MixerTest, SlowOnSwitchSource)
|
|||||||
g_eeGeneral.switchConfig = 0x03;
|
g_eeGeneral.switchConfig = 0x03;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
||||||
int switchIndex = 0;
|
int switchIndex = 0;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].speedUp = 50;
|
g_model.mixData[0].speedUp = 50;
|
||||||
g_model.mixData[0].speedDown = 50;
|
g_model.mixData[0].speedDown = 50;
|
||||||
|
|
||||||
@@ -734,7 +734,7 @@ TEST_F(MixerTest, SlowOnPhasePrec10ms)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
|
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
|
||||||
g_model.mixData[0].speedUp = 50;
|
g_model.mixData[0].speedUp = 50;
|
||||||
g_model.mixData[0].speedDown = 50;
|
g_model.mixData[0].speedDown = 50;
|
||||||
@@ -758,7 +758,7 @@ TEST_F(MixerTest, SlowOnSwitchSourcePrec10ms)
|
|||||||
g_eeGeneral.switchConfig = 0x03;
|
g_eeGeneral.switchConfig = 0x03;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
||||||
int switchIndex = 0;
|
int switchIndex = 0;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].speedUp = 50;
|
g_model.mixData[0].speedUp = 50;
|
||||||
g_model.mixData[0].speedDown = 50;
|
g_model.mixData[0].speedDown = 50;
|
||||||
g_model.mixData[0].speedPrec = 1;
|
g_model.mixData[0].speedPrec = 1;
|
||||||
@@ -778,7 +778,7 @@ TEST_F(MixerTest, SlowDisabledOnStartup)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].speedUp = 50;
|
g_model.mixData[0].speedUp = 50;
|
||||||
g_model.mixData[0].speedDown = 50;
|
g_model.mixData[0].speedDown = 50;
|
||||||
|
|
||||||
@@ -791,7 +791,7 @@ TEST_F(MixerTest, DelayOnSwitch)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].swtch = SWSRC_FIRST_SWITCH + 2;
|
g_model.mixData[0].swtch = SWSRC_FIRST_SWITCH + 2;
|
||||||
g_model.mixData[0].delayUp = 50;
|
g_model.mixData[0].delayUp = 50;
|
||||||
g_model.mixData[0].delayDown = 50;
|
g_model.mixData[0].delayDown = 50;
|
||||||
@@ -822,7 +822,7 @@ TEST_F(MixerTest, DelayOnSwitch2)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_SWITCH;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
// g_model.mixData[0].swtch = SWSRC_ON;
|
// g_model.mixData[0].swtch = SWSRC_ON;
|
||||||
g_model.mixData[0].delayUp = 50;
|
g_model.mixData[0].delayUp = 50;
|
||||||
g_model.mixData[0].delayDown = 50;
|
g_model.mixData[0].delayDown = 50;
|
||||||
@@ -851,11 +851,11 @@ TEST_F(MixerTest, SlowOnMultiply)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 0;
|
g_model.mixData[1].destCh = 0;
|
||||||
g_model.mixData[1].mltpx = MLTPX_MUL;
|
g_model.mixData[1].mltpx = MLTPX_MUL;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].swtch = SWSRC_FIRST_SWITCH;
|
g_model.mixData[1].swtch = SWSRC_FIRST_SWITCH;
|
||||||
g_model.mixData[1].speedUp = 50;
|
g_model.mixData[1].speedUp = 50;
|
||||||
g_model.mixData[1].speedDown = 50;
|
g_model.mixData[1].speedDown = 50;
|
||||||
@@ -877,11 +877,11 @@ TEST_F(MixerTest, SlowOnMultiplyPrec10ms)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 0;
|
g_model.mixData[1].destCh = 0;
|
||||||
g_model.mixData[1].mltpx = MLTPX_MUL;
|
g_model.mixData[1].mltpx = MLTPX_MUL;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].swtch = SWSRC_FIRST_SWITCH;
|
g_model.mixData[1].swtch = SWSRC_FIRST_SWITCH;
|
||||||
g_model.mixData[1].speedUp = 50;
|
g_model.mixData[1].speedUp = 50;
|
||||||
g_model.mixData[1].speedDown = 50;
|
g_model.mixData[1].speedDown = 50;
|
||||||
@@ -938,15 +938,15 @@ TEST(Heli, BasicTest)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_CYC1;
|
g_model.mixData[0].srcRaw = MIXSRC_CYC1;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 1;
|
g_model.mixData[1].destCh = 1;
|
||||||
g_model.mixData[1].mltpx = MLTPX_ADD;
|
g_model.mixData[1].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_CYC2;
|
g_model.mixData[1].srcRaw = MIXSRC_CYC2;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[2].destCh = 2;
|
g_model.mixData[2].destCh = 2;
|
||||||
g_model.mixData[2].mltpx = MLTPX_ADD;
|
g_model.mixData[2].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[2].srcRaw = MIXSRC_CYC3;
|
g_model.mixData[2].srcRaw = MIXSRC_CYC3;
|
||||||
g_model.mixData[2].weight = 100;
|
g_model.mixData[2].weight = makeSourceNumVal(100);
|
||||||
anaSetFiltered(THR_STICK, 0);
|
anaSetFiltered(THR_STICK, 0);
|
||||||
anaSetFiltered(ELE_STICK, 1024);
|
anaSetFiltered(ELE_STICK, 1024);
|
||||||
anaSetFiltered(AIL_STICK, 0);
|
anaSetFiltered(AIL_STICK, 0);
|
||||||
@@ -974,15 +974,15 @@ TEST(Heli, Mode2Test)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_CYC1;
|
g_model.mixData[0].srcRaw = MIXSRC_CYC1;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 1;
|
g_model.mixData[1].destCh = 1;
|
||||||
g_model.mixData[1].mltpx = MLTPX_ADD;
|
g_model.mixData[1].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_CYC2;
|
g_model.mixData[1].srcRaw = MIXSRC_CYC2;
|
||||||
g_model.mixData[1].weight = 100;
|
g_model.mixData[1].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[2].destCh = 2;
|
g_model.mixData[2].destCh = 2;
|
||||||
g_model.mixData[2].mltpx = MLTPX_ADD;
|
g_model.mixData[2].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[2].srcRaw = MIXSRC_CYC3;
|
g_model.mixData[2].srcRaw = MIXSRC_CYC3;
|
||||||
g_model.mixData[2].weight = 100;
|
g_model.mixData[2].weight = makeSourceNumVal(100);
|
||||||
anaSetFiltered(THR_STICK, 0);
|
anaSetFiltered(THR_STICK, 0);
|
||||||
anaSetFiltered(ELE_STICK, 1024);
|
anaSetFiltered(ELE_STICK, 1024);
|
||||||
anaSetFiltered(AIL_STICK, 0);
|
anaSetFiltered(AIL_STICK, 0);
|
||||||
@@ -1003,7 +1003,7 @@ TEST(Trainer, UnpluggedTest)
|
|||||||
g_model.mixData[0].destCh = 0;
|
g_model.mixData[0].destCh = 0;
|
||||||
g_model.mixData[0].mltpx = MLTPX_ADD;
|
g_model.mixData[0].mltpx = MLTPX_ADD;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
|
g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[0].delayUp = 50;
|
g_model.mixData[0].delayUp = 50;
|
||||||
g_model.mixData[0].delayDown = 50;
|
g_model.mixData[0].delayDown = 50;
|
||||||
trainerSetTimer(0);
|
trainerSetTimer(0);
|
||||||
@@ -1026,12 +1026,12 @@ TEST_F(MixerTest, flightModeTransition)
|
|||||||
g_model.mixData[0].mltpx = MLTPX_REPL;
|
g_model.mixData[0].mltpx = MLTPX_REPL;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].flightModes = 0b11110;
|
g_model.mixData[0].flightModes = 0b11110;
|
||||||
g_model.mixData[0].weight = 100;
|
g_model.mixData[0].weight = makeSourceNumVal(100);
|
||||||
g_model.mixData[1].destCh = 0;
|
g_model.mixData[1].destCh = 0;
|
||||||
g_model.mixData[1].mltpx = MLTPX_REPL;
|
g_model.mixData[1].mltpx = MLTPX_REPL;
|
||||||
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
g_model.mixData[1].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[1].flightModes = 0b11101;
|
g_model.mixData[1].flightModes = 0b11101;
|
||||||
g_model.mixData[1].weight = -10;
|
g_model.mixData[1].weight = makeSourceNumVal(-10);
|
||||||
evalMixes(1);
|
evalMixes(1);
|
||||||
simuSetSwitch(0, 1);
|
simuSetSwitch(0, 1);
|
||||||
CHECK_FLIGHT_MODE_TRANSITION(0, 1000, 1024, -102);
|
CHECK_FLIGHT_MODE_TRANSITION(0, 1000, 1024, -102);
|
||||||
@@ -1050,7 +1050,7 @@ TEST_F(MixerTest, flightModeOverflow)
|
|||||||
g_model.mixData[0].mltpx = MLTPX_REPL;
|
g_model.mixData[0].mltpx = MLTPX_REPL;
|
||||||
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
g_model.mixData[0].srcRaw = MIXSRC_MAX;
|
||||||
g_model.mixData[0].flightModes = 0;
|
g_model.mixData[0].flightModes = 0;
|
||||||
g_model.mixData[0].weight = 250;
|
g_model.mixData[0].weight = makeSourceNumVal(250);
|
||||||
evalMixes(1);
|
evalMixes(1);
|
||||||
simuSetSwitch(0, 1);
|
simuSetSwitch(0, 1);
|
||||||
CHECK_FLIGHT_MODE_TRANSITION(0, 1000, 1024, 1024);
|
CHECK_FLIGHT_MODE_TRANSITION(0, 1000, 1024, 1024);
|
||||||
|
|||||||
+2
-1
@@ -153,7 +153,8 @@ void Choice::setValue(int val)
|
|||||||
|
|
||||||
void Choice::onClicked()
|
void Choice::onClicked()
|
||||||
{
|
{
|
||||||
openMenu();
|
if (!deleted())
|
||||||
|
openMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Choice::fillMenu(Menu* menu, const FilterFct& filter)
|
void Choice::fillMenu(Menu* menu, const FilterFct& filter)
|
||||||
|
|||||||
Reference in New Issue
Block a user