chore(dsmp): separate DSMP and DSM2, cleanup code, add DSMP status display and Enable AETR option (#6932)
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
@@ -194,6 +194,10 @@ enum MenuModelSetupItems {
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_MODE,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS,
|
||||
#endif
|
||||
#if defined(DSMP)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_STATUS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_ENABLE_AETR,
|
||||
#endif
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_CHANNELS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_NOT_ACCESS_RXNUM_BIND_RANGE,
|
||||
@@ -542,6 +546,7 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event)
|
||||
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE) \
|
||||
AFHDS3_PROTOCOL_ROW(EXTERNAL_MODULE) \
|
||||
AFHDS3_MODE_ROWS(EXTERNAL_MODULE) \
|
||||
DSMP_STATUS_ROWS(EXTERNAL_MODULE) \
|
||||
MODULE_CHANNELS_ROWS(EXTERNAL_MODULE), \
|
||||
IF_NOT_ACCESS_MODULE_RF(EXTERNAL_MODULE, MODULE_BIND_ROWS(EXTERNAL_MODULE)), /* line reused for PPM: PPM settings */ \
|
||||
IF_ACCESS_MODULE_RF(EXTERNAL_MODULE, 0), /* RxNum */ \
|
||||
@@ -2125,12 +2130,13 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (isModuleDSMP(moduleIdx) &&
|
||||
(oldFlag != newFlag) &&
|
||||
#if defined(DSMP)
|
||||
if (isModuleDSMP(moduleIdx) && (oldFlag != newFlag) &&
|
||||
(oldFlag == MODULE_MODE_BIND)) {
|
||||
// Restart DSMP module when exiting bind mode
|
||||
restartModule(moduleIdx);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -2435,12 +2441,31 @@ void menuModelSetup(event_t event)
|
||||
#if defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS:
|
||||
#endif
|
||||
#endif
|
||||
#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS:
|
||||
#endif
|
||||
#if (defined(MULTIMODULE) | defined(DSMP) | defined(AFHDS3)) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_STATUS:
|
||||
{
|
||||
// MultiModule & LemonDSMP & AFHDS3 Status
|
||||
lcdDrawTextIndented(y, STR_MODULE_STATUS);
|
||||
getModuleStatusString(moduleIdx, reusableBuffer.moduleSetup.msg);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#if defined(DSMP) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_ENABLE_AETR:
|
||||
g_model.moduleData[EXTERNAL_MODULE].dsmp.enableAETR =
|
||||
editCheckBox(g_model.moduleData[EXTERNAL_MODULE].dsmp.enableAETR,
|
||||
MODEL_SETUP_2ND_COLUMN, y, STR_DSMP_ENABLE_AETR, attr,
|
||||
event, INDENT_WIDTH);
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(MULTIMODULE)
|
||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_INTERNAL_MODULE_SYNCSTATUS:
|
||||
#endif
|
||||
@@ -2456,14 +2481,6 @@ void menuModelSetup(event_t event)
|
||||
#endif
|
||||
|
||||
#if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS: {
|
||||
lcdDrawTextIndented(y, STR_MODULE_STATUS);
|
||||
|
||||
char statusText[64];
|
||||
getModuleStatusString(moduleIdx, statusText);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText);
|
||||
break;
|
||||
}
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS: {
|
||||
lcdDrawTextIndented(y, STR_AFHDS3_POWER_SOURCE);
|
||||
char statusText[64];
|
||||
|
||||
@@ -139,6 +139,10 @@ enum MenuModelSetupItems {
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_MODE,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS,
|
||||
#endif
|
||||
#if defined(DSMP)
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_STATUS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_ENABLE_AETR,
|
||||
#endif
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_CHANNELS,
|
||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_NOT_ACCESS_RXNUM_BIND_RANGE,
|
||||
@@ -561,6 +565,7 @@ void menuModelSetup(event_t event)
|
||||
MULTIMODULE_TYPE_ROW(EXTERNAL_MODULE) // ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL
|
||||
MULTIMODULE_DSM_CLONED_RAW(EXTERNAL_MODULE), // ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSM_CLONED
|
||||
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE) // ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS + ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS
|
||||
DSMP_STATUS_ROWS(EXTERNAL_MODULE) // ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_STATUS
|
||||
AFHDS3_MODE_ROWS(EXTERNAL_MODULE) // ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_MODE + ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS + ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS
|
||||
MODULE_CHANNELS_ROWS(EXTERNAL_MODULE), // ITEM_MODEL_SETUP_EXTERNAL_MODULE_CHANNELS
|
||||
IF_NOT_ACCESS_MODULE_RF(EXTERNAL_MODULE, MODULE_BIND_ROWS(EXTERNAL_MODULE)), // ITEM_MODEL_SETUP_EXTERNAL_MODULE_NOT_ACCESS_RXNUM_BIND_RANGE
|
||||
@@ -1619,12 +1624,13 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (isModuleDSMP(moduleIdx) &&
|
||||
(oldFlag != newFlag) &&
|
||||
#if defined(DSMP)
|
||||
if (isModuleDSMP(moduleIdx) && (oldFlag != newFlag) &&
|
||||
(oldFlag == MODULE_MODE_BIND)) {
|
||||
// Restart DSMP module when exiting bind mode
|
||||
restartModule(moduleIdx);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -1834,11 +1840,33 @@ void menuModelSetup(event_t event)
|
||||
|
||||
#if defined (MULTIMODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS:
|
||||
#endif
|
||||
#if defined(AFHDS3)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS:
|
||||
#endif
|
||||
#if defined(DSMP)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_STATUS:
|
||||
#endif
|
||||
#if (defined(DSMP) || defined(MULTIMODULE) || defined(AFHDS3))
|
||||
{
|
||||
// MultiModule & LemonDSMP & AFHDS Status
|
||||
lcdDrawTextIndented(y, STR_MODULE_STATUS);
|
||||
getModuleStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(DSMP)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSMP_ENABLE_AETR:
|
||||
g_model.moduleData[EXTERNAL_MODULE].dsmp.enableAETR =
|
||||
editCheckBox(g_model.moduleData[EXTERNAL_MODULE].dsmp.enableAETR,
|
||||
MODEL_SETUP_2ND_COLUMN, y, STR_DSMP_ENABLE_AETR, attr,
|
||||
event, INDENT_WIDTH);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if defined(MULTIMODULE) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS:
|
||||
lcdDrawTextIndented(y, STR_MODULE_SYNC);
|
||||
getModuleSyncStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg);
|
||||
@@ -1852,14 +1880,6 @@ void menuModelSetup(event_t event)
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y,
|
||||
g_model.moduleData[EXTERNAL_MODULE].afhds3.telemetry ? STR_AFHDS3_ONE_TO_ONE_TELEMETRY : TR_AFHDS3_ONE_TO_MANY);
|
||||
break;
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS:
|
||||
{
|
||||
lcdDrawTextIndented(y, TR_MODULE_STATUS);
|
||||
char statusText[64];
|
||||
getModuleStatusString(EXTERNAL_MODULE, statusText);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText);
|
||||
break;
|
||||
}
|
||||
case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS:
|
||||
{
|
||||
lcdDrawTextIndented(y, STR_AFHDS3_POWER_SOURCE);
|
||||
|
||||
@@ -109,6 +109,10 @@ macro(add_gui_src src)
|
||||
)
|
||||
endmacro(add_gui_src)
|
||||
|
||||
if(DSMP)
|
||||
add_gui_src(module/dsmp_settings.cpp)
|
||||
endif()
|
||||
|
||||
if(LUA)
|
||||
add_gui_src(standalone_lua.cpp)
|
||||
set(SRC ${SRC}
|
||||
|
||||
@@ -118,6 +118,13 @@ void ModuleChannelRange::update()
|
||||
{
|
||||
ChannelRange::update();
|
||||
|
||||
#if defined(DSMP)
|
||||
if (isModuleDSMP(moduleIdx)) {
|
||||
// Disable Ch start, module asume starting in Ch1
|
||||
chStart->enable(false);
|
||||
}
|
||||
#endif
|
||||
|
||||
auto min_mod_ch = minModuleChannels(moduleIdx);
|
||||
auto max_mod_ch = maxModuleChannels(moduleIdx);
|
||||
chEnd->enable(min_mod_ch < max_mod_ch);
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
/*
|
||||
* 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 "dsmp_settings.h"
|
||||
|
||||
#include "choice.h"
|
||||
#include "edgetx.h"
|
||||
|
||||
#define SET_DIRTY() storageDirty(EE_MODEL)
|
||||
|
||||
struct DSMPEnableAETR : public FormLine {
|
||||
DSMPEnableAETR(Window* form, FlexGridLayout& layout, uint8_t moduleIdx) :
|
||||
FormLine(form, layout)
|
||||
{
|
||||
new StaticText(this, rect_t{}, STR_DSMP_ENABLE_AETR);
|
||||
|
||||
auto md = &g_model.moduleData[moduleIdx];
|
||||
|
||||
cb = new ToggleSwitch(this, rect_t{}, GET_SET_DEFAULT(md->dsmp.enableAETR));
|
||||
}
|
||||
|
||||
void update()
|
||||
{
|
||||
show();
|
||||
cb->update();
|
||||
}
|
||||
|
||||
private:
|
||||
ToggleSwitch* cb;
|
||||
};
|
||||
|
||||
DSMPSettings::DSMPSettings(Window* parent,
|
||||
const FlexGridLayout& g,
|
||||
uint8_t moduleIdx) :
|
||||
Window(parent, rect_t{}),
|
||||
md(&g_model.moduleData[moduleIdx]),
|
||||
moduleIdx(moduleIdx)
|
||||
{
|
||||
FlexGridLayout grid(g);
|
||||
setFlexLayout();
|
||||
|
||||
// DSMP status
|
||||
auto line = newLine(grid);
|
||||
new StaticText(line, rect_t{}, STR_MODULE_STATUS);
|
||||
new DynamicText(
|
||||
line, rect_t{},
|
||||
[=] {
|
||||
char msg[64] = "";
|
||||
getModuleStatusString(moduleIdx, msg);
|
||||
return std::string(msg);
|
||||
});
|
||||
|
||||
enableAETR_line = new DSMPEnableAETR(this, grid, moduleIdx);
|
||||
|
||||
// Ensure elements properly initalised
|
||||
update();
|
||||
}
|
||||
|
||||
void DSMPSettings::update() {
|
||||
enableAETR_line->update();
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
* 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 "window.h"
|
||||
#include "module_setup.h"
|
||||
|
||||
class ToggleSwitch;
|
||||
|
||||
struct ModuleData;
|
||||
struct DSMPEnableAETR;
|
||||
|
||||
class DSMPSettings : public Window, public ModuleOptions
|
||||
{
|
||||
ModuleData* md;
|
||||
uint8_t moduleIdx;
|
||||
DSMPEnableAETR *enableAETR_line;
|
||||
|
||||
public:
|
||||
DSMPSettings(Window* parent, const FlexGridLayout& g,
|
||||
uint8_t moduleIdx);
|
||||
void update() override;
|
||||
};
|
||||
@@ -65,6 +65,10 @@
|
||||
#include "multi_rfprotos.h"
|
||||
#endif
|
||||
|
||||
#if defined(DSMP)
|
||||
#include "dsmp_settings.h"
|
||||
#endif
|
||||
|
||||
#define SET_DIRTY() storageDirty(EE_MODEL)
|
||||
|
||||
#define ETX_STATE_UNIQUE_ID_WARN LV_STATE_USER_1
|
||||
@@ -163,6 +167,11 @@ class ModuleWindow : public Window
|
||||
modOpts = new PXX1AntennaSettings(this, grid, moduleIdx);
|
||||
}
|
||||
#endif
|
||||
#if defined(DSMP)
|
||||
else if (isModuleDSMP(moduleIdx)) {
|
||||
modOpts = new DSMPSettings(this, grid, moduleIdx);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Channel Range
|
||||
auto line = newLine(grid);
|
||||
|
||||
@@ -152,10 +152,10 @@ if (event == EVT_ENTRY) {
|
||||
y += FH;
|
||||
continue;
|
||||
}
|
||||
#if defined(MULTIMODULE)
|
||||
if (isModuleMultimodule(module)) {
|
||||
#if defined(MULTIMODULE) || defined(DSMP)
|
||||
if (isModuleMultimodule(module) || isModuleDSMP(module)) {
|
||||
char statusText[64] = "";
|
||||
getMultiModuleStatus(module).getStatusString(statusText);
|
||||
getModuleStatusString(module,statusText);
|
||||
lcdDrawText(COLUMN2_X, y, statusText);
|
||||
y += FH;
|
||||
continue;
|
||||
|
||||
@@ -218,6 +218,12 @@ extern uint8_t MULTIMODULE_HASOPTIONS(uint8_t moduleIdx);
|
||||
#define AFHDS3_MODULE_ROWS(moduleIdx)
|
||||
#endif
|
||||
|
||||
#if defined(DSMP)
|
||||
#define DSMP_STATUS_ROWS(moduleIdx) isModuleDSMP(moduleIdx) ? TITLE_ROW : HIDDEN_ROW, isModuleDSMP(moduleIdx) ? (uint8_t) 0 : HIDDEN_ROW,
|
||||
#else
|
||||
#define DSMP_STATUS_ROWS(moduleIdx)
|
||||
#endif
|
||||
|
||||
#define FAILSAFE_ROW(moduleIdx) isModuleFailsafeAvailable(moduleIdx) ? (g_model.moduleData[moduleIdx].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW
|
||||
|
||||
extern uint8_t MODULE_OPTION_ROW(uint8_t moduleIdx);
|
||||
|
||||
Reference in New Issue
Block a user