piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Horus : do not display POT2 as 6P if it is not

Browse Source
This commit is contained in:
3djc
2019-05-10 15:56:50 +02:00
parent bff7d5e0bd
commit f7f6d7e0db
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/view_main.cpp
+4 -1
View File
@@ -36,7 +36,10 @@ void drawMainPots()
{
// The 3 pots
drawHorizontalSlider(TRIM_LH_X, POTS_LINE_Y, 160, calibratedAnalogs[CALIBRATED_POT1], -RESX, RESX, 40, OPTION_SLIDER_TICKS | OPTION_SLIDER_BIG_TICKS | OPTION_SLIDER_SQUARE_BUTTON);
drawHorizontalSlider(LCD_W/2-20, POTS_LINE_Y, XPOTS_MULTIPOS_COUNT*5, 1 + (potsPos[1] & 0x0f), 1, XPOTS_MULTIPOS_COUNT + 1, XPOTS_MULTIPOS_COUNT, OPTION_SLIDER_TICKS | OPTION_SLIDER_BIG_TICKS | OPTION_SLIDER_NUMBER_BUTTON);
if (IS_POT_MULTIPOS(POT2))
drawHorizontalSlider(LCD_W/2-20, POTS_LINE_Y, XPOTS_MULTIPOS_COUNT*5, 1 + (potsPos[1] & 0x0f), 1, XPOTS_MULTIPOS_COUNT + 1, XPOTS_MULTIPOS_COUNT, OPTION_SLIDER_TICKS | OPTION_SLIDER_BIG_TICKS | OPTION_SLIDER_NUMBER_BUTTON);
else
drawHorizontalSlider(LCD_W/2-40, POTS_LINE_Y, 80, calibratedAnalogs[CALIBRATED_POT2], -RESX, RESX, 40, OPTION_SLIDER_TICKS | OPTION_SLIDER_BIG_TICKS | OPTION_SLIDER_SQUARE_BUTTON);
drawHorizontalSlider(TRIM_RH_X, POTS_LINE_Y, 160, calibratedAnalogs[CALIBRATED_POT3], -RESX, RESX, 40, OPTION_SLIDER_TICKS | OPTION_SLIDER_BIG_TICKS | OPTION_SLIDER_SQUARE_BUTTON);
// The 2 rear sliders
radio/src/storage/datacopy.cpp
+3 -2
View File
@@ -1,4 +1,4 @@
//This file was auto-generated by generate_datacopy.py script on Wed Apr 24 15:43:44 2019. Do not edit this file!
//This file was auto-generated by generate_datacopy.py script on Fri May 10 15:48:58 2019. Do not edit this file!
@@ -198,12 +198,13 @@ template <class A, class B>
void copyTrainerModuleData(A * dest, B * src)
{
dest->mode = src->mode;
dest->spare = src->spare;
dest->spare1 = src->spare1;
dest->channelsStart = src->channelsStart;
dest->channelsCount = src->channelsCount;
dest->frameLength = src->frameLength;
dest->delay = src->delay;
dest->pulsePol = src->pulsePol;
dest->spare2 = src->spare2;
}
template <class A, class B>