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

Fix sending number of dam channels, give DSM2 debug telemetry output a better name

Browse Source
This commit is contained in:
Arne Schwabe
2016-10-16 22:24:36 +02:00
parent 543a1d14e8
commit a21d3e6f2e
13 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/multi_arm.cpp
+6 -7
View File
@@ -126,9 +126,11 @@ void setupPulsesMultimodule(uint8_t port)
protoByte |= MULTI_SEND_RANGECHECK;
// rfProtocol
if (g_model.moduleData[port].getMultiProtocol(true) == MM_RF_PROTO_DSM2 && g_model.moduleData[port].multi.autoBindMode && moduleFlag[port] == MODULE_BIND) {
if (g_model.moduleData[port].getMultiProtocol(true) == MM_RF_PROTO_DSM2){
// Autobinding should always be done in DSMX 11ms
subtype = MM_RF_DSM2_SUBTYPE_AUTO;
if(g_model.moduleData[port].multi.autoBindMode && moduleFlag[port] == MODULE_BIND)
subtype = MM_RF_DSM2_SUBTYPE_AUTO;
// The multi module wants the number of channels as options value and negative amount if the
// broken PRNG table is to be used.
@@ -173,22 +175,19 @@ void setupPulsesMultimodule(uint8_t port)
sendByteMulti(0x54);
// protocol byte
protoByte |= (type & 0x1f);
if(g_model.moduleData[port].getMultiProtocol(true) != MM_RF_PROTO_DSM2)
protoByte |= (g_model.moduleData[port].multi.autoBindMode << 6);
sendByteMulti(protoByte);
// power always set to high (0 << 7)
// byte 2, subtype, powermode, model id
sendByteMulti((g_model.header.modelId[port] & 0x0f)
| ((subtype & 0x7) << 4)
| (g_model.moduleData[port].multi.lowPowerMode << 7)
);
// byte 3
sendByteMulti(optionValue);
radio/src/telemetry/spektrum.cpp
+1 -1
View File
@@ -192,7 +192,7 @@ const SpektrumSensor spektrumSensors[] = {
{I2C_QOS, 12, uint16, ZSTR_A2, UNIT_VOLTS, 2},
{I2C_PSEUDO_TX, 0, uint8, ZSTR_TX_RSSI, UNIT_RAW, 0},
{I2C_PSEUDO_TX, 4, uint32, ZSTR_CHANS_STATE, UNIT_RAW, 0},
{I2C_PSEUDO_TX, 4, uint32, ZSTR_BIND, UNIT_RAW, 0},
{0, 0, int16, NULL, UNIT_RAW, 0} //sentinel
};
radio/src/translations/cz.h.txt
+1
View File
@@ -1356,3 +1356,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/de.h.txt
+1
View File
@@ -1356,3 +1356,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/en.h.txt
+1
View File
@@ -1327,3 +1327,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/es.h.txt
+1
View File
@@ -1297,3 +1297,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/fi.h.txt
+1
View File
@@ -1291,3 +1291,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/fr.h.txt
+1
View File
@@ -1329,3 +1329,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/it.h.txt
+1
View File
@@ -1333,3 +1333,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/nl.h.txt
+1
View File
@@ -1337,3 +1337,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/pl.h.txt
+1
View File
@@ -1335,3 +1335,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/pt.h.txt
+1
View File
@@ -1292,3 +1292,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"
radio/src/translations/se.h.txt
+1
View File
@@ -1351,3 +1351,4 @@
#define ZSTR_QOS_R "FdeR"
#define ZSTR_QOS_F "FLss"
#define ZSTR_QOS_H "Hold"
#define ZSTR_BIND "BIND"