feat(bw): add 'Set Screen' special function to B&W radios (#5589)
This commit is contained in:
@@ -326,6 +326,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_FUNCSOUNDS, val_displayed, attr);
|
||||
}
|
||||
#endif
|
||||
else if (func == FUNC_SET_SCREEN) {
|
||||
val_min = 0;
|
||||
val_max = 4;
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN + 3*FW, y, val_displayed, attr|LEFT);
|
||||
}
|
||||
#if defined(HAPTIC)
|
||||
else if (func == FUNC_HAPTIC) {
|
||||
val_max = 3;
|
||||
@@ -496,7 +501,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
else {
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, RIGHT | attr);
|
||||
}
|
||||
if (active) CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn), -1, 60/CFN_PLAY_REPEAT_MUL, eeFlags);
|
||||
if (active)
|
||||
CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn),
|
||||
-1,
|
||||
(func == FUNC_SET_SCREEN ? 0 : 60/CFN_PLAY_REPEAT_MUL),
|
||||
eeFlags);
|
||||
}
|
||||
}
|
||||
else if (attr) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#define STATUS_BAR_Y (7*FH+1)
|
||||
|
||||
uint8_t s_frsky_view = 0;
|
||||
uint8_t selectedTelemView = 0;
|
||||
|
||||
#define BAR_LEFT 25
|
||||
#define BAR_WIDTH 100
|
||||
@@ -163,7 +163,7 @@ bool displayCustomTelemetryScreen(uint8_t index)
|
||||
{
|
||||
TelemetryScreenData & screen = g_model.screens[index];
|
||||
|
||||
if (IS_BARS_SCREEN(s_frsky_view)) {
|
||||
if (IS_BARS_SCREEN(selectedTelemView)) {
|
||||
return displayGaugesTelemetryScreen(screen);
|
||||
}
|
||||
|
||||
@@ -175,19 +175,19 @@ bool displayCustomTelemetryScreen(uint8_t index)
|
||||
bool displayTelemetryScreen()
|
||||
{
|
||||
#if defined(LUA)
|
||||
if (TELEMETRY_SCREEN_TYPE(s_frsky_view) == TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
if (TELEMETRY_SCREEN_TYPE(selectedTelemView) == TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
return isTelemetryScriptAvailable(); // contents will be drawn by Lua Task
|
||||
}
|
||||
#endif
|
||||
|
||||
if (TELEMETRY_SCREEN_TYPE(s_frsky_view) == TELEMETRY_SCREEN_TYPE_NONE) {
|
||||
if (TELEMETRY_SCREEN_TYPE(selectedTelemView) == TELEMETRY_SCREEN_TYPE_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
drawTelemetryTopBar();
|
||||
|
||||
if (s_frsky_view < MAX_TELEMETRY_SCREENS) {
|
||||
return displayCustomTelemetryScreen(s_frsky_view);
|
||||
if (selectedTelemView < MAX_TELEMETRY_SCREENS) {
|
||||
return displayCustomTelemetryScreen(selectedTelemView);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -307,6 +307,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
val_max = AU_SPECIAL_SOUND_LAST-AU_SPECIAL_SOUND_FIRST-1;
|
||||
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_FUNCSOUNDS, val_displayed, attr);
|
||||
}
|
||||
else if (func == FUNC_SET_SCREEN) {
|
||||
val_min = 0;
|
||||
val_max = 4;
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN + 3*FW, y, val_displayed, attr|LEFT);
|
||||
}
|
||||
#if defined(HAPTIC)
|
||||
else if (func == FUNC_HAPTIC) {
|
||||
val_max = 3;
|
||||
@@ -447,7 +452,11 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
||||
lcdDrawNumber(MODEL_SPECIAL_FUNC_4TH_COLUMN+2+FW, y, CFN_PLAY_REPEAT(cfn)*CFN_PLAY_REPEAT_MUL, attr|RIGHT);
|
||||
lcdDrawChar(MODEL_SPECIAL_FUNC_4TH_COLUMN+2+FW, y, 's', attr);
|
||||
}
|
||||
if (active) CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn), -1, 60/CFN_PLAY_REPEAT_MUL, eeFlags);
|
||||
if (active)
|
||||
CFN_PLAY_REPEAT(cfn) = checkIncDec(event, CFN_PLAY_REPEAT(cfn)==CFN_PLAY_REPEAT_NOSTART?-1:CFN_PLAY_REPEAT(cfn),
|
||||
-1,
|
||||
(func == FUNC_SET_SCREEN ? 0 : 60/CFN_PLAY_REPEAT_MUL),
|
||||
eeFlags);
|
||||
}
|
||||
}
|
||||
else if (attr) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#define STATUS_BAR_Y (7*FH+1)
|
||||
|
||||
uint8_t s_frsky_view = 0;
|
||||
uint8_t selectedTelemView = 0;
|
||||
|
||||
#define BAR_LEFT 30
|
||||
#define BAR_WIDTH 152
|
||||
@@ -167,7 +167,7 @@ void displayCustomTelemetryScreen(uint8_t index)
|
||||
{
|
||||
TelemetryScreenData & screen = g_model.screens[index];
|
||||
|
||||
if (IS_BARS_SCREEN(s_frsky_view)) {
|
||||
if (IS_BARS_SCREEN(selectedTelemView)) {
|
||||
return displayGaugesTelemetryScreen(screen);
|
||||
}
|
||||
|
||||
@@ -177,19 +177,19 @@ void displayCustomTelemetryScreen(uint8_t index)
|
||||
bool displayTelemetryScreen()
|
||||
{
|
||||
#if defined(LUA)
|
||||
if (TELEMETRY_SCREEN_TYPE(s_frsky_view) == TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
if (TELEMETRY_SCREEN_TYPE(selectedTelemView) == TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
return isTelemetryScriptAvailable(); // contents will be drawn by Lua Task
|
||||
}
|
||||
#endif
|
||||
|
||||
if (TELEMETRY_SCREEN_TYPE(s_frsky_view) == TELEMETRY_SCREEN_TYPE_NONE) {
|
||||
if (TELEMETRY_SCREEN_TYPE(selectedTelemView) == TELEMETRY_SCREEN_TYPE_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
drawTelemetryTopBar();
|
||||
|
||||
if (s_frsky_view < MAX_TELEMETRY_SCREENS) {
|
||||
displayCustomTelemetryScreen(s_frsky_view);
|
||||
if (selectedTelemView < MAX_TELEMETRY_SCREENS) {
|
||||
displayCustomTelemetryScreen(selectedTelemView);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -53,7 +53,7 @@ void menuViewTelemetry(event_t event)
|
||||
{
|
||||
enum NavigationDirection direction = NAVIGATION_DIRECTION_NONE;
|
||||
|
||||
if (event == EVT_KEY_BREAK(KEY_EXIT) && TELEMETRY_SCREEN_TYPE(s_frsky_view) != TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
if (event == EVT_KEY_BREAK(KEY_EXIT) && TELEMETRY_SCREEN_TYPE(selectedTelemView) != TELEMETRY_SCREEN_TYPE_SCRIPT) {
|
||||
chainMenu(menuMainView);
|
||||
}
|
||||
#if defined(LUA)
|
||||
@@ -75,12 +75,12 @@ void menuViewTelemetry(event_t event)
|
||||
|
||||
for (int i=0; i<=TELEMETRY_SCREEN_TYPE_MAX; i++) {
|
||||
if (direction == NAVIGATION_DIRECTION_UP) {
|
||||
if (s_frsky_view-- == 0)
|
||||
s_frsky_view = TELEMETRY_VIEW_MAX;
|
||||
if (selectedTelemView-- == 0)
|
||||
selectedTelemView = TELEMETRY_VIEW_MAX;
|
||||
}
|
||||
else if (direction == NAVIGATION_DIRECTION_DOWN) {
|
||||
if (s_frsky_view++ == TELEMETRY_VIEW_MAX)
|
||||
s_frsky_view = 0;
|
||||
if (selectedTelemView++ == TELEMETRY_VIEW_MAX)
|
||||
selectedTelemView = 0;
|
||||
}
|
||||
else {
|
||||
direction = NAVIGATION_DIRECTION_DOWN;
|
||||
@@ -95,5 +95,20 @@ void menuViewTelemetry(event_t event)
|
||||
displayRssiLine();
|
||||
}
|
||||
|
||||
void showTelemScreen(uint8_t index)
|
||||
{
|
||||
if (menuHandlers[menuLevel] == menuViewTelemetry || menuHandlers[menuLevel] == menuMainView) {
|
||||
if (index == 0) {
|
||||
chainMenu(menuMainView);
|
||||
} else {
|
||||
index -= 1;
|
||||
if ((index >= 0 && index <= TELEMETRY_SCREEN_TYPE_MAX) && (TELEMETRY_SCREEN_TYPE(index) != TELEMETRY_SCREEN_TYPE_NONE)) {
|
||||
selectedTelemView = index;
|
||||
chainMenu(menuViewTelemetry);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#undef EVT_KEY_PREVIOUS_VIEW
|
||||
#undef EVT_KEY_NEXT_VIEW
|
||||
|
||||
Reference in New Issue
Block a user