piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

GasSuite protocol changes

Browse Source
This commit is contained in:
3djc
2018-09-11 16:34:35 +02:00
parent 31b9f805ea
commit 6ed7c30952
13 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/frsky.h
+16 -6
View File
@@ -159,12 +159,22 @@ enum FrSkyDataState {
#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 GASSUIT_TEMP1_FIRST_ID 0x0d00
#define GASSUIT_TEMP1_LAST_ID 0x0d0f
#define GASSUIT_TEMP2_FIRST_ID 0x0d10
#define GASSUIT_TEMP2_LAST_ID 0x0d1f
#define GASSUIT_SPEED_FIRST_ID 0x0d20
#define GASSUIT_SPEED_LAST_ID 0x0d2f
#define GASSUIT_RES_VOL_FIRST_ID 0x0d30
#define GASSUIT_RES_VOL_LAST_ID 0x0d3f
#define GASSUIT_RES_PERC_FIRST_ID 0x0d40
#define GASSUIT_RES_PERC_LAST_ID 0x0d4f
#define GASSUIT_FLOW_FIRST_ID 0x0d50
#define GASSUIT_FLOW_LAST_ID 0x0d5f
#define GASSUIT_MAX_FLOW_FIRST_ID 0x0d60
#define GASSUIT_MAX_FLOW_LAST_ID 0x0d6f
#define GASSUIT_AVG_FLOW_FIRST_ID 0x0d70
#define GASSUIT_AVG_FLOW_LAST_ID 0x0d7f
#define DIY_FIRST_ID 0x5000
#define DIY_LAST_ID 0x52ff
#define DIY_STREAM_FIRST_ID 0x5000
radio/src/telemetry/frsky_sport.cpp
+7 -9
View File
@@ -69,11 +69,14 @@ const FrSkySportSensor sportSensors[] = {
{ 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_TEMP1_FIRST_ID, GASSUIT_TEMP1_LAST_ID, 0, ZSTR_GASSUIT_TEMP1, UNIT_CELSIUS, 0 },
{ GASSUIT_TEMP2_FIRST_ID, GASSUIT_TEMP2_LAST_ID, 0, 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 },
{ GASSUIT_RES_VOL_FIRST_ID, GASSUIT_RES_VOL_LAST_ID, 0, ZSTR_GASSUIT_RES_VOL, UNIT_MILLILITERS, 0 },
{ GASSUIT_RES_PERC_FIRST_ID, GASSUIT_RES_PERC_LAST_ID, 0, ZSTR_GASSUIT_RES_PERC, UNIT_PERCENT, 0 },
{ GASSUIT_FLOW_FIRST_ID, GASSUIT_FLOW_LAST_ID, 0, ZSTR_GASSUIT_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion
{ GASSUIT_MAX_FLOW_FIRST_ID, GASSUIT_MAX_FLOW_LAST_ID, 0, ZSTR_GASSUIT_MAX_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion
{ GASSUIT_AVG_FLOW_FIRST_ID, GASSUIT_AVG_FLOW_LAST_ID, 0, ZSTR_GASSUIT_AVG_FLOW, UNIT_MILLILITERS, 0 }, //TODO this needs to be changed to ml/min, but need eeprom conversion
{ 0, 0, 0, NULL, UNIT_RAW, 0 } // sentinel
};
@@ -232,11 +235,6 @@ void sportProcessTelemetryPacket(const uint8_t * packet)
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 GASSUIT 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))) {
radio/src/translations/cz.h.txt
+4
View File
@@ -1270,3 +1270,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/de.h.txt
+4
View File
@@ -1268,3 +1268,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/en.h.txt
+4
View File
@@ -1279,3 +1279,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/es.h.txt
+4
View File
@@ -1274,3 +1274,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/fi.h.txt
+4
View File
@@ -1260,3 +1260,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/fr.h.txt
+4
View File
@@ -1286,3 +1286,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/it.h.txt
+4
View File
@@ -1269,3 +1269,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/nl.h.txt
+4
View File
@@ -1276,3 +1276,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/pl.h.txt
+4
View File
@@ -1270,3 +1270,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/pt.h.txt
+4
View File
@@ -1273,3 +1273,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
radio/src/translations/se.h.txt
+4
View File
@@ -1281,3 +1281,7 @@
#define ZSTR_GASSUIT_RPM "GRPM"
#define ZSTR_GASSUIT_FLOW "GFlo"
#define ZSTR_GASSUIT_CONS "GFue"
#define ZSTR_GASSUIT_RES_VOL "GRVl"
#define ZSTR_GASSUIT_RES_PERC "GRPc"
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"