fix: enforce customisable switch rules when configuring (#4994)
This commit is contained in:
@@ -80,7 +80,15 @@ enum MenuModelSetupItems {
|
||||
ITEM_MODEL_SETUP_SW4,
|
||||
ITEM_MODEL_SETUP_SW5,
|
||||
ITEM_MODEL_SETUP_SW6,
|
||||
ITEM_MODEL_SETUP_FS_STARTUP,
|
||||
ITEM_MODEL_SETUP_GROUP1_LABEL,
|
||||
ITEM_MODEL_SETUP_GROUP1_ALWAYS_ON,
|
||||
ITEM_MODEL_SETUP_GROUP1_START,
|
||||
ITEM_MODEL_SETUP_GROUP2_LABEL,
|
||||
ITEM_MODEL_SETUP_GROUP2_ALWAYS_ON,
|
||||
ITEM_MODEL_SETUP_GROUP2_START,
|
||||
ITEM_MODEL_SETUP_GROUP3_LABEL,
|
||||
ITEM_MODEL_SETUP_GROUP3_ALWAYS_ON,
|
||||
ITEM_MODEL_SETUP_GROUP3_START,
|
||||
#endif
|
||||
ITEM_MODEL_SETUP_EXTENDED_LIMITS,
|
||||
ITEM_MODEL_SETUP_EXTENDED_TRIMS,
|
||||
@@ -248,6 +256,7 @@ uint8_t THROTTLE_ROW(uint8_t value)
|
||||
return HIDDEN_ROW;
|
||||
}
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
uint8_t FS_ROW(uint8_t value)
|
||||
{
|
||||
if (expandState.functionSwitches)
|
||||
@@ -255,6 +264,11 @@ uint8_t FS_ROW(uint8_t value)
|
||||
return HIDDEN_ROW;
|
||||
}
|
||||
|
||||
uint8_t G1_ROW(int8_t value) { return (firstSwitchInGroup(1) >= 0) ? value : HIDDEN_ROW; }
|
||||
uint8_t G2_ROW(int8_t value) { return (firstSwitchInGroup(2) >= 0) ? value : HIDDEN_ROW; }
|
||||
uint8_t G3_ROW(int8_t value) { return (firstSwitchInGroup(3) >= 0) ? value : HIDDEN_ROW; }
|
||||
#endif
|
||||
|
||||
uint8_t VIEWOPT_ROW(uint8_t value)
|
||||
{
|
||||
if (expandState.viewOpt)
|
||||
@@ -356,7 +370,15 @@ inline uint8_t TIMER_ROW(uint8_t timer, uint8_t value)
|
||||
FS_ROW(NAVIGATION_LINE_BY_LINE|3), \
|
||||
FS_ROW(NAVIGATION_LINE_BY_LINE|3), \
|
||||
FS_ROW(NAVIGATION_LINE_BY_LINE|3), \
|
||||
FS_ROW(NAVIGATION_LINE_BY_LINE|(NUM_FUNCTIONS_SWITCHES-1)),
|
||||
FS_ROW(G1_ROW(LABEL())), \
|
||||
FS_ROW(G1_ROW(0)), \
|
||||
FS_ROW(G1_ROW(0)), \
|
||||
FS_ROW(G2_ROW(LABEL())), \
|
||||
FS_ROW(G2_ROW(0)), \
|
||||
FS_ROW(G2_ROW(0)), \
|
||||
FS_ROW(G3_ROW(LABEL())), \
|
||||
FS_ROW(G3_ROW(0)), \
|
||||
FS_ROW(G3_ROW(0)),
|
||||
#else
|
||||
#define FUNCTION_SWITCHES_ROWS
|
||||
#endif
|
||||
@@ -544,7 +566,7 @@ inline uint8_t USB_JOYSTICK_APPLYROW()
|
||||
#endif
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
static const char* _fct_sw_start[] = { STR_CHAR_UP, STR_CHAR_DOWN, "=" };
|
||||
static const char* _fct_sw_start[] = { STR_CHAR_DOWN, STR_CHAR_UP, "=" };
|
||||
#endif
|
||||
|
||||
uint8_t viewOptChoice(coord_t y, const char* title, uint8_t value, uint8_t attr, event_t event)
|
||||
@@ -553,6 +575,31 @@ uint8_t viewOptChoice(coord_t y, const char* title, uint8_t value, uint8_t attr,
|
||||
return editChoice(96, y, nullptr, STR_ADCFILTERVALUES, value, 0, 2, attr, event);
|
||||
}
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
int cfsIndex;
|
||||
uint8_t cfsGroup;
|
||||
|
||||
bool checkCFSTypeAvailable(int val)
|
||||
{
|
||||
int group = FSWITCH_GROUP(cfsIndex);
|
||||
if (group > 0 && IS_FSWITCH_GROUP_ON(group) && val == SWITCH_TOGGLE)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool checkCFSGroupAvailable(int group)
|
||||
{
|
||||
if (FSWITCH_CONFIG(cfsIndex) == SWITCH_TOGGLE && group && IS_FSWITCH_GROUP_ON(group))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool checkCFSSwitchAvailable(int sw)
|
||||
{
|
||||
return (sw == 0) || (sw == NUM_FUNCTIONS_SWITCHES + 1) || (FSWITCH_GROUP(sw - 1) == cfsGroup);
|
||||
}
|
||||
#endif
|
||||
|
||||
void menuModelSetup(event_t event)
|
||||
{
|
||||
int8_t old_editMode = s_editMode;
|
||||
@@ -781,8 +828,8 @@ void menuModelSetup(event_t event)
|
||||
timer->persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, timer->persistent, 0, 2, attr, event, INDENT_WIDTH);
|
||||
break;
|
||||
}
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
case ITEM_MODEL_SETUP_LABEL:
|
||||
expandState.functionSwitches = expandableSection(y, STR_FUNCTION_SWITCHES, expandState.functionSwitches, attr, event);
|
||||
break;
|
||||
@@ -795,61 +842,107 @@ void menuModelSetup(event_t event)
|
||||
case ITEM_MODEL_SETUP_SW6:
|
||||
{
|
||||
int index = k - ITEM_MODEL_SETUP_SW1;
|
||||
int config = FSWITCH_CONFIG(index);
|
||||
lcdDrawSizedText(INDENT_WIDTH, y, STR_CHAR_SWITCH, 2, menuHorizontalPosition < 0 ? attr : 0);
|
||||
lcdDrawText(lcdNextPos, y, switchGetName(index+switchGetMaxSwitches()), menuHorizontalPosition < 0 ? attr : 0);
|
||||
|
||||
if (ZEXIST(g_model.switchNames[index]) || (attr && s_editMode > 0 && menuHorizontalPosition == 0))
|
||||
editName(35, y, g_model.switchNames[index], LEN_SWITCH_NAME, event, menuHorizontalPosition == 0 ? attr : 0, 0, old_editMode);
|
||||
else
|
||||
lcdDrawMMM(35, y, menuHorizontalPosition == 0 ? attr : 0);
|
||||
config = editChoice(30 + 5*FW, y, "", STR_SWTYPES, config, SWITCH_NONE, SWITCH_2POS, menuHorizontalPosition == 1 ? attr : 0, event);
|
||||
if (attr && checkIncDec_Ret) {
|
||||
swconfig_t mask = (swconfig_t)0x03 << (2*index);
|
||||
g_model.functionSwitchConfig = (g_model.functionSwitchConfig & ~mask) | ((swconfig_t(config) & 0x03) << (2*index));
|
||||
}
|
||||
|
||||
config = FSWITCH_GROUP(index);
|
||||
config = editChoice(30 + 13 * FW, y, "", STR_FSGROUPS, config, 0, 3, menuHorizontalPosition == 2 ? attr : 0, event);
|
||||
if (attr && checkIncDec_Ret && menuHorizontalPosition == 2) {
|
||||
swconfig_t mask = (swconfig_t) 0x03 << (2 * index);
|
||||
g_model.functionSwitchGroup = (g_model.functionSwitchGroup & ~mask) | ((swconfig_t(config) & 0x03) << (2 * index));
|
||||
}
|
||||
|
||||
if (FSWITCH_GROUP(index)) {
|
||||
uint8_t groupeAlwaysOn = IS_FSWITCH_GROUP_ON(config);
|
||||
groupeAlwaysOn = editCheckBox(groupeAlwaysOn, 30 + 15 * FW, y, "", menuHorizontalPosition == 3 ? attr : 0, event);
|
||||
if (attr && checkIncDec_Ret && menuHorizontalPosition == 3) {
|
||||
swconfig_t mask = (swconfig_t) 0x01 << (2 * NUM_FUNCTIONS_SWITCHES + config);
|
||||
g_model.functionSwitchGroup = (g_model.functionSwitchGroup & ~mask) | (groupeAlwaysOn << (2 * NUM_FUNCTIONS_SWITCHES + config));
|
||||
cfsIndex = index;
|
||||
int config = FSWITCH_CONFIG(index);
|
||||
config = editChoice(30 + 5*FW, y, "", STR_SWTYPES, config, SWITCH_NONE, SWITCH_2POS, menuHorizontalPosition == 1 ? attr : 0, event, 0, checkCFSTypeAvailable);
|
||||
if (attr && checkIncDec_Ret && menuHorizontalPosition == 1) {
|
||||
FSWITCH_SET_CONFIG(index, config);
|
||||
if (config == SWITCH_TOGGLE) {
|
||||
FSWITCH_SET_STARTUP(index, FS_START_PREVIOUS); // Toggle switches do not have startup position
|
||||
}
|
||||
}
|
||||
else if (attr && menuHorizontalPosition == 3) { // Non visible checkbox
|
||||
|
||||
if (config != SWITCH_NONE) {
|
||||
uint8_t group = FSWITCH_GROUP(index);
|
||||
group = editChoice(30 + 13 * FW, y, "", STR_FSGROUPS, group, 0, 3, menuHorizontalPosition == 2 ? attr : 0, event, 0, checkCFSGroupAvailable);
|
||||
if (attr && checkIncDec_Ret && menuHorizontalPosition == 2) {
|
||||
int oldGroup = FSWITCH_GROUP(index);
|
||||
if (groupHasSwitchOn(group))
|
||||
setFSLogicalState(index, 0);
|
||||
FSWITCH_SET_GROUP(index, group);
|
||||
if (group > 0) {
|
||||
FSWITCH_SET_STARTUP(index, groupDefaultSwitch(group) == -1 ? FS_START_PREVIOUS : FS_START_OFF);
|
||||
if (config == SWITCH_TOGGLE && IS_FSWITCH_GROUP_ON(group))
|
||||
FSWITCH_SET_CONFIG(index, SWITCH_2POS);
|
||||
setGroupSwitchState(group, index);
|
||||
} else {
|
||||
FSWITCH_SET_STARTUP(index, FS_START_PREVIOUS);
|
||||
}
|
||||
setGroupSwitchState(oldGroup);
|
||||
}
|
||||
|
||||
if (config != SWITCH_TOGGLE && group == 0) {
|
||||
int startPos = FSWITCH_STARTUP(index);
|
||||
lcdDrawText(30 + 15 * FW, y, _fct_sw_start[startPos], attr && (menuHorizontalPosition == 3) ? (s_editMode ? INVERS + BLINK : INVERS) : 0);
|
||||
if (attr && menuHorizontalPosition == 3) {
|
||||
startPos = checkIncDec(event, startPos, FS_START_ON, FS_START_PREVIOUS, EE_MODEL);
|
||||
FSWITCH_SET_STARTUP(index, startPos);
|
||||
}
|
||||
} else if (attr && menuHorizontalPosition == 3) {
|
||||
repeatLastCursorMove(event);
|
||||
}
|
||||
} else if (attr && menuHorizontalPosition >= 2) {
|
||||
repeatLastCursorMove(event);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case ITEM_MODEL_SETUP_FS_STARTUP:
|
||||
{
|
||||
const char* s;
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_START, menuHorizontalPosition < 0 ? attr : 0);
|
||||
for (uint8_t i = 0; i < NUM_FUNCTIONS_SWITCHES; i++) {
|
||||
uint8_t startPos = (g_model.functionSwitchStartConfig >> 2 * i) & 0x03;
|
||||
s = _fct_sw_start[(g_model.functionSwitchStartConfig >> 2 * i) & 0x03];
|
||||
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN - (2 + FW) + i * 2 * FW, y, i + 1, 0);
|
||||
lcdDrawText(lcdNextPos, y, s, attr && (menuHorizontalPosition == i) ? (s_editMode ? INVERS + BLINK : INVERS) : 0);
|
||||
if (attr && menuHorizontalPosition == i) {
|
||||
CHECK_INCDEC_MODELVAR(event, startPos, 0, 2);
|
||||
}
|
||||
case ITEM_MODEL_SETUP_GROUP1_LABEL:
|
||||
case ITEM_MODEL_SETUP_GROUP2_LABEL:
|
||||
case ITEM_MODEL_SETUP_GROUP3_LABEL:
|
||||
{
|
||||
int group = (k - ITEM_MODEL_SETUP_GROUP1_LABEL) / 3 + 1;
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_GROUP);
|
||||
lcdDrawNumber(lcdNextPos, y, group, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_GROUP1_ALWAYS_ON:
|
||||
case ITEM_MODEL_SETUP_GROUP2_ALWAYS_ON:
|
||||
case ITEM_MODEL_SETUP_GROUP3_ALWAYS_ON:
|
||||
{
|
||||
uint8_t group = (k - ITEM_MODEL_SETUP_GROUP1_ALWAYS_ON) / 3 + 1;
|
||||
lcdDrawText(INDENT_WIDTH * 2, y, STR_GROUP_ALWAYS_ON);
|
||||
int groupAlwaysOn = IS_FSWITCH_GROUP_ON(group);
|
||||
groupAlwaysOn = editCheckBox(groupAlwaysOn, MODEL_SETUP_2ND_COLUMN, y, nullptr, attr, event);
|
||||
if (attr && checkIncDec_Ret) {
|
||||
swconfig_t mask = (swconfig_t)0x03 << (2*i);
|
||||
g_model.functionSwitchStartConfig = (g_model.functionSwitchStartConfig & ~mask) | ((swconfig_t(startPos) & 0x03) << (2*i));
|
||||
storageDirty(EE_MODEL);
|
||||
SET_FSWITCH_GROUP_ON(group, groupAlwaysOn);
|
||||
setGroupSwitchState(group);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_GROUP1_START:
|
||||
case ITEM_MODEL_SETUP_GROUP2_START:
|
||||
case ITEM_MODEL_SETUP_GROUP3_START:
|
||||
{
|
||||
uint8_t group = (k - ITEM_MODEL_SETUP_GROUP1_START) / 3 + 1;
|
||||
lcdDrawText(INDENT_WIDTH * 2, y, STR_START);
|
||||
int sw = groupDefaultSwitch(group) + 1;
|
||||
cfsGroup = group;
|
||||
sw = editChoice(MODEL_SETUP_2ND_COLUMN + 1, y, nullptr, STR_FSSWITCHES, sw, 0, IS_FSWITCH_GROUP_ON(group) ? NUM_FUNCTIONS_SWITCHES : NUM_FUNCTIONS_SWITCHES + 1, attr, event, 0, checkCFSSwitchAvailable);
|
||||
if (attr && checkIncDec_Ret) {
|
||||
for (int i = 0; i < NUM_FUNCTIONS_SWITCHES; i += 1) {
|
||||
if (FSWITCH_GROUP(i) == group) {
|
||||
FSWITCH_SET_STARTUP(i, sw ? FS_START_OFF : FS_START_PREVIOUS);
|
||||
}
|
||||
}
|
||||
if (sw > 0 && sw <= NUM_FUNCTIONS_SWITCHES) {
|
||||
FSWITCH_SET_STARTUP(sw - 1, FS_START_ON);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
case ITEM_MODEL_SETUP_EXTENDED_LIMITS:
|
||||
g_model.extendedLimits = editCheckBox(g_model.extendedLimits, MODEL_SETUP_2ND_COLUMN, y, STR_ELIMITS, attr, event);
|
||||
break;
|
||||
|
||||
@@ -63,12 +63,12 @@ void menuRadioDiagFS(event_t event)
|
||||
lcdDrawText(FS_3RD_COLUMN, MENU_HEADER_HEIGHT + 1, "Led");
|
||||
|
||||
for(uint8_t i=0; i < NUM_FUNCTIONS_SWITCHES; i++) {
|
||||
coord_t y = 2*FH + i*FH;
|
||||
coord_t y = 2*FH + i*FH + 1;
|
||||
lcdDrawTextIndented(y, STR_CHAR_SWITCH);
|
||||
lcdDrawText(lcdNextPos, y, switchGetName(i+switchGetMaxSwitches()), 0);
|
||||
lcdDrawNumber(FS_1ST_COLUMN + 2, y, getFSPhysicalState(i));
|
||||
lcdDrawNumber(FS_2ND_COLUMN + 5, y, getFSLogicalState(i));
|
||||
lcdDrawNumber(FS_3RD_COLUMN + 5, y, getFSLedState(i));
|
||||
lcdDrawText(FS_1ST_COLUMN + 7, y, getFSPhysicalState(i) ? STR_CHAR_DOWN : STR_CHAR_UP);
|
||||
lcdDrawText(FS_2ND_COLUMN + 5, y, getFSLogicalState(i) ? STR_CHAR_DOWN : STR_CHAR_UP);
|
||||
lcdDrawText(FS_3RD_COLUMN, y, STR_OFFON[getFSLedState(i)]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -95,8 +95,13 @@
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
#define FSW_CFG_BITS 2
|
||||
#define FSWITCH_CONFIG(x) (bfGet<swconfig_t>(g_model.functionSwitchConfig, FSW_CFG_BITS * (x), FSW_CFG_BITS))
|
||||
#define FSWITCH_GROUP(x) (bfGet<swconfig_t>(g_model.functionSwitchGroup, FSW_CFG_BITS * (x), FSW_CFG_BITS))
|
||||
#define IS_FSWITCH_GROUP_ON(x) (bfGet<swconfig_t>(g_model.functionSwitchGroup, FSW_CFG_BITS * NUM_FUNCTIONS_SWITCHES + x, 1))
|
||||
#define FSWITCH_SET_CONFIG(x,v) g_model.functionSwitchConfig = bfSet<swconfig_t>(g_model.functionSwitchConfig, v, FSW_CFG_BITS * (x), FSW_CFG_BITS)
|
||||
#define FSWITCH_GROUP(x) (bfGet<swconfig_t>(g_model.functionSwitchGroup, FSW_CFG_BITS * (x), FSW_CFG_BITS))
|
||||
#define FSWITCH_SET_GROUP(x,v) g_model.functionSwitchGroup = bfSet<swconfig_t>(g_model.functionSwitchGroup, v, FSW_CFG_BITS * (x), FSW_CFG_BITS)
|
||||
#define FSWITCH_STARTUP(x) (bfGet<swconfig_t>(g_model.functionSwitchStartConfig, FSW_CFG_BITS * (x), FSW_CFG_BITS))
|
||||
#define FSWITCH_SET_STARTUP(x,v) g_model.functionSwitchStartConfig = bfSet<swconfig_t>(g_model.functionSwitchStartConfig, v, FSW_CFG_BITS * (x), FSW_CFG_BITS)
|
||||
#define IS_FSWITCH_GROUP_ON(x) (bfGet<swconfig_t>(g_model.functionSwitchGroup, FSW_CFG_BITS * NUM_FUNCTIONS_SWITCHES + x, 1))
|
||||
#define SET_FSWITCH_GROUP_ON(x,v) g_model.functionSwitchGroup = bfSet<swconfig_t>(g_model.functionSwitchGroup, v, FSW_CFG_BITS * NUM_FUNCTIONS_SWITCHES + x, 1)
|
||||
#define IS_SWITCH_FS(x) (x >= switchGetMaxSwitches() && x < (switchGetMaxSwitches() + switchGetMaxFctSwitches()))
|
||||
#define SWITCH_EXISTS(x) (IS_SWITCH_FS(x) ? true : (SWITCH_CONFIG(x) != SWITCH_NONE))
|
||||
#define IS_CONFIG_3POS(x) (IS_SWITCH_FS(x) ? (FSWITCH_CONFIG(x - switchGetMaxSwitches()) == SWITCH_3POS) : (SWITCH_CONFIG(x) == SWITCH_3POS))
|
||||
|
||||
@@ -40,8 +40,8 @@ enum FlexAnalogConfig {
|
||||
};
|
||||
|
||||
enum fsStartPositionType {
|
||||
FS_START_UP,
|
||||
FS_START_DOWN,
|
||||
FS_START_ON,
|
||||
FS_START_OFF,
|
||||
FS_START_PREVIOUS
|
||||
};
|
||||
|
||||
|
||||
+67
-2
@@ -91,11 +91,11 @@ void setFSStartupPosition()
|
||||
for (uint8_t i = 0; i < NUM_FUNCTIONS_SWITCHES; i++) {
|
||||
uint8_t startPos = (g_model.functionSwitchStartConfig >> 2 * i) & 0x03;
|
||||
switch(startPos) {
|
||||
case FS_START_DOWN:
|
||||
case FS_START_OFF:
|
||||
g_model.functionSwitchLogicalState &= ~(1 << i); // clear state
|
||||
break;
|
||||
|
||||
case FS_START_UP:
|
||||
case FS_START_ON:
|
||||
g_model.functionSwitchLogicalState |= 1 << i;
|
||||
break;
|
||||
|
||||
@@ -117,6 +117,14 @@ uint8_t getFSLogicalState(uint8_t index)
|
||||
return (uint8_t )(bfSingleBitGet(getFSLogicalState(), index) >> (index));
|
||||
}
|
||||
|
||||
void setFSLogicalState(uint8_t index, uint8_t value)
|
||||
{
|
||||
if (value)
|
||||
g_model.functionSwitchLogicalState |= 1 << index; // Set bit
|
||||
else
|
||||
g_model.functionSwitchLogicalState &= ~(1 << index); // clear state
|
||||
}
|
||||
|
||||
uint8_t getFSPhysicalState(uint8_t index)
|
||||
{
|
||||
index += switchGetMaxSwitches();
|
||||
@@ -172,6 +180,63 @@ void evalFunctionSwitches()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool groupHasSwitchOn(uint8_t group)
|
||||
{
|
||||
for (int j = 0; j < NUM_FUNCTIONS_SWITCHES; j += 1)
|
||||
if (FSWITCH_GROUP(j) == group && getFSLogicalState(j))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
int firstSwitchInGroup(uint8_t group)
|
||||
{
|
||||
for (int j = 0; j < NUM_FUNCTIONS_SWITCHES; j += 1)
|
||||
if (FSWITCH_GROUP(j) == group)
|
||||
return j;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int groupDefaultSwitch(uint8_t group)
|
||||
{
|
||||
bool allOff = true;
|
||||
for (int j = 0; j < NUM_FUNCTIONS_SWITCHES; j += 1) {
|
||||
if (FSWITCH_GROUP(j) == group) {
|
||||
if (FSWITCH_STARTUP(j) == FS_START_ON)
|
||||
return j;
|
||||
if (FSWITCH_STARTUP(j) != FS_START_OFF)
|
||||
allOff = false;
|
||||
}
|
||||
}
|
||||
if (allOff)
|
||||
return NUM_FUNCTIONS_SWITCHES;
|
||||
return -1;
|
||||
}
|
||||
|
||||
void setGroupSwitchState(uint8_t group, int defaultSwitch)
|
||||
{
|
||||
// Check rules for always on group
|
||||
// - Toggle switch type not valid, change all switches to 2POS
|
||||
// - One switch must be turned on, turn on first switch if needed
|
||||
if (IS_FSWITCH_GROUP_ON(group)) {
|
||||
for (int j = 0; j < NUM_FUNCTIONS_SWITCHES; j += 1) {
|
||||
if (FSWITCH_GROUP(j) == group) {
|
||||
FSWITCH_SET_CONFIG(j, SWITCH_2POS); // Toggle not valid
|
||||
}
|
||||
}
|
||||
if (!groupHasSwitchOn(group)) {
|
||||
int sw = firstSwitchInGroup(group);
|
||||
if (sw >= 0)
|
||||
setFSLogicalState(sw, 1); // Make sure a switch is on
|
||||
}
|
||||
if (groupDefaultSwitch(group) == NUM_FUNCTIONS_SWITCHES) {
|
||||
// Start state for all switches is off - set all to 'last'
|
||||
for (int j = 0; j < NUM_FUNCTIONS_SWITCHES; j += 1)
|
||||
if (FSWITCH_GROUP(j) == group)
|
||||
FSWITCH_SET_STARTUP(j, FS_START_PREVIOUS);
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
uint8_t getFSLogicalState(uint8_t) { return false; }
|
||||
#endif // FUNCTION_SWITCHES
|
||||
|
||||
@@ -84,3 +84,12 @@ const char* switchGetCustomName(uint8_t idx);
|
||||
bool switchHasCustomName(uint8_t idx);
|
||||
|
||||
SwitchConfig switchGetMaxType(uint8_t idx);
|
||||
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
uint8_t getFSLogicalState(uint8_t index);
|
||||
void setFSLogicalState(uint8_t index, uint8_t value);
|
||||
bool groupHasSwitchOn(uint8_t group);
|
||||
int firstSwitchInGroup(uint8_t group);
|
||||
int groupDefaultSwitch(uint8_t group);
|
||||
void setGroupSwitchState(uint8_t group, int defaultSwitch = -1);
|
||||
#endif
|
||||
|
||||
@@ -95,6 +95,7 @@ ISTR(PPM_POL);
|
||||
ISTR(SBUS_INVERSION_VALUES);
|
||||
ISTR(SPORT_MODES);
|
||||
ISTR(FSGROUPS);
|
||||
ISTR(FSSWITCHES);
|
||||
ISTR(ADCFILTERVALUES);
|
||||
ISTR(TIMER_DIR);
|
||||
ISTR(PREFLIGHT_POTSLIDER_CHECK);
|
||||
@@ -160,7 +161,11 @@ const char STR_PPMFRAME[] = TR_PPMFRAME;
|
||||
const char STR_REFRESHRATE[] = TR_REFRESHRATE;
|
||||
const char STR_MS[] = TR_MS;
|
||||
const char STR_SWITCH[] = TR_SWITCH;
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
const char STR_FUNCTION_SWITCHES[] = TR_FUNCTION_SWITCHES;
|
||||
const char STR_GROUP[] = TR_GROUP;
|
||||
const char STR_GROUP_ALWAYS_ON[] = TR_GROUP_ALWAYS_ON;
|
||||
#endif
|
||||
const char STR_ADJUST_GVAR[] = TR_ADJUST_GVAR;
|
||||
const char STR_PLAY_TRACK[] = TR_PLAY_TRACK;
|
||||
const char STR_PLAY_VALUE[] = TR_PLAY_VALUE;
|
||||
|
||||
@@ -212,6 +212,7 @@ extern const char* const STR_MULTI_DSM_CLONE[];
|
||||
extern const char* const STR_MULTI_WBUS_MODE[];
|
||||
extern const char* const STR_SPORT_MODES[];
|
||||
extern const char* const STR_FSGROUPS[];
|
||||
extern const char* const STR_FSSWITCHES[];
|
||||
|
||||
extern const char STR_AFHDS3_ONE_TO_ONE_TELEMETRY[];
|
||||
extern const char STR_AFHDS3_ONE_TO_MANY[];
|
||||
@@ -293,6 +294,8 @@ extern const char STR_REFRESHRATE[];
|
||||
extern const char STR_MS[];
|
||||
extern const char STR_SWITCH[];
|
||||
extern const char STR_FUNCTION_SWITCHES[];
|
||||
extern const char STR_GROUP[];
|
||||
extern const char STR_GROUP_ALWAYS_ON[];
|
||||
extern const char STR_ADJUST_GVAR[];
|
||||
extern const char STR_PLAY_TRACK[];
|
||||
extern const char STR_PLAY_VALUE[];
|
||||
|
||||
@@ -280,6 +280,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "开关"
|
||||
#define TR_FUNCTION_SWITCHES "可自定义开关"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "微调"
|
||||
#define TR_FADEIN "渐入"
|
||||
|
||||
@@ -295,6 +295,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Spínač"
|
||||
#define TR_FUNCTION_SWITCHES "Nastavitelné přepínače"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trimy"
|
||||
#define TR_FADEIN "Přechod Zap"
|
||||
|
||||
@@ -288,6 +288,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Kontakt"
|
||||
#define TR_FUNCTION_SWITCHES "Kontakter der kan tilpasses"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Udløser"
|
||||
#define TR_TRIMS "Trim"
|
||||
#define TR_FADEIN "Tone ind"
|
||||
|
||||
@@ -286,6 +286,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH TR("Schalt.", "Schalter")
|
||||
#define TR_FUNCTION_SWITCHES "Anpassbare Schalter"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trimmer"
|
||||
#define TR_FADEIN "Langs. Ein"
|
||||
|
||||
@@ -285,6 +285,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Switch"
|
||||
#define TR_FUNCTION_SWITCHES "Customizable Switches"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Fade in"
|
||||
|
||||
@@ -283,6 +283,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH TR("Interr.", "Interruptor")
|
||||
#define TR_FUNCTION_SWITCHES "Customizable switches"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Inicio"
|
||||
|
||||
@@ -297,6 +297,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Switch"
|
||||
#define TR_FUNCTION_SWITCHES "Customizable switches"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Fade In"
|
||||
|
||||
@@ -289,6 +289,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "מתג"
|
||||
#define TR_FUNCTION_SWITCHES "מפסקים בהתאמה אישית"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "הדק"
|
||||
#define TR_TRIMS "קיזוזים"
|
||||
#define TR_FADEIN "Fade in"
|
||||
|
||||
@@ -285,6 +285,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Inter."
|
||||
#define TR_FUNCTION_SWITCHES "Interruttori personalizzabili"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Diss.In"
|
||||
|
||||
@@ -284,6 +284,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "スイッチ"
|
||||
#define TR_FUNCTION_SWITCHES "カスタマイズ スイッチ"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "トリガー"
|
||||
#define TR_TRIMS "トリム"
|
||||
#define TR_FADEIN "フェードイン"
|
||||
|
||||
@@ -282,6 +282,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH TR("Schak.", "Schakelaar")
|
||||
#define TR_FUNCTION_SWITCHES "Customizable switches"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Fade in"
|
||||
|
||||
@@ -282,6 +282,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Przełą"
|
||||
#define TR_FUNCTION_SWITCHES "Ustawiane przełączniki"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trymy"
|
||||
#define TR_FADEIN "Pojawia"
|
||||
|
||||
@@ -288,6 +288,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Chave"
|
||||
#define TR_FUNCTION_SWITCHES "Chaves customizáveis"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Disparo"
|
||||
#define TR_TRIMS "Trims"
|
||||
#define TR_FADEIN "Aparecer"
|
||||
|
||||
@@ -287,6 +287,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Тумблер"
|
||||
#define TR_FUNCTION_SWITCHES "Настр тумблеры"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Триггер"
|
||||
#define TR_TRIMS "тримы"
|
||||
#define TR_FADEIN "Затух входа"
|
||||
|
||||
@@ -298,6 +298,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Brytare"
|
||||
#define TR_FUNCTION_SWITCHES "Anpassningsbara brytare"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "Trimmar"
|
||||
#define TR_FADEIN "Tona in"
|
||||
|
||||
@@ -285,6 +285,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "開關"
|
||||
#define TR_FUNCTION_SWITCHES "可自定義開關"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Trigger"
|
||||
#define TR_TRIMS "微調"
|
||||
#define TR_FADEIN "漸入"
|
||||
|
||||
@@ -287,6 +287,8 @@
|
||||
#define TR_MS "ms"
|
||||
#define TR_SWITCH "Перемикач"
|
||||
#define TR_FUNCTION_SWITCHES "Користувацькі перемикачі"
|
||||
#define TR_GROUP "Group"
|
||||
#define TR_GROUP_ALWAYS_ON "Always on"
|
||||
#define TR_SF_SWITCH "Тригери"
|
||||
#define TR_TRIMS "Трим."
|
||||
#define TR_FADEIN "Вх.Згасання"
|
||||
|
||||
@@ -314,6 +314,7 @@
|
||||
#define STR_CHAR_BW_DEGREE '@'
|
||||
|
||||
#define TR_FSGROUPS "-","1","2","3"
|
||||
#define TR_FSSWITCHES "=", "SW1", "SW2", "SW3", "SW4", "SW5", "SW6", TR_OFF
|
||||
|
||||
//
|
||||
// HoTT Telemetry sensor names by Hott device
|
||||
|
||||
Reference in New Issue
Block a user