Update DONATIONS.txt

* negative altitude on top bar was displayed wrong (same bug affected vertical speed)
* add ability to select an altitude sensor with ft unit for top bar
* display actual sensor unit for top bar altitude

DONATIONS.txt

@@ -845,3 +845,6 @@ Robert Nicoll
 Dan Nixon
 Ewald Moehring
 Giovanni Carnesecchi 
+Paul Dumsday
+Tadeusz Adamowski
+Andrew Newton

companion/releasenotes.txt

@@ -1,3 +1,11 @@
+<h2>Version 2.1.6 / 2015-11-11</h2>
+[Taranis]
+<ul>
+<li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
+<li>Hide D8/LR12 when eu firmware option is selected</li>
+</ul>
+
+
 <h2>Version 2.1.5 / 2015-11-05</h2>
 
 Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
@@ -24,7 +32,6 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 </ul>
 
 
-
 <h2>Version 2.1.3 / 2015-09-09</h2>
 
 <ul>

companion/src/CMakeLists.txt

@@ -2,7 +2,7 @@ PROJECT( companion )
 
 SET(C9X_VERSION_MAJOR "2")
 SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "5")
+SET(C9X_VERSION_REVISION "6")
 SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 
 SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -824,9 +824,10 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
         switch (proto) {
           case PULSES_OFF:
           case PULSES_PXX_XJT_X16:
+            return 1;
           case PULSES_PXX_XJT_D8:
           case PULSES_PXX_XJT_LR12:
-            return 1;
+            return id.contains("eu") ? 0 : 1;
           case PULSES_PPM:
             return id.contains("internalppm") ? 1 : 0;
           default:

companion/src/modeledit/telemetry.cpp

@@ -745,6 +745,7 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     TelemetryCustomScreen * tab = new TelemetryCustomScreen(this, model, model.frsky.screens[i], generalSettings, firmware);
     ui->customScreens->addTab(tab, tr("Telemetry screen %1").arg(i+1));
     telemetryCustomScreens[i] = tab;
+    connect(tab, SIGNAL(modified()), this, SLOT(onModified()));
   }
 
   disableMouseScrolling();

radio/releasenotes.txt

@@ -1,3 +1,11 @@
+<h2>Version 2.1.6 / 2015-11-11</h2>
+[Taranis]
+<ul>
+<li>Fix for some X9E units which could not shutdown properly</li>
+<li>Fixed a bug with negative altitudes in the Top bar (<a href=https://github.com/opentx/opentx/issues/3047>#3047</a>)</li>
+</ul>
+
+
 <h2>Version 2.1.5 / 2015-11-05</h2>
 
 Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4

radio/src/Makefile

@@ -395,7 +395,7 @@ IMG2LBM = -$(PYTHON) ../util/img2lbm.py
 BIN2LBM = -$(PYTHON) ../util/bin2lbm.py
 FONT2PNG = -$(PYTHON) ../util/font2png.py
 TRANSLATE = -$(PYTHON) ../util/translate.py
-VERSION = 2.1.5$(OPENTX_VERSION_SUFFIX)
+VERSION = 2.1.6$(OPENTX_VERSION_SUFFIX)
 
 THIRDPARTY = thirdparty
 COOSDIR = $(THIRDPARTY)/CoOS

radio/src/gui/Taranis/menu_model_telemetry.cpp

@@ -164,12 +164,8 @@ enum SensorFields {
 
 bool isSensorUnit(int sensor, uint8_t unit)
 {
-  if (sensor == 0)
-    return true;
-
-  sensor -= 1;
-
-  return g_model.telemetrySensors[sensor].unit == unit;
+  if (sensor <= 0 || sensor > MAX_SENSORS ) return true;
+  return g_model.telemetrySensors[--sensor].unit == unit;
 }
 
 bool isCellsSensor(int sensor)
@@ -184,7 +180,7 @@ bool isGPSSensor(int sensor)
 
 bool isAltSensor(int sensor)
 {
-  return isSensorUnit(sensor, UNIT_DIST);
+  return isSensorUnit(sensor, UNIT_DIST) || isSensorUnit(sensor, UNIT_FEET);
 }
 
 bool isVoltsSensor(int sensor)

radio/src/gui/Taranis/view_main.cpp

@@ -254,7 +254,7 @@ void displayTopBar()
         if (altitudeItem.isAvailable()) {
           LCD_ICON(altitude_icon_x, BAR_Y, ICON_ALTITUDE);
           int32_t value = altitudeItem.value / g_model.telemetrySensors[item].getPrecDivisor();
-          putsValueWithUnit(altitude_icon_x+2*FW-1, BAR_Y+1, value, UNIT_METERS, LEFT);
+          putsValueWithUnit(altitude_icon_x+2*FW-1, BAR_Y+1, value, g_model.telemetrySensors[item].unit, LEFT);
         }
       }
     }

radio/src/myeeprom.h

@@ -1317,8 +1317,8 @@ PACK(typedef struct {
   int32_t getValue(int32_t value, uint8_t unit, uint8_t prec) const;
   bool isConfigurable() const;
   bool isPrecConfigurable() const;
-  uint32_t getPrecMultiplier() const;
-  uint32_t getPrecDivisor() const;
+  int32_t getPrecMultiplier() const;
+  int32_t getPrecDivisor() const;
 }) TelemetrySensor;
 #endif
 

radio/src/targets/taranis/board_taranis.cpp

@@ -131,7 +131,11 @@ void boardInit()
   RCC_APB1PeriphClockCmd(LCD_RCC_APB1Periph | BACKLIGHT_RCC_APB1Periph | INTERRUPT_5MS_APB1Periph | TIMER_2MHz_APB1Periph | I2C_RCC_APB1Periph | SD_RCC_APB1Periph | TRAINER_RCC_APB1Periph | TELEMETRY_RCC_APB1Periph | SERIAL_RCC_APB1Periph, ENABLE);
   RCC_APB2PeriphClockCmd(BACKLIGHT_RCC_APB2Periph | ADC_RCC_APB2Periph | HAPTIC_RCC_APB2Periph | INTMODULE_RCC_APB2Periph | EXTMODULE_RCC_APB2Periph | HEARTBEAT_RCC_APB2Periph, ENABLE);
 
+#if !defined(REV9E)
+  // some REV9E boards need that the pwrInit() is moved a little bit later
   pwrInit();
+#endif
+
   keysInit();
   adcInit();
   delaysInit();
@@ -179,6 +183,7 @@ void boardInit()
       else {
         if (pwr_on != 1) {
           pwr_on = 1;
+          pwrInit();
           backlightInit();
           haptic.play(15, 3, PLAY_NOW);
         }
@@ -191,6 +196,7 @@ void boardInit()
     }
   }
   else {
+    pwrInit();
     backlightInit();
   }
   topLcdInit();

radio/src/telemetry/telemetry.cpp

@@ -647,14 +647,18 @@ bool TelemetrySensor::isPrecConfigurable() const
   }
 }
 
-uint32_t TelemetrySensor::getPrecMultiplier() const
+int32_t TelemetrySensor::getPrecMultiplier() const
 {
+  /*
+    Important: the return type must be signed, otherwise
+    mathematic operations with a negative telemetry value won't work
+  */
   if (prec == 2) return 1;
   if (prec == 1) return 10;
   return 100;
 }
 
-uint32_t TelemetrySensor::getPrecDivisor() const
+int32_t TelemetrySensor::getPrecDivisor() const
 {
   if (prec == 2) return 100;
   if (prec == 1) return 10;