diff --git a/radio/src/pulses/multi_arm.cpp b/radio/src/pulses/multi_arm.cpp index 020ef683a..a7efb942c 100644 --- a/radio/src/pulses/multi_arm.cpp +++ b/radio/src/pulses/multi_arm.cpp @@ -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); diff --git a/radio/src/telemetry/spektrum.cpp b/radio/src/telemetry/spektrum.cpp index 00bf0c80c..2b4ac18f2 100644 --- a/radio/src/telemetry/spektrum.cpp +++ b/radio/src/telemetry/spektrum.cpp @@ -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 }; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index e2327c100..f243648d5 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1356,3 +1356,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index fa36a556f..324e318a2 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1356,3 +1356,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 7a8c4ad4b..60fd01f80 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1327,3 +1327,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index a2776b86d..316e506ae 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1297,3 +1297,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 428504458..876d3341b 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1291,3 +1291,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 1b8097d90..f12791018 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1329,3 +1329,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index cf366c914..2b6a9a73b 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1333,3 +1333,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index c86ca85bd..d452abd1d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1337,3 +1337,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index ac3c635b4..461bb4cfa 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1335,3 +1335,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 44cb5df09..0d894b7b4 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1292,3 +1292,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3bd696ddc..07eff9dd0 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1351,3 +1351,4 @@ #define ZSTR_QOS_R "FdeR" #define ZSTR_QOS_F "FLss" #define ZSTR_QOS_H "Hold" +#define ZSTR_BIND "BIND"