Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2021-04-06 09:40:48 +02:00
141 changed files with 5093 additions and 3760 deletions
+3 -2
View File
@@ -278,6 +278,7 @@ enum TelemetryProtocol
PROTOCOL_TELEMETRY_FLYSKY_IBUS,
PROTOCOL_TELEMETRY_HITEC,
PROTOCOL_TELEMETRY_HOTT,
PROTOCOL_TELEMETRY_MLINK,
PROTOCOL_TELEMETRY_MULTIMODULE,
PROTOCOL_TELEMETRY_AFHDS3,
PROTOCOL_TELEMETRY_GHOST,
@@ -318,8 +319,8 @@ enum TelemetryUnit {
UNIT_HERTZ,
UNIT_MS,
UNIT_US,
UNIT_MAX = UNIT_US,
UNIT_SPARE4,
UNIT_KM,
UNIT_MAX = UNIT_KM,
UNIT_SPARE5,
UNIT_SPARE6,
UNIT_SPARE7,