From cd9c17e1f4c254340b18507609debcba2bbad364 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 6 May 2016 10:21:32 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/gui/9x/menu_model_telemetry.cpp | 14 +++++++-------
 radio/src/storage/eeprom_conversions.cpp  |  3 +--
 radio/src/telemetry/frsky.h               | 16 ++++++++--------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/radio/src/gui/9x/menu_model_telemetry.cpp b/radio/src/gui/9x/menu_model_telemetry.cpp
index 7b6883b1c..1c8e298f2 100644
--- a/radio/src/gui/9x/menu_model_telemetry.cpp
+++ b/radio/src/gui/9x/menu_model_telemetry.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 enum menuModelTelemetryItems {
   CASE_CPUARM(ITEM_TELEMETRY_PROTOCOL_TYPE)
@@ -411,7 +411,7 @@ void menuModelSensor(uint8_t event)
       case SENSOR_FIELD_AUTOOFFSET:
         ON_OFF_MENU_ITEM(sensor->autoOffset, SENSOR_2ND_COLUMN, y, STR_AUTOOFFSET, attr, event);
         break;
-        
+
       case SENSOR_FIELD_ONLYPOSITIVE:
         ON_OFF_MENU_ITEM(sensor->onlyPositive, SENSOR_2ND_COLUMN, y, STR_ONLYPOSITIVE, attr, event);
         break;
@@ -419,7 +419,7 @@ void menuModelSensor(uint8_t event)
       case SENSOR_FIELD_FILTER:
         ON_OFF_MENU_ITEM(sensor->filter, SENSOR_2ND_COLUMN, y, STR_FILTER, attr, event);
         break;
-        
+
       case SENSOR_FIELD_PERSISTENT:
         ON_OFF_MENU_ITEM(sensor->persistent, SENSOR_2ND_COLUMN, y, NO_INDENT(STR_PERSISTENT), attr, event);
         break;
@@ -450,7 +450,7 @@ void onSensorMenu(const char *result)
     }
     else if (result == STR_COPY) {
       int newIndex = availableTelemetryIndex();
-      
+
       if (newIndex >= 0) {
         TelemetrySensor & sourceSensor = g_model.telemetrySensors[index];
         TelemetrySensor & newSensor = g_model.telemetrySensors[newIndex];
@@ -459,7 +459,7 @@ void onSensorMenu(const char *result)
         TelemetryItem & newItem = telemetryItems[newIndex];
         newItem = sourceItem;
         storageDirty(EE_MODEL);
-      } 
+      }
       else {
         POPUP_WARNING(STR_TELEMETRYFULL);
       }
@@ -597,7 +597,7 @@ void menuModelTelemetry(uint8_t event)
           killEvents(KEY_ENTER);
           POPUP_CONFIRMATION(STR_CONFIRMDELETE);
         }
-        break;       
+        break;
 
       case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE:
         ON_OFF_MENU_ITEM(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event);
diff --git a/radio/src/storage/eeprom_conversions.cpp b/radio/src/storage/eeprom_conversions.cpp
index 2c2c55eb2..ec97da951 100644
--- a/radio/src/storage/eeprom_conversions.cpp
+++ b/radio/src/storage/eeprom_conversions.cpp
@@ -1201,9 +1201,8 @@ void ConvertModel_217_to_218(ModelData & model)
   memcpy(newModel.potsWarnPosition, oldModel.potsWarnPosition, sizeof(newModel.potsWarnPosition));
   for (int i=0; i<MAX_SENSORS; i++) {
     newModel.telemetrySensors[i] = oldModel.telemetrySensors[i];
-    if (newModel.telemetrySensors[i].unit > UNIT_WATTS) {
+    if (newModel.telemetrySensors[i].unit > UNIT_WATTS)
       newModel.telemetrySensors[i].unit += 1;
-    }
   }
 #if defined(PCBTARANIS) && defined(REV9E)
   newModel.toplcdTimer = oldModel.toplcdTimer;
diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h
index a405b3663..122d88238 100644
--- a/radio/src/telemetry/frsky.h
+++ b/radio/src/telemetry/frsky.h
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -87,7 +87,7 @@
 #define D_A2_ID                   0xF2
 
 #define VFAS_D_HIPREC_OFFSET      2000
- 
+
 
 // FrSky new DATA IDs (2 bytes)
 #define ALT_FIRST_ID              0x0100
@@ -383,17 +383,17 @@ enum AlarmLevel {
 #define TELEMETRY_CELL_VOLTAGE(k)         (telemetryData.hub.cellVolts[k] * TELEMETRY_CELL_VOLTAGE_MUTLIPLIER)
 #define TELEMETRY_MIN_CELL_VOLTAGE        (telemetryData.hub.minCellVolts * TELEMETRY_CELL_VOLTAGE_MUTLIPLIER)
 
-#define START_STOP              0x7e
-#define BYTESTUFF               0x7d
-#define STUFF_MASK              0x20
+#define START_STOP                        0x7e
+#define BYTESTUFF                         0x7d
+#define STUFF_MASK                        0x20
 
 #if defined(CPUARM)
   #define frskySendAlarms()
 #else
-  #define SEND_RSSI_ALARMS  6
-  #define SEND_MODEL_ALARMS 4
+  #define SEND_RSSI_ALARMS                6
+  #define SEND_MODEL_ALARMS               4
   extern uint8_t frskyAlarmsSendState;
-  #define FRSKY_TX_PACKET_SIZE 12
+  #define FRSKY_TX_PACKET_SIZE            12
   extern uint8_t frskyTxBuffer[FRSKY_TX_PACKET_SIZE];
   extern uint8_t frskyTxBufferCount;
   inline void frskySendAlarms(void)