jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send MQTT message when weight/impedance is stabilized or direct bridge mode is enabled.

Browse Source 
Fixed impedance measurement on V2 scale.
This commit is contained in:
Milenko Mitrovic 2022-01-30 00:25:22 +01:00
parent a0ba50d38d
commit d13381f130
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tasmota/xsns_62_esp32_mi_ble.ino
View File

@ -1729,7 +1729,7 @@ void MI32ParseMiScalePacket(const uint8_t * _buf, uint32_t length, const uint8_t
MIBLEsensors[_slot].weight_stabilized = weight_stabilized; MIBLEsensors[_slot].weight_stabilized = weight_stabilized;
MIBLEsensors[_slot].weight_removed = weight_removed; MIBLEsensors[_slot].weight_removed = weight_removed;
if (_packetV1->status & (1 << 0)) { if (_packetV1->status & (1 << 0)) {
strcpy(MIBLEsensors[_slot].weight_unit, PSTR("lbs")); strcpy(MIBLEsensors[_slot].weight_unit, PSTR("lbs"));
MIBLEsensors[_slot].weight = (float)_packetV1->weight / 100.0f; MIBLEsensors[_slot].weight = (float)_packetV1->weight / 100.0f;
@ -1745,10 +1745,8 @@ void MI32ParseMiScalePacket(const uint8_t * _buf, uint32_t length, const uint8_t
MIBLEsensors[_slot].weight = 0.0f; MIBLEsensors[_slot].weight = 0.0f;
} }
if(MI32.option.directBridgeMode) { MIBLEsensors[_slot].shallSendMQTT = 1;
MIBLEsensors[_slot].shallSendMQTT = 1; MI32.mode.shallTriggerTele = 1;
MI32.mode.shallTriggerTele = 1;
}
} }
} }
@ -1757,7 +1755,7 @@ void MI32ParseMiScalePacket(const uint8_t * _buf, uint32_t length, const uint8_t
weight_stabilized = (_packetV2->status & (1 << 5)) ? 1 : 0; weight_stabilized = (_packetV2->status & (1 << 5)) ? 1 : 0;
weight_removed = (_packetV2->status & (1 << 7)) ? 1 : 0; weight_removed = (_packetV2->status & (1 << 7)) ? 1 : 0;
impedance_stabilized = (_packetV2->status & (1 << 1)) ? 1 : 0; impedance_stabilized = (_packetV2->status & (1 << 1)) ? 1 : 0;
if (!MI32.option.directBridgeMode && (!weight_stabilized || weight_removed /* || !impedance_stabilized */)) if (!MI32.option.directBridgeMode && (!weight_stabilized || weight_removed))
return; return;
uint32_t _slot = MIBLEgetSensorSlot(addr, UUID, 0); uint32_t _slot = MIBLEgetSensorSlot(addr, UUID, 0);
@ -1771,8 +1769,6 @@ void MI32ParseMiScalePacket(const uint8_t * _buf, uint32_t length, const uint8_t
MIBLEsensors[_slot].weight_stabilized = weight_stabilized; MIBLEsensors[_slot].weight_stabilized = weight_stabilized;
MIBLEsensors[_slot].weight_removed = weight_removed; MIBLEsensors[_slot].weight_removed = weight_removed;
MIBLEsensors[_slot].impedance_stabilized = impedance_stabilized;
MIBLEsensors[_slot].impedance = _packetV2->impedance;
if (_packetV2->weight_unit & (1 << 4)) { if (_packetV2->weight_unit & (1 << 4)) {
strcpy(MIBLEsensors[_slot].weight_unit, PSTR("jin")); strcpy(MIBLEsensors[_slot].weight_unit, PSTR("jin"));
@ -1788,15 +1784,23 @@ void MI32ParseMiScalePacket(const uint8_t * _buf, uint32_t length, const uint8_t
MIBLEsensors[_slot].weight = (float)_packetV2->weight / 100.0f; MIBLEsensors[_slot].weight = (float)_packetV2->weight / 100.0f;
} }
if (MIBLEsensors[_slot].weight_removed) { if (weight_removed) {
MIBLEsensors[_slot].weight = 0.0f; MIBLEsensors[_slot].weight = 0.0f;
MIBLEsensors[_slot].impedance = 0;
} }
if(MI32.option.directBridgeMode) { MIBLEsensors[_slot].impedance = 0;
MIBLEsensors[_slot].shallSendMQTT = 1; if (MI32.option.directBridgeMode || impedance_stabilized)
MI32.mode.shallTriggerTele = 1; {
MIBLEsensors[_slot].impedance_stabilized = impedance_stabilized;
MIBLEsensors[_slot].impedance = _packetV2->impedance;
if (weight_removed) {
MIBLEsensors[_slot].impedance = 0;
}
} }
MIBLEsensors[_slot].shallSendMQTT = 1;
MI32.mode.shallTriggerTele = 1;
} }
} }
} }