LIMITS menu adjustments

This commit is contained in:
bsongis
2012-04-17 09:20:42 +00:00
parent 2a4158d878
commit 224bed6872
2 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ SPLASH = YES
# PPM center adjustable # PPM center adjustable
# Values = YES, NO # Values = YES, NO
PPM_CENTER_ADJUSTABLE = YES PPM_CENTER_ADJUSTABLE = NO
# Limits display in the LIMITS # Limits display in the LIMITS
# Values = PERCENT, US # Values = PERCENT, US
+7 -4
View File
@@ -1696,8 +1696,11 @@ void menuProcLimits(uint8_t event)
} }
LimitData *ld = limitaddress(k) ; LimitData *ld = limitaddress(k) ;
#ifndef PPM_CENTER_ADJUSTABLE #ifdef PPM_CENTER_ADJUSTABLE
#define LIMITS_MAX_POS 16*FW
#else
#define LIMITS_MAX_POS 17*FW
int16_t v = (ld->revert) ? -ld->offset : ld->offset; int16_t v = (ld->revert) ? -ld->offset : ld->offset;
char swVal = '-'; // '-', '<', '>' char swVal = '-'; // '-', '<', '>'
@@ -1718,7 +1721,7 @@ void menuProcLimits(uint8_t event)
{ {
case 0: case 0:
#ifdef PPM_LIMITS_UNIT_US #ifdef PPM_LIMITS_UNIT_US
lcd_outdezAtt( 8*FW, y, ((ld->offset)*128) / 25, attr|PREC1); lcd_outdezAtt( 8*FW, y, ((int32_t)ld->offset*128) / 25, attr|PREC1);
#else #else
lcd_outdezAtt( 8*FW, y, ld->offset, attr|PREC1); lcd_outdezAtt( 8*FW, y, ld->offset, attr|PREC1);
#endif #endif
@@ -1746,7 +1749,7 @@ void menuProcLimits(uint8_t event)
#ifdef PPM_LIMITS_UNIT_US #ifdef PPM_LIMITS_UNIT_US
lcd_outdezAtt(16*FW, y, (((int16_t)ld->max+100)*128) / 25, attr | INFLIGHT(ld->max)); lcd_outdezAtt(16*FW, y, (((int16_t)ld->max+100)*128) / 25, attr | INFLIGHT(ld->max));
#else #else
lcd_outdezAtt(17*FW, y, (int8_t)(ld->max+100), attr | INFLIGHT(ld->max)); lcd_outdezAtt(LIMITS_MAX_POS, y, (int8_t)(ld->max+100), attr | INFLIGHT(ld->max));
#endif #endif
if (active) { if (active) {
CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->max, -25, limit, -100, STR_MAXLIMIT); CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->max, -25, limit, -100, STR_MAXLIMIT);