Skip to content
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

Jump to bottom

Modify FrSky D-series telemetry for compatibility with Lua script #3116

Merged
merged 10 commits into from
Jun 22, 2018
Merged

Modify FrSky D-series telemetry for compatibility with Lua script #3116

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
66383c9
Modify FrSky D-series telemetry for compatibility with Lua script
alexeystn Apr 24, 2018
3372082
replace dummy values with real ones
alexeystn Apr 29, 2018
cbdfa31
Rename 'frsky.c/h' to 'frsky_d.c/h'
alexeystn May 6, 2018
aa55e7d
Move common code for FrSky D-series and SmartPort telemetry to the se…
alexeystn May 6, 2018
1e03838
Prevent 16-bit overflow
alexeystn May 7, 2018
f5b64d9
Fix formatting and comment
alexeystn May 9, 2018
13eaaa2
Resolve conflict with #3207 PR in smartport.c
alexeystn Jun 21, 2018
04479ae
Add Battery profile feature to frsky_d.c
alexeystn Jun 21, 2018
28303ac
Merge branch 'development' into frsky_d8_telemetry_lua_script
alexeystn Jun 21, 2018
e7faf25
Add frsky_d.c to source.mk
alexeystn Jun 21, 2018
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
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ HIGHEND_SRC = \
sensors/rangefinder.c \
sensors/opflow.c \
telemetry/crsf.c \
telemetry/frsky_d.c \
telemetry/frsky.c \
telemetry/hott.c \
telemetry/ibus_shared.c \
Expand Down
2 changes: 1 addition & 1 deletion src/main/fc/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ extern uint8_t __config_end;
#include "sensors/opflow.h"
#include "sensors/sensors.h"

#include "telemetry/frsky.h"
#include "telemetry/frsky_d.h"
#include "telemetry/telemetry.h"
#include "build/debug.h"

Expand Down
2 changes: 1 addition & 1 deletion src/main/fc/settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ groups:

- name: PG_TELEMETRY_CONFIG
type: telemetryConfig_t
headers: ["io/serial.h", "telemetry/telemetry.h", "telemetry/frsky.h"]
headers: ["io/serial.h", "telemetry/telemetry.h", "telemetry/frsky_d.h"]
condition: USE_TELEMETRY
members:
- name: telemetry_switch
Expand Down
Loading