feat: Surface mode improvements (#3908)
* feat: surface mode improvements * fix: surface trim display * fix: HE missing conditional TR_FM * fix: Also CN,JP & TW for completeness Co-authored-by: 3djc <lesitewebdejc@hotmail.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
3djc
Peter Feerick
parent
56d45fa39b
commit
8be8b51813
@@ -73,12 +73,13 @@ void menuModelFlightModeOne(event_t event)
|
||||
|
||||
#if defined(TRIMS_GPIO_REG_T5L) || defined(TRIMS_GPIO_REG_LSD)
|
||||
#define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS2)
|
||||
static const uint8_t mstate_tab_fm1[] = {0, 3, (uint8_t)(keysGetMaxTrims() - 5), 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1};
|
||||
static const uint8_t mstate_tab_fm1[] = {0, 3, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1};
|
||||
static const uint8_t mstate_tab_others[] = {0, 0, 3, 3, 0, 0,(uint8_t)-1, 2, 2, 2, 2, 2};
|
||||
#else
|
||||
#define VERTICAL_SHIFT (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_TRIMS)
|
||||
static const uint8_t mstate_tab_fm1[] = {0, 3, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1, 1};
|
||||
#endif
|
||||
static const uint8_t mstate_tab_others[] = {0, 0, 3, 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2};
|
||||
#endif
|
||||
|
||||
check(event, 0, nullptr, 0, (s_currIdx == 0) ? mstate_tab_fm1 : mstate_tab_others, DIM(mstate_tab_others)-1, ITEM_MODEL_FLIGHT_MODE_MAX - HEADER_LINE - (s_currIdx==0 ? (ITEM_MODEL_FLIGHT_MODE_FADE_IN-ITEM_MODEL_FLIGHT_MODE_SWITCH-1) : 0));
|
||||
|
||||
|
||||
@@ -84,7 +84,14 @@ void menuRadioDiagKeys(event_t event)
|
||||
|
||||
if (i < keysGetMaxTrims() * 2) {
|
||||
y = MENU_HEADER_HEIGHT + 1 + FH + FH * (i / 2);
|
||||
#if defined(SURFACE_RADIO)
|
||||
if (i & 1) {
|
||||
lcdDrawText(14 * FW, y, "T");
|
||||
lcdDrawNumber(lcdNextPos, y, 1 + i / 2);
|
||||
}
|
||||
#else
|
||||
if (i & 1) lcdDraw1bitBitmap(14 * FW, y, sticks, i / 2, 0);
|
||||
#endif
|
||||
displayTrimState(i & 1 ? 20 * FW : 18 * FW, y, i);
|
||||
}
|
||||
|
||||
|
||||
@@ -109,8 +109,8 @@ void drawPotsBars()
|
||||
void doMainScreenGraphics()
|
||||
{
|
||||
#if defined(SURFACE_RADIO)
|
||||
drawWheel(LBOX_CENTERX, calibratedAnalogs[ADC_MAIN_ST]);
|
||||
drawThrottle(RBOX_CENTERX, calibratedAnalogs[ADC_MAIN_TH]);
|
||||
drawWheel(RBOX_CENTERX, calibratedAnalogs[ADC_MAIN_ST]);
|
||||
drawThrottle(LBOX_CENTERX, calibratedAnalogs[ADC_MAIN_TH]);
|
||||
#else
|
||||
int16_t calibStickVert = calibratedAnalogs[ADC_MAIN_LV];
|
||||
if (g_model.throttleReversed && inputMappingConvertMode(ADC_MAIN_LV) == THR_STICK)
|
||||
@@ -129,8 +129,13 @@ void doMainScreenGraphics()
|
||||
void displayTrims(uint8_t phase)
|
||||
{
|
||||
for (uint8_t i = 0; i < keysGetMaxTrims(); i++) {
|
||||
#if defined(SURFACE_RADIO)
|
||||
static coord_t x[] = {TRIM_RH_X, TRIM_LH_X, TRIM_RV_X, TRIM_LV_X, TRIM_LV_X};
|
||||
static uint8_t vert[] = {0, 0, 1, 1, 1};
|
||||
#else
|
||||
static coord_t x[] = {TRIM_LH_X, TRIM_LV_X, TRIM_RV_X, TRIM_RH_X, TRIM_LH_X, TRIM_LV_X, TRIM_RH_X, TRIM_RV_X};
|
||||
static uint8_t vert[] = {0, 1, 1, 0, 0, 1, 0, 1};
|
||||
#endif
|
||||
coord_t xm, ym;
|
||||
uint8_t stickIndex = inputMappingConvertMode(i);
|
||||
xm = x[stickIndex];
|
||||
@@ -186,7 +191,7 @@ void displayTrims(uint8_t phase)
|
||||
}
|
||||
else {
|
||||
ym -= val;
|
||||
if ((i > 4 && xm < LCD_W / 2) || (i < 4 && xm > LCD_W / 2) ) {
|
||||
if ((i > 3 && xm < LCD_W / 2) || (i < 4 && xm > LCD_W / 2) ) {
|
||||
lcdDrawSolidVerticalLine(xm - 1, ym, 1);
|
||||
lcdDrawSolidVerticalLine(xm - 2, ym - 1, 3);
|
||||
lcdDrawSolidVerticalLine(xm - 3, ym - 2, 5);
|
||||
|
||||
@@ -44,7 +44,7 @@ void drawThrottle(coord_t centrex, int16_t wval)
|
||||
constexpr coord_t MARKER_WIDTH = 5;
|
||||
lcdDrawSquare(centrex-BOX_WIDTH/2, BOX_CENTERY-BOX_WIDTH/2, BOX_WIDTH);
|
||||
lcdDrawSolidHorizontalLine(centrex - MARKER_WIDTH, BOX_CENTERY, 2 * MARKER_WIDTH + 1);
|
||||
coord_t tsize = wval / 150;
|
||||
coord_t tsize = - wval / 150;
|
||||
lcdDrawLine( centrex - tsize, BOX_CENTERY, centrex, BOX_CENTERY + tsize, SOLID, FORCE);
|
||||
lcdDrawLine( centrex + tsize, BOX_CENTERY, centrex, BOX_CENTERY + tsize, SOLID, FORCE);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user