From 617dcdd228b3517e2f3ce11b73ea9c0c34abc88f Mon Sep 17 00:00:00 2001 From: Razvalyaev Date: Tue, 4 Mar 2025 13:52:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B1=D0=B0=D1=81=20Resolution=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=20=D0=B2=20Config=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Modbus/modbus_data.h | 2 +- Core/PY32Module/PY32module_main.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/Modbus/modbus_data.h b/Core/Modbus/modbus_data.h index 3414778..fdc05d0 100644 --- a/Core/Modbus/modbus_data.h +++ b/Core/Modbus/modbus_data.h @@ -44,7 +44,7 @@ typedef struct { uint16_t Location; uint16_t ROM[4]; - uint16_t Resolution; + uint16_t Config; uint16_t Status; }MB_SensorParamsTypeDef; /** diff --git a/Core/PY32Module/PY32module_main.c b/Core/PY32Module/PY32module_main.c index 398d3c8..a0fdfcf 100644 --- a/Core/PY32Module/PY32module_main.c +++ b/Core/PY32Module/PY32module_main.c @@ -112,7 +112,7 @@ void PYModule_ReadSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_TypeDef *pchsens if(Dallas_ReadScratchpad(&sensor->sens) == HAL_OK) { MB_DATA.InRegs.Response.Location = *(uint16_t *)&sensor->sens.hdallas->scratchpad.tHighRegister; - MB_DATA.InRegs.Response.Resolution = sensor->sens.hdallas->scratchpad.ConfigRegister; + MB_DATA.InRegs.Response.Config = sensor->sens.hdallas->scratchpad.ConfigRegister; MB_DATA.InRegs.Response.ROM[0] = __REV16((sensor->sens.sensROM) & 0xFFFF); MB_DATA.InRegs.Response.ROM[1] = __REV16((sensor->sens.sensROM >> 16) & 0xFFFF); MB_DATA.InRegs.Response.ROM[2] = __REV16((sensor->sens.sensROM >> 32) & 0xFFFF); @@ -122,7 +122,7 @@ void PYModule_ReadSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_TypeDef *pchsens else { MB_DATA.InRegs.Response.Location = MB_DATA.HoldRegs.InitStruct.Location; - MB_DATA.InRegs.Response.Resolution = 0; + MB_DATA.InRegs.Response.Config = 0; MB_DATA.InRegs.Response.ROM[0] = 0; MB_DATA.InRegs.Response.ROM[1] = 0; MB_DATA.InRegs.Response.ROM[2] = 0; @@ -137,7 +137,7 @@ void PYModule_ReadSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_TypeDef *pchsens if(DS18B20_ReadScratchpad(hdallas->onewire, (uint8_t *)MB_DATA.HoldRegs.InitStruct.ROM, (uint8_t *)&hdallas->scratchpad) == HAL_OK) { MB_DATA.InRegs.Response.Location = *(uint16_t *)&hdallas->scratchpad.tHighRegister; - MB_DATA.InRegs.Response.Resolution = hdallas->scratchpad.ConfigRegister; + MB_DATA.InRegs.Response.Config = hdallas->scratchpad.ConfigRegister; MB_DATA.InRegs.Response.ROM[0] = MB_DATA.HoldRegs.InitStruct.ROM[0]; MB_DATA.InRegs.Response.ROM[1] = MB_DATA.HoldRegs.InitStruct.ROM[1]; MB_DATA.InRegs.Response.ROM[2] = MB_DATA.HoldRegs.InitStruct.ROM[2]; @@ -147,7 +147,7 @@ void PYModule_ReadSensor(DALLAS_HandleTypeDef *hdallas, PCHSens_TypeDef *pchsens else { MB_DATA.InRegs.Response.Location = 0; - MB_DATA.InRegs.Response.Resolution = 0; + MB_DATA.InRegs.Response.Config = 0; MB_DATA.InRegs.Response.ROM[0] = MB_DATA.HoldRegs.InitStruct.ROM[0]; MB_DATA.InRegs.Response.ROM[1] = MB_DATA.HoldRegs.InitStruct.ROM[1]; MB_DATA.InRegs.Response.ROM[2] = MB_DATA.HoldRegs.InitStruct.ROM[2]; @@ -177,7 +177,7 @@ void PYModule_InitSensor(PCHSens_TypeDef *pchsens) if(PCHSens_InitNewSensor(&hdallas1, sensor, connectROM) == HAL_OK) { MB_DATA.InRegs.Response.Location = *(uint16_t *)&sensor->sens.hdallas->scratchpad.tHighRegister; - MB_DATA.InRegs.Response.Resolution = sensor->sens.hdallas->scratchpad.ConfigRegister; + MB_DATA.InRegs.Response.Config = sensor->sens.hdallas->scratchpad.ConfigRegister; MB_DATA.InRegs.Response.ROM[0] = __REV16((sensor->sens.sensROM) & 0xFFFF); MB_DATA.InRegs.Response.ROM[1] = __REV16((sensor->sens.sensROM >> 16) & 0xFFFF); MB_DATA.InRegs.Response.ROM[2] = __REV16((sensor->sens.sensROM >> 32) & 0xFFFF); @@ -187,7 +187,7 @@ void PYModule_InitSensor(PCHSens_TypeDef *pchsens) else { MB_DATA.InRegs.Response.Location = MB_DATA.HoldRegs.InitStruct.Location; - MB_DATA.InRegs.Response.Resolution = 0; + MB_DATA.InRegs.Response.Config = 0; MB_DATA.InRegs.Response.ROM[0] = MB_DATA.HoldRegs.InitStruct.ROM[0]; MB_DATA.InRegs.Response.ROM[1] = MB_DATA.HoldRegs.InitStruct.ROM[1]; MB_DATA.InRegs.Response.ROM[2] = MB_DATA.HoldRegs.InitStruct.ROM[2]; @@ -209,7 +209,7 @@ void PYModule_DeInitSensor(PCHSens_TypeDef *pchsens) if(PCHSens_UndefineSensor(sensor) != HAL_OK) { MB_DATA.InRegs.Response.Location = *(uint16_t *)&sensor->sens.hdallas->scratchpad.tHighRegister; - MB_DATA.InRegs.Response.Resolution = sensor->sens.hdallas->scratchpad.ConfigRegister; + MB_DATA.InRegs.Response.Config = sensor->sens.hdallas->scratchpad.ConfigRegister; MB_DATA.InRegs.Response.ROM[0] = __REV16((sensor->sens.sensROM) & 0xFFFF); MB_DATA.InRegs.Response.ROM[1] = __REV16((sensor->sens.sensROM >> 16) & 0xFFFF); MB_DATA.InRegs.Response.ROM[2] = __REV16((sensor->sens.sensROM >> 32) & 0xFFFF); @@ -219,7 +219,7 @@ void PYModule_DeInitSensor(PCHSens_TypeDef *pchsens) else { MB_DATA.InRegs.Response.Location = *(uint16_t *)&sensor->sens.hdallas->scratchpad.tHighRegister; - MB_DATA.InRegs.Response.Resolution = sensor->sens.hdallas->scratchpad.ConfigRegister; + MB_DATA.InRegs.Response.Config = sensor->sens.hdallas->scratchpad.ConfigRegister; MB_DATA.InRegs.Response.ROM[0] = __REV16((sensor->sens.sensROM) & 0xFFFF); MB_DATA.InRegs.Response.ROM[1] = __REV16((sensor->sens.sensROM >> 16) & 0xFFFF); MB_DATA.InRegs.Response.ROM[2] = __REV16((sensor->sens.sensROM >> 32) & 0xFFFF);