Fix various compilation issues

This commit is contained in:
3djc
2019-02-04 17:39:25 +01:00
parent cc92d77579
commit aef3ff7473
5 changed files with 48 additions and 13 deletions
+34 -1
View File
@@ -59,6 +59,38 @@ enum MenuModelTelemetryFrskyItems {
ITEM_TELEMETRY_SENSOR30,
ITEM_TELEMETRY_SENSOR31,
ITEM_TELEMETRY_SENSOR32,
ITEM_TELEMETRY_SENSOR33,
ITEM_TELEMETRY_SENSOR34,
ITEM_TELEMETRY_SENSOR35,
ITEM_TELEMETRY_SENSOR36,
ITEM_TELEMETRY_SENSOR37,
ITEM_TELEMETRY_SENSOR38,
ITEM_TELEMETRY_SENSOR39,
ITEM_TELEMETRY_SENSOR40,
ITEM_TELEMETRY_SENSOR41,
ITEM_TELEMETRY_SENSOR42,
ITEM_TELEMETRY_SENSOR43,
ITEM_TELEMETRY_SENSOR44,
ITEM_TELEMETRY_SENSOR45,
ITEM_TELEMETRY_SENSOR46,
ITEM_TELEMETRY_SENSOR47,
ITEM_TELEMETRY_SENSOR48,
ITEM_TELEMETRY_SENSOR49,
ITEM_TELEMETRY_SENSOR50,
ITEM_TELEMETRY_SENSOR51,
ITEM_TELEMETRY_SENSOR52,
ITEM_TELEMETRY_SENSOR53,
ITEM_TELEMETRY_SENSOR54,
ITEM_TELEMETRY_SENSOR55,
ITEM_TELEMETRY_SENSOR56,
ITEM_TELEMETRY_SENSOR57,
ITEM_TELEMETRY_SENSOR58,
ITEM_TELEMETRY_SENSOR59,
ITEM_TELEMETRY_SENSOR60,
ITEM_TELEMETRY_SENSOR61,
ITEM_TELEMETRY_SENSOR62,
ITEM_TELEMETRY_SENSOR63,
ITEM_TELEMETRY_SENSOR64,
ITEM_TELEMETRY_DISCOVER_SENSORS,
ITEM_TELEMETRY_NEW_SENSOR,
ITEM_TELEMETRY_DELETE_ALL_SENSORS,
@@ -82,7 +114,8 @@ enum MenuModelTelemetryFrskyItems {
#define IS_RANGE_DEFINED(k) (g_model.frsky.channels[k].ratio > 0)
#define SENSOR_ROWS(x) (isTelemetryFieldAvailable(x) ? (uint8_t)0 : HIDDEN_ROW)
#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), SENSOR_ROWS(31), 0, 0, 0, 0,
#define SENSORS_ROWS LABEL(Sensors), SENSOR_ROWS(0), SENSOR_ROWS(1), SENSOR_ROWS(2), SENSOR_ROWS(3), SENSOR_ROWS(4), SENSOR_ROWS(5), SENSOR_ROWS(6), SENSOR_ROWS(7), SENSOR_ROWS(8), SENSOR_ROWS(9), SENSOR_ROWS(10), SENSOR_ROWS(11), SENSOR_ROWS(12), SENSOR_ROWS(13), SENSOR_ROWS(14), SENSOR_ROWS(15), SENSOR_ROWS(16), SENSOR_ROWS(17), SENSOR_ROWS(18), SENSOR_ROWS(19), SENSOR_ROWS(20), SENSOR_ROWS(21), SENSOR_ROWS(22), SENSOR_ROWS(23), SENSOR_ROWS(24), SENSOR_ROWS(25), SENSOR_ROWS(26), SENSOR_ROWS(27), SENSOR_ROWS(28), SENSOR_ROWS(29), SENSOR_ROWS(30), \
SENSOR_ROWS(31), SENSOR_ROWS(32), SENSOR_ROWS(33), SENSOR_ROWS(34), SENSOR_ROWS(35), SENSOR_ROWS(36), SENSOR_ROWS(37), SENSOR_ROWS(38), SENSOR_ROWS(39), SENSOR_ROWS(40),SENSOR_ROWS(41), SENSOR_ROWS(42), SENSOR_ROWS(43), SENSOR_ROWS(44), SENSOR_ROWS(45), SENSOR_ROWS(46), SENSOR_ROWS(47), SENSOR_ROWS(48), SENSOR_ROWS(49), SENSOR_ROWS(50),SENSOR_ROWS(51), SENSOR_ROWS(52), SENSOR_ROWS(53), SENSOR_ROWS(54), SENSOR_ROWS(55), SENSOR_ROWS(56), SENSOR_ROWS(57), SENSOR_ROWS(58), SENSOR_ROWS(59),SENSOR_ROWS(60),SENSOR_ROWS(61), SENSOR_ROWS(62), SENSOR_ROWS(63), 0, 0, 0, 0,
#if defined(VARIO)
#define VARIO_ROWS LABEL(Vario), 0, 1, 2,
#else