From 224bed6872207c5ea77a41107127a8ea2b89e305 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 17 Apr 2012 09:20:42 +0000
Subject: [PATCH] LIMITS menu adjustments

---
 src/Makefile        |  2 +-
 src/model_menus.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 575aa7361..5d3ef8c24 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,7 +65,7 @@ SPLASH = YES
 
 # PPM center adjustable
 # Values = YES, NO
-PPM_CENTER_ADJUSTABLE = YES
+PPM_CENTER_ADJUSTABLE = NO
 
 # Limits display in the LIMITS
 # Values = PERCENT, US
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 834a45199..a2049f4af 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -1696,8 +1696,11 @@ void menuProcLimits(uint8_t event)
     }
 
     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;
 
     char swVal = '-';  // '-', '<', '>'
@@ -1718,7 +1721,7 @@ void menuProcLimits(uint8_t event)
       {
         case 0:
 #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
           lcd_outdezAtt(  8*FW, y,  ld->offset, attr|PREC1);
 #endif
@@ -1746,7 +1749,7 @@ void menuProcLimits(uint8_t event)
 #ifdef PPM_LIMITS_UNIT_US
           lcd_outdezAtt(16*FW, y, (((int16_t)ld->max+100)*128) / 25, attr | INFLIGHT(ld->max));
 #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
           if (active) {
             CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->max, -25, limit, -100, STR_MAXLIMIT);