rebase to master

Author: error414

src/main/rx/crsf.h

@@ -88,6 +88,7 @@ typedef enum {
     CRSF_FRAMETYPE_VARIO_SENSOR = 0x07,
     CRSF_FRAMETYPE_BATTERY_SENSOR = 0x08,
     CRSF_FRAMETYPE_BAROMETER_ALTITUDE = 0x09,
+    CRSF_FRAMETYPE_HEARTBEAT = 0x0B,
     CRSF_FRAMETYPE_LINK_STATISTICS = 0x14,
     CRSF_FRAMETYPE_RC_CHANNELS_PACKED = 0x16,
     CRSF_FRAMETYPE_ATTITUDE = 0x1E,

src/main/telemetry/crsf.c

@@ -373,6 +373,9 @@ static telemetrySensor_t crsfNativeTelemetrySensors[] =
 #ifdef USE_BARO
     TLM_SENSOR(ALTITUDE,                0,  100,  100,  0,  Nil),
 #endif
+#if defined(USE_BARO) || defined(USE_GPS)
+    TLM_SENSOR(VARIOMETER,              0,  100,  100,  0,  Nil),
+#endif
 #ifdef USE_GPS
     TLM_SENSOR(GPS,                     0,  100,  100,  0,  Nil),
 #endif