From ccca6ed24fa620a0f4e2ce1f47648c329b5d1808 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 16 Mar 2012 23:52:25 +0000
Subject: [PATCH] Flash saving

---
 src/frsky.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index 94c26d6fb..79eaad289 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -911,18 +911,21 @@ void menuProcFrsky(uint8_t event)
       // The bars
       uint8_t bars_height = 5;
       for (int8_t i=3; i>=0; i--) {
-        if (g_model.frsky.bars[i].source && (51-g_model.frsky.bars[i].barMax) > g_model.frsky.bars[i].barMin) {
-          lcd_putsiAtt(0, bars_height+bars_height+1+i*(bars_height+6), STR_VTELEMCHNS, g_model.frsky.bars[i].source, 0);
+        uint8_t source = g_model.frsky.bars[i].source;
+        uint8_t bmin = g_model.frsky.bars[i].barMin * 5;
+        uint8_t bmax = (51 - g_model.frsky.bars[i].barMax) * 5;
+        if (source && bmax > bmin) {
+          lcd_putsiAtt(0, bars_height+bars_height+1+i*(bars_height+6), STR_VTELEMCHNS, source, 0);
           lcd_rect(25, bars_height+6+i*(bars_height+6), 101, bars_height+2);
-          uint16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+g_model.frsky.bars[i].source-1);
+          uint16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+source-1);
           uint16_t threshold = 0;
           uint8_t thresholdX = 0;
-          if (g_model.frsky.bars[i].source <= 2)
-            threshold = g_model.frsky.channels[g_model.frsky.bars[i].source-1].alarms_value[0];
+          if (source <= 2)
+            threshold = g_model.frsky.channels[source-1].alarms_value[0];
           else
-            threshold = convertTelemValue(g_model.frsky.bars[i].source, barsThresholds[g_model.frsky.bars[i].source-3]);
-          int16_t barMin = convertTelemValue(g_model.frsky.bars[i].source, (g_model.frsky.bars[i].barMin * 5));
-          int16_t barMax = convertTelemValue(g_model.frsky.bars[i].source, ((51 - g_model.frsky.bars[i].barMax) * 5));
+            threshold = convertTelemValue(source, barsThresholds[source-3]);
+          int16_t barMin = convertTelemValue(source, bmin);
+          int16_t barMax = convertTelemValue(source, bmax);
           if (threshold) {
             thresholdX = (uint8_t)(int16_t)((int16_t)100 * (threshold - barMin) / (barMax - barMin));
             if (thresholdX > 100)