Skip to content

Added configuration of KISS ESC Telemetry #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2016
Merged

Added configuration of KISS ESC Telemetry #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aa40f1
Added configuration of KISS ESC Telemetry
basdelfos Nov 17, 2016
2fb9a87
Added version gating (check on BF 3.1.0)
basdelfos Nov 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions _locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,9 @@
"featureBLACKBOXTip": {
"message": "Configure via the BlackBox tab after enabling."
},
"featureESC_TELEMETRY": {
"message": "KISS ESC 24A telemetry support"
},
"featureCHANNEL_FORWARDING": {
"message": "Forward aux channels to servo outputs"
},
Expand Down Expand Up @@ -777,6 +780,9 @@
"portsFunction_TELEMETRY_SMARTPORT": {
"message": "SmartPort"
},
"portsFunction_TELEMETRY_ESC": {
"message": "ESC telemetry"
},
"portsFunction_RX_SERIAL": {
"message": "Serial RX"
},
Expand Down Expand Up @@ -1114,7 +1120,7 @@
"adjustmentsFunction21": {
"message": "RC Rate Yaw"
},

"adjustmentsSave": {
"message": "Save"
},
Expand Down Expand Up @@ -1857,25 +1863,25 @@
"message": "Blackbox logging device"
},
"onboardLoggingRateOfLogging": {
"message": "Blackbox logging rate"
"message": "Blackbox logging rate"
},
"onboardLoggingSerialLogger": {
"message": "Outboard serial logging device"
"message": "Outboard serial logging device"
},
"onboardLoggingFlashLogger": {
"message": "Onboard dataflash chip"
"message": "Onboard dataflash chip"
},
"onboardLoggingEraseInProgress": {
"message": "Erase in progress, please wait..."
"message": "Erase in progress, please wait..."
},
"onboardLoggingOnboardSDCard": {
"message": "Onboard SD card"
}








Expand Down
6 changes: 6 additions & 0 deletions js/Features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ var Features = function (config) {
{bit: 18, group: 'other', name: 'OSD'}
);
}

if (semver.gte(config.flightControllerVersion, "3.1.0")) {
features.push(
{bit: 27, group: 'other', name: 'ESC_TELEMETRY'}
)
}
}

self._features = features;
Expand Down
Loading