Skip to content

Commit 64e7f8e

Browse files
authored
Merge pull request #343 from basdelfos/esc_telemetry
Added configuration of KISS ESC Telemetry
2 parents 0123388 + 2fb9a87 commit 64e7f8e

File tree

4 files changed

+152
-134
lines changed

4 files changed

+152
-134
lines changed

_locales/en/messages.json

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,9 @@
527527
"featureBLACKBOXTip": {
528528
"message": "Configure via the BlackBox tab after enabling."
529529
},
530+
"featureESC_TELEMETRY": {
531+
"message": "KISS ESC 24A telemetry support"
532+
},
530533
"featureCHANNEL_FORWARDING": {
531534
"message": "Forward aux channels to servo outputs"
532535
},
@@ -777,6 +780,9 @@
777780
"portsFunction_TELEMETRY_SMARTPORT": {
778781
"message": "SmartPort"
779782
},
783+
"portsFunction_TELEMETRY_ESC": {
784+
"message": "ESC telemetry"
785+
},
780786
"portsFunction_RX_SERIAL": {
781787
"message": "Serial RX"
782788
},
@@ -1114,7 +1120,7 @@
11141120
"adjustmentsFunction21": {
11151121
"message": "RC Rate Yaw"
11161122
},
1117-
1123+
11181124
"adjustmentsSave": {
11191125
"message": "Save"
11201126
},
@@ -1857,25 +1863,25 @@
18571863
"message": "Blackbox logging device"
18581864
},
18591865
"onboardLoggingRateOfLogging": {
1860-
"message": "Blackbox logging rate"
1866+
"message": "Blackbox logging rate"
18611867
},
18621868
"onboardLoggingSerialLogger": {
1863-
"message": "Outboard serial logging device"
1869+
"message": "Outboard serial logging device"
18641870
},
18651871
"onboardLoggingFlashLogger": {
1866-
"message": "Onboard dataflash chip"
1872+
"message": "Onboard dataflash chip"
18671873
},
18681874
"onboardLoggingEraseInProgress": {
1869-
"message": "Erase in progress, please wait..."
1875+
"message": "Erase in progress, please wait..."
18701876
},
18711877
"onboardLoggingOnboardSDCard": {
18721878
"message": "Onboard SD card"
18731879
}
1874-
1875-
1876-
1877-
1878-
1880+
1881+
1882+
1883+
1884+
18791885

18801886

18811887

js/Features.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ var Features = function (config) {
6464
{bit: 18, group: 'other', name: 'OSD'}
6565
);
6666
}
67+
68+
if (semver.gte(config.flightControllerVersion, "3.1.0")) {
69+
features.push(
70+
{bit: 27, group: 'other', name: 'ESC_TELEMETRY'}
71+
)
72+
}
6773
}
6874

6975
self._features = features;

0 commit comments

Comments
 (0)