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

Fix telemetry sensor module/rx source data being lost in some cases (#6792)

Browse Source
This commit is contained in:
Andre Bernet
2019-09-16 07:59:08 +02:00
committed by Bertrand Songis
parent 6a10e762dd
commit 059ceee7e3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+2 -3
View File
@@ -1914,8 +1914,7 @@ class SensorField: public TransformedField {
if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) {
_id = sensor.id;
_subid = sensor.subid;
// keep highest 3 bits from instance (rxIdx & moduleIdx are read-only)
_instance = (sensor.instance & 0x1F) | (_instance & 0xE0);
_instance = (sensor.instance & 0x1F) | (sensor.rxIdx << 5) | (sensor.moduleIdx << 7);
_ratio = sensor.ratio;
_offset = sensor.offset;
}
@@ -1941,7 +1940,7 @@ class SensorField: public TransformedField {
if (model.moduleData[0].isPxx1Module() || model.moduleData[1].isPxx1Module())
sensor.instance = (_instance & 0x1F) + (version <= 218 ? -1 : 0); // 5 bits instance
else
sensor.instance = _instance;
sensor.instance = _instance & 0x1F;
sensor.rxIdx = (_instance >> 5) & 0x03; // 2 bits Rx idx
sensor.moduleIdx = (_instance >> 7) & 0x1; // 1 bit module idx
sensor.ratio = _ratio;