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

FrSky new sensors support #5766

Merged
merged 4 commits into from Mar 17, 2018
Merged

FrSky new sensors support #5766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfe26b5
FrSky new ESC sensor support
bsongis Mar 14, 2018
32093d0
Add further sensors
3djc Mar 15, 2018
f813422
Add translations
3djc Mar 15, 2018
f7266fc
Bertrand's comments
3djc Mar 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions radio/src/telemetry/frsky.h
View file
Open in desktop
Expand Up @@ -151,6 +151,24 @@ enum FrSkyDataState {
#define RBOX_STATE_LAST_ID 0x0b2f
#define RBOX_CNSP_FIRST_ID 0x0b30
#define RBOX_CNSP_LAST_ID 0x0b3f
#define SD1_FIRST_ID 0x0b40
#define SD1_LAST_ID 0x0b4f
#define ESC_POWER_FIRST_ID 0x0b50
#define ESC_POWER_LAST_ID 0x0b5f
#define ESC_RPM_CONS_FIRST_ID 0x0b60
#define ESC_RPM_CONS_LAST_ID 0x0b6f
#define ESC_TEMPERATURE_FIRST_ID 0x0b70
#define ESC_TEMPERATURE_LAST_ID 0x0b7f
#define X8R_FIRST_ID 0x0c20
#define X8R_LAST_ID 0x0c2f
#define S6R_FIRST_ID 0x0c30
#define S6R_LAST_ID 0x0c3f
#define GASSUIT_TEMP_FIRST_ID 0x0d00
#define GASSUIT_TEMP_LAST_ID 0x0d0f
#define GASSUIT_SPEED_FIRST_ID 0x0d10
#define GASSUIT_SPEED_LAST_ID 0x0d1f
#define GASSUIT_FUEL_FIRST_ID 0x0d20
#define GASSUIT_FUEL_LAST_ID 0x0d2f
#define DIY_FIRST_ID 0x5000
#define DIY_LAST_ID 0x52ff
#define DIY_STREAM_FIRST_ID 0x5000
Expand Down
24 changes: 24 additions & 0 deletions radio/src/telemetry/frsky_sport.cpp
View file
Open in desktop
Expand Up @@ -63,6 +63,17 @@ const FrSkySportSensor sportSensors[] = {
{ RBOX_CNSP_FIRST_ID, RBOX_CNSP_LAST_ID, 1, ZSTR_BATT2_CONSUMPTION, UNIT_MAH, 0 },
{ RBOX_STATE_FIRST_ID, RBOX_STATE_LAST_ID, 0, ZSTR_CHANS_STATE, UNIT_BITFIELD, 0 },
{ RBOX_STATE_FIRST_ID, RBOX_STATE_LAST_ID, 1, ZSTR_RB_STATE, UNIT_BITFIELD, 0 },
{ SD1_FIRST_ID, SD1_LAST_ID, 0, ZSTR_SD1_CHANNEL, UNIT_RAW, 0 },
{ ESC_POWER_FIRST_ID, ESC_POWER_LAST_ID, 0, ZSTR_ESC_VOLTAGE, UNIT_VOLTS, 2 },
{ ESC_POWER_FIRST_ID, ESC_POWER_LAST_ID, 1, ZSTR_ESC_CURRENT, UNIT_AMPS, 2 },
{ ESC_RPM_CONS_FIRST_ID, ESC_RPM_CONS_LAST_ID, 0, ZSTR_ESC_RPM, UNIT_RPMS, 0 },
{ ESC_RPM_CONS_FIRST_ID, ESC_RPM_CONS_LAST_ID, 1, ZSTR_ESC_CONSUMPTION, UNIT_MAH, 0 },
{ ESC_TEMPERATURE_FIRST_ID, ESC_TEMPERATURE_LAST_ID, 0, ZSTR_ESC_TEMP, UNIT_CELSIUS, 0 },
{ GASSUIT_TEMP_FIRST_ID, GASSUIT_TEMP_LAST_ID, 0, ZSTR_GASSUIT_TEMP1, UNIT_CELSIUS, 0 },
{ GASSUIT_TEMP_FIRST_ID, GASSUIT_TEMP_LAST_ID, 1, ZSTR_GASSUIT_TEMP2, UNIT_CELSIUS, 0 },
{ GASSUIT_SPEED_FIRST_ID, GASSUIT_SPEED_LAST_ID, 0, ZSTR_GASSUIT_RPM, UNIT_RPMS, 0 },
{ GASSUIT_FUEL_FIRST_ID, GASSUIT_FUEL_LAST_ID, 0, ZSTR_GASSUIT_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion
{ GASSUIT_FUEL_FIRST_ID, GASSUIT_FUEL_LAST_ID, 1, ZSTR_GASSUIT_CONS, UNIT_MILLILITERS, 0 },
{ 0, 0, 0, NULL, UNIT_RAW, 0 } // sentinel
};

Expand Down Expand Up @@ -210,6 +221,19 @@ void sportProcessTelemetryPacket(const uint8_t * packet)
sportProcessTelemetryPacket(id, 0, instance, servosState);
sportProcessTelemetryPacket(id, 1, instance, rboxState);
}
else if (id >= ESC_POWER_FIRST_ID && id <= ESC_RPM_CONS_LAST_ID) {
// 2 sensors (POWER and RPM_CONS)
sportProcessTelemetryPacket(id, 0, instance, data & 0xffff);
sportProcessTelemetryPacket(id, 1, instance, data >> 16);
}
else if (id >= ESC_TEMPERATURE_FIRST_ID && id <= ESC_TEMPERATURE_LAST_ID) {
sportProcessTelemetryPacket(id, 0, instance, data & 0x00ff);
}
else if (id >= GASSUIT_TEMP_FIRST_ID && id <= GASSUIT_FUEL_LAST_ID) {
// 2 sensors
sportProcessTelemetryPacket(id, 0, instance, data & 0xffff);
sportProcessTelemetryPacket(id, 1, instance, data >> 16);
}
else if (id >= DIY_STREAM_FIRST_ID && id <= DIY_STREAM_LAST_ID) {
#if defined(LUA)
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) {
Expand Down
11 changes: 11 additions & 0 deletions radio/src/translations/cz.h.txt
View file
Open in desktop
Expand Up @@ -1366,3 +1366,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/de.h.txt
View file
Open in desktop
Expand Up @@ -1374,3 +1374,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/en.h.txt
View file
Open in desktop
Expand Up @@ -1372,3 +1372,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/es.h.txt
View file
Open in desktop
Expand Up @@ -1344,3 +1344,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/fi.h.txt
View file
Open in desktop
Expand Up @@ -1334,3 +1334,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/fr.h.txt
View file
Open in desktop
Expand Up @@ -1373,3 +1373,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/it.h.txt
View file
Open in desktop
Expand Up @@ -1370,3 +1370,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/nl.h.txt
View file
Open in desktop
Expand Up @@ -1367,3 +1367,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/pl.h.txt
View file
Open in desktop
Expand Up @@ -1373,3 +1373,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/pt.h.txt
View file
Open in desktop
Expand Up @@ -1347,3 +1347,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
11 changes: 11 additions & 0 deletions radio/src/translations/se.h.txt
View file
Open in desktop
Expand Up @@ -1380,3 +1380,14 @@
#define ZSTR_GATE_NUMBER "Gate"
#define ZSTR_LAP_TIME "LapT"
#define ZSTR_GATE_TIME "GteT"
#define ZSTR_ESC_VOLTAGE "EscV"
#define ZSTR_ESC_CURRENT "EscA"
#define ZSTR_ESC_RPM "EscR"
#define ZSTR_ESC_CONSUMPTION "EscC"
#define ZSTR_ESC_TEMP "EscT"
#define ZSTR_SD1_CHANNEL "Chan"
#define ZSTR_GASSUIT_TEMP1 "GTp1"
#define ZSTR_GASSUIT_TEMP2 "GTp2"
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"