mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-04 14:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tuyamcu calib if non zero

Browse Source
This commit is contained in:
Tester23
2025-06-26 10:24:25 +02:00
parent b6e9862563
commit 45ff821a2f
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/drv_tuyaMCU.c
View File

@ -1589,6 +1589,8 @@ void TuyaMCU_PublishDPToBerry(const byte *data, int ofs) {
} }
} }
#define CALIB_IF_NONZERO(x,d) if(x) { x += d; }
void TuyaMCU_ParseStateMessage(const byte* data, int len) { void TuyaMCU_ParseStateMessage(const byte* data, int len) {
tuyaMCUMapping_t* mapping; tuyaMCUMapping_t* mapping;
int ofs; int ofs;
@ -1693,9 +1695,9 @@ void TuyaMCU_ParseStateMessage(const byte* data, int len) {
iC = (data[ofs + 6] << 16) | (data[ofs + 7] << 8) | data[ofs + 8]; iC = (data[ofs + 6] << 16) | (data[ofs + 7] << 8) | data[ofs + 8];
iP = (data[ofs + 9] << 16) | (data[ofs + 10] << 8) | data[ofs + 11]; iP = (data[ofs + 9] << 16) | (data[ofs + 10] << 8) | data[ofs + 11];
// calibration // calibration
iV += mapping->delta; CALIB_IF_NONZERO(iV, mapping->delta);
iC += mapping->delta2; CALIB_IF_NONZERO(iC, mapping->delta2);
iP += mapping->delta3; CALIB_IF_NONZERO(iP, mapping->delta3);
if (mapping->channel < 0) { if (mapping->channel < 0) {
CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV); CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV);
CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC); CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC);
@ -1727,9 +1729,9 @@ void TuyaMCU_ParseStateMessage(const byte* data, int len) {
// freq // freq
iF = data[ofs + 13 + 4] << 8 | data[ofs + 14 + 4]; iF = data[ofs + 13 + 4] << 8 | data[ofs + 14 + 4];
// calibration // calibration
iV += mapping->delta; CALIB_IF_NONZERO(iV, mapping->delta);
iC += mapping->delta2; CALIB_IF_NONZERO(iC, mapping->delta2);
iP += mapping->delta3; CALIB_IF_NONZERO(iP, mapping->delta3);
if (mapping->channel < 0) { if (mapping->channel < 0) {
CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV); CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV);
CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC); CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC);
@ -1761,9 +1763,9 @@ void TuyaMCU_ParseStateMessage(const byte* data, int len) {
// power // power
iP = data[ofs + 6 + 4] << 8 | data[ofs + 7 + 4]; iP = data[ofs + 6 + 4] << 8 | data[ofs + 7 + 4];
// calibration // calibration
iV += mapping->delta; CALIB_IF_NONZERO(iV, mapping->delta);
iC += mapping->delta2; CALIB_IF_NONZERO(iC, mapping->delta2);
iP += mapping->delta3; CALIB_IF_NONZERO(iP, mapping->delta3);
if (mapping->channel < 0) { if (mapping->channel < 0) {
CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV); CHANNEL_SetFirstChannelByType(ChType_Voltage_div10, iV);
CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC); CHANNEL_SetFirstChannelByType(ChType_Current_div1000, iC);