Add new sensors for Spektrum’s Serial Telemetry Receiver (SPM4649T) (#4037)
* Add new sensors for Spektrum’s Serial Telemetry Receiver (SPM4649T) * Use define instead of hardcoded number
This commit is contained in:
Arne Schwabe
committed by
Bertrand Songis
Bertrand Songis
parent
324addba2c
commit
9983ff9851
@@ -23,7 +23,8 @@
|
||||
|
||||
/*
|
||||
* Documentation of the Spektrum protocol is available under
|
||||
* http://www.rcgroups.com/forums/showthread.php?t=1726960&page=22#post34091390
|
||||
* https://www.spektrumrc.com/ProdInfo/Files/SPM_Telemetry_Developers_Specs.pdf
|
||||
*
|
||||
* Multi module adds two byte header of 0xAA [RSSI of telemetry packet] [16 byte message]
|
||||
*/
|
||||
|
||||
@@ -45,6 +46,7 @@
|
||||
#define DSM_BIND_PACKET_LENGTH 12
|
||||
|
||||
#define I2C_HIGH_CURRENT 0x03
|
||||
#define I2C_TEXTGEN 0x0c
|
||||
#define I2C_GPS 0x17
|
||||
#define I2C_GPS2 0x17
|
||||
#define I2C_CELLS 0x3a
|
||||
@@ -88,6 +90,16 @@ const SpektrumSensor spektrumSensors[] = {
|
||||
{0x0a, 4, uint16, ZSTR_BATT1_CONSUMPTION, UNIT_MAH, 0},
|
||||
{0x0a, 6, uint16, ZSTR_BATT2_CONSUMPTION, UNIT_MAH, 0},
|
||||
|
||||
|
||||
// Lap Timer
|
||||
{0x0b, 0, uint8, ZSTR_LAP_NUMBER, UNIT_RAW, 0},
|
||||
{0x0b, 0, uint8, ZSTR_GATE_NUMBER, UNIT_RAW, 0},
|
||||
{0x0b, 0, uint32, ZSTR_LAP_TIME, UNIT_SECONDS, 3},
|
||||
{0x0b, 0, uint32, ZSTR_GATE_TIME, UNIT_SECONDS, 3},
|
||||
|
||||
// Text Generator
|
||||
{I2C_TEXTGEN, 0, uint32, ZSTR_FLIGHT_MODE, UNIT_TEXT, 0},
|
||||
|
||||
// AirSpeed, also has max (+2, int16)
|
||||
{0x11, 0, int16, ZSTR_ASPD, UNIT_KMH, 0},
|
||||
|
||||
@@ -265,6 +277,22 @@ void processSpektrumPacket(const uint8_t *packet)
|
||||
uint8_t i2cAddress = (packet[2] & 0x7f);
|
||||
uint8_t instance = packet[3];
|
||||
|
||||
if (i2cAddress == I2C_TEXTGEN) {
|
||||
uint8_t lineNumber = packet[4];
|
||||
|
||||
uint16_t pseudoId = (i2cAddress << 8 | lineNumber);
|
||||
|
||||
for (int i=5; i<SPEKTRUM_TELEMETRY_LENGTH; i++)
|
||||
{
|
||||
setTelemetryValue(TELEM_PROTO_SPEKTRUM, pseudoId, 0, instance, packet[i], UNIT_TEXT, i-5);
|
||||
}
|
||||
// Set a sential \0 just for safety since we have the space there
|
||||
setTelemetryValue(TELEM_PROTO_SPEKTRUM, pseudoId, 0, instance, '\0', UNIT_TEXT, 13);
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
bool handled = false;
|
||||
for (const SpektrumSensor * sensor = spektrumSensors; sensor->i2caddress; sensor++) {
|
||||
if (i2cAddress == sensor->i2caddress) {
|
||||
|
||||
@@ -1365,3 +1365,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1365,3 +1365,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1336,3 +1336,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1306,3 +1306,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1300,3 +1300,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1338,3 +1338,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1342,3 +1342,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1346,3 +1346,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1344,3 +1344,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1301,3 +1301,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
@@ -1360,3 +1360,7 @@
|
||||
#define ZSTR_QOS_F "FLss"
|
||||
#define ZSTR_QOS_H "Hold"
|
||||
#define ZSTR_BIND "BIND"
|
||||
#define ZSTR_LAP_NUMBER "Lap "
|
||||
#define ZSTR_GATE_NUMBER "Gate"
|
||||
#define ZSTR_LAP_TIME "LapT"
|
||||
#define ZSTR_GATE_TIME "GteT"
|
||||
|
||||
Reference in New Issue
Block a user