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

[gruvin9x, sky9x] Issue 64 fixed. It's now possible to have AUDIO=YES and BEEPER=YES

Browse Source 
[all] Issue 32 fixed (AUTOSOURCE option added)
[all] Issue 226 fixed (Menu in main views / telemetry views)
[all] Issue 226 fixed (Imperial bug with playValue)
[sky9x] Issue 234 fixed (rotary encoder inverted)
[sky9x / Taranis] Bug with AUDIO stopped when selecting Background Music without a file
[all except M64] Shift in Telemetry sources when !GVARS
This commit is contained in:
bsongis@gmail.com
2013-04-03 21:25:10 +00:00
parent e2df5ef0ed
commit 68f6d68138
29 changed files with 365 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menus.cpp
+39
View File
@@ -179,6 +179,37 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
}
#endif
#if defined(AUTOSOURCE)
if (i_flags & INCDEC_SOURCE) {
if (s_editMode>0) {
int8_t source = getMovedSource();
if (source) {
newval = MIXSRC_Rud - 1 + source;
}
#if defined(AUTOSWITCH)
source = abs(getMovedSwitch());
if (source) {
#if defined(PCBTARANIS)
if (source <= 5*3)
newval = MIXSRC_FIRST_SWITCH + (source-1) / 3;
else if (source <= 17)
newval = MIXSRC_SF;
else if (source <= 20)
newval = MIXSRC_SG;
else
newval = MIXSRC_SH;
#else
if (source <= 3)
newval = MIXSRC_3POS;
else
newval = MIXSRC_FIRST_SWITCH - 3 + source;
#endif
}
#endif
}
}
#endif
if (newval > i_max || newval < i_min) {
newval = (newval > i_max ? i_max : i_min);
killEvents(event);
@@ -648,6 +679,14 @@ bool check(check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t
else if (l_posVert-s_pgOfs<1) s_pgOfs = l_posVert-1;
m_posVert = l_posVert;
m_posHorz = l_posHorz;
#if !defined(CPUM64)
// cosmetics on 9x
if (s_pgOfs > 0) {
l_posVert--;
if (l_posVert == s_pgOfs && MAXCOL(l_posVert) == (uint8_t)-1)
s_pgOfs = l_posVert-1;
}
#endif
return true;
}