Cell introduced in Custom Switches

This commit is contained in:
bsongis
2012-03-16 20:10:22 +00:00
parent 9add1b4326
commit 46cffb0660
3 changed files with 7 additions and 6 deletions
+2 -2
View File
@@ -2005,7 +2005,7 @@ void menuProcTelemetry(uint8_t event)
uint8_t value = getTelemCustomField(j, k);
lcd_putsiAtt(k==0?4:TELEM_COL2, y, STR_VTELEMCHNS, value, (sub==subN && m_posHorz==k) ? blink : 0);
if (sub==subN && m_posHorz==k && (s_editMode>0 || p1valdiff)) {
CHECK_INCDEC_MODELVAR(event, value, 0, (j==3 && k==0) ? STATUS_MAX : DISPLAY_MAX);
CHECK_INCDEC_MODELVAR(event, value, 0, (j==3 && k==0) ? TELEM_STATUS_MAX : TELEM_DISPLAY_MAX);
if (checkIncDec_Ret) {
uint8_t mask = 1 << (2*j+k);
if (value & 1)
@@ -2042,7 +2042,7 @@ void menuProcTelemetry(uint8_t event)
if (sub==subN && (s_editMode>0 || p1valdiff)) {
switch (m_posHorz) {
case 0:
CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].source, 0, BAR_MAX);
CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].source, 0, TELEM_BAR_MAX);
break;
case 1:
CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].barMin, 0, 50-g_model.frsky.bars[j].barMax);
+4 -3
View File
@@ -301,9 +301,10 @@ enum TelemetrySource {
TELEM_ACC,
TELEM_GPS_TIME,
BAR_MAX = TELEM_CELL,
DISPLAY_MAX = TELEM_TM2,
STATUS_MAX = TELEM_GPS_TIME
TELEM_BAR_MAX = TELEM_CELL,
TELEM_CSW_MAX = TELEM_CELL,
TELEM_DISPLAY_MAX = TELEM_TM2,
TELEM_STATUS_MAX = TELEM_GPS_TIME
};
PACK(typedef struct t_FrSkyBarData {
+1 -1
View File
@@ -342,7 +342,7 @@ enum EnumKeys {
#define CSW_CHOUT_BASE (CSW_PPM_BASE+NUM_PPM)
#if defined(FRSKY_HUB)
#define NUM_TELEMETRY 9
#define NUM_TELEMETRY TELEM_CSW_MAX
#elif defined(WS_HOW_HIGH)
#define NUM_TELEMETRY 3
#elif defined(FRSKY)