[gruvin9x] Issue 12 fixed
This commit is contained in:
+3
-3
@@ -599,10 +599,10 @@ void menuModelSelect(uint8_t event)
|
|||||||
putsModelName(4*FW, y, name, k, 0);
|
putsModelName(4*FW, y, name, k, 0);
|
||||||
lcd_outdezAtt(20*FW, y, eeModelSize(k), 0);
|
lcd_outdezAtt(20*FW, y, eeModelSize(k), 0);
|
||||||
#endif
|
#endif
|
||||||
if (k==g_eeGeneral.currModel && (s_copyMode!=COPY_MODE || s_copySrcRow<0 || i+s_pgOfs!=(pgofs_t)sub)) lcd_putc(1, y, '*');
|
if (k==g_eeGeneral.currModel && (s_copyMode!=COPY_MODE || s_copySrcRow<0 || i+s_pgOfs!=(vertpos_t)sub)) lcd_putc(1, y, '*');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s_copyMode && (pgofs_t)sub==i+s_pgOfs) {
|
if (s_copyMode && (vertpos_t)sub==i+s_pgOfs) {
|
||||||
lcd_filled_rect(9, y, LCD_W-1-9, 7);
|
lcd_filled_rect(9, y, LCD_W-1-9, 7);
|
||||||
lcd_rect(8, y-1, LCD_W-1-7, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
|
lcd_rect(8, y-1, LCD_W-1-7, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
|
||||||
}
|
}
|
||||||
@@ -2276,7 +2276,7 @@ void menuModelMixOne(uint8_t event)
|
|||||||
|
|
||||||
TITLE(s_currCh ? STR_INSERTMIX : STR_EDITMIX);
|
TITLE(s_currCh ? STR_INSERTMIX : STR_EDITMIX);
|
||||||
MixData *md2 = mixaddress(s_currIdx) ;
|
MixData *md2 = mixaddress(s_currIdx) ;
|
||||||
putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0);
|
putsChn(lcdLastPos+1*FW, 0, md2->destCh+1,0);
|
||||||
|
|
||||||
#if defined(ROTARY_ENCODERS)
|
#if defined(ROTARY_ENCODERS)
|
||||||
#if defined(CURVES)
|
#if defined(CURVES)
|
||||||
|
|||||||
+3
-3
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
pgofs_t s_pgOfs;
|
vertpos_t s_pgOfs;
|
||||||
int8_t s_editMode;
|
int8_t s_editMode;
|
||||||
uint8_t s_noHi;
|
uint8_t s_noHi;
|
||||||
uint8_t s_noScroll;
|
uint8_t s_noScroll;
|
||||||
@@ -675,8 +675,8 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
|
|||||||
|
|
||||||
uint8_t max = menuTab ? LCD_LINES-1 : LCD_LINES-2;
|
uint8_t max = menuTab ? LCD_LINES-1 : LCD_LINES-2;
|
||||||
if (l_posVert<1) s_pgOfs=0;
|
if (l_posVert<1) s_pgOfs=0;
|
||||||
else if (l_posVert-s_pgOfs>max) s_pgOfs = l_posVert-max;
|
else if (l_posVert>max+s_pgOfs) s_pgOfs = l_posVert-max;
|
||||||
else if (l_posVert-s_pgOfs<1) s_pgOfs = l_posVert-1;
|
else if (l_posVert<1+s_pgOfs) s_pgOfs = l_posVert-1;
|
||||||
m_posVert = l_posVert;
|
m_posVert = l_posVert;
|
||||||
m_posHorz = l_posHorz;
|
m_posHorz = l_posHorz;
|
||||||
#if !defined(CPUM64)
|
#if !defined(CPUM64)
|
||||||
|
|||||||
+14
-21
@@ -73,13 +73,24 @@ inline void displayColumnHeader(const char **headers, uint8_t index)
|
|||||||
#define lcd_putsColumnLeft(x, y, str) lcd_putsLeft(y, str)
|
#define lcd_putsColumnLeft(x, y, str) lcd_putsLeft(y, str)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Menus related stuff ...
|
||||||
#if defined(SDCARD)
|
#if defined(SDCARD)
|
||||||
typedef uint16_t pgofs_t;
|
typedef uint16_t vertpos_t;
|
||||||
#else
|
#else
|
||||||
typedef uint8_t pgofs_t;
|
typedef uint8_t vertpos_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern pgofs_t s_pgOfs;
|
#if defined(PCBTARANIS)
|
||||||
|
typedef uint8_t & check_event_t;
|
||||||
|
#define horzpos_t int8_t
|
||||||
|
#else
|
||||||
|
typedef uint8_t check_event_t;
|
||||||
|
#define horzpos_t uint8_t
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern vertpos_t m_posVert;
|
||||||
|
extern horzpos_t m_posHorz;
|
||||||
|
extern vertpos_t s_pgOfs;
|
||||||
extern uint8_t s_noHi;
|
extern uint8_t s_noHi;
|
||||||
extern uint8_t s_noScroll;
|
extern uint8_t s_noScroll;
|
||||||
|
|
||||||
@@ -173,24 +184,6 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
|
|||||||
#define CHECK_INCDEC_GENVAR(event, var, min, max) \
|
#define CHECK_INCDEC_GENVAR(event, var, min, max) \
|
||||||
var = checkIncDecGen(event,var,min,max)
|
var = checkIncDecGen(event,var,min,max)
|
||||||
|
|
||||||
// Menus related stuff ...
|
|
||||||
#if defined(SDCARD)
|
|
||||||
#define vertpos_t uint16_t
|
|
||||||
#else
|
|
||||||
#define vertpos_t uint8_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(PCBTARANIS)
|
|
||||||
typedef uint8_t & check_event_t;
|
|
||||||
#define horzpos_t int8_t
|
|
||||||
#else
|
|
||||||
typedef uint8_t check_event_t;
|
|
||||||
#define horzpos_t uint8_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern vertpos_t m_posVert;
|
|
||||||
extern horzpos_t m_posHorz;
|
|
||||||
|
|
||||||
#if defined(PCBTARANIS)
|
#if defined(PCBTARANIS)
|
||||||
#define NAVIGATION_LINE_BY_LINE 0x40
|
#define NAVIGATION_LINE_BY_LINE 0x40
|
||||||
#else
|
#else
|
||||||
|
|||||||
Reference in New Issue
Block a user