diff --git a/WSU/Core/Src/main.c b/WSU/Core/Src/main.c index 8516459..e967012 100644 --- a/WSU/Core/Src/main.c +++ b/WSU/Core/Src/main.c @@ -167,6 +167,18 @@ void AppendCRC(uint8_t* buf, uint8_t len) buf[len+1] = crc >> 8; // 高字节在�? } +uint16_t ntc_value(void) +{ + uint32_t val = RNTC_value / 2; + if (val > 60000) { + val = 60000; + } + if (val < 500) { + val = 500; + } + return val; +} + /** * @brief Modbus指令处理函数 * @note 处理接收到的Modbus命令并生成响�?? @@ -199,9 +211,10 @@ void Process_Modbus(void) //uint16_t flow = waterSensorData.usFreq * 10 / 4 / 9; uint16_t flow = 0; __disable_irq(); - if (waterSensorData.usFreq > 0) { - flow = (waterSensorData.usFreq + 10) * 1000UL / 108; - } + // if (waterSensorData.usFreq > 0) { + // flow = (waterSensorData.usFreq + 10) * 1000UL / 108; + // } + flow = waterSensorData.usFreq; __enable_irq(); modbusTxBuf[3] = flow >> 8; // 高字芿 modbusTxBuf[4] = flow & 0xFF; // 低字芿 @@ -221,13 +234,14 @@ void Process_Modbus(void) //uint16_t flow = waterSensorData.usFreq * 10 / 4 / 9; uint16_t flow = 0; __disable_irq(); - if (waterSensorData.usFreq > 0) { - flow = (waterSensorData.usFreq + 10) * 1000UL / 108; - } + // if (waterSensorData.usFreq > 0) { + // flow = (waterSensorData.usFreq + 10) * 1000UL / 108; + // } + flow = waterSensorData.usFreq; __enable_irq(); modbusTxBuf[3] = flow >> 8; // 高字芿 modbusTxBuf[4] = flow & 0xFF; // 低字芿 - uint16_t temp = temperature_int; // 模拟温度倿(实际应从传感器读叿) + uint16_t temp = ntc_value(); // 模拟温度倿(实际应从传感器读叿) modbusTxBuf[5] = temp >> 8; // 高字芿 modbusTxBuf[6] = temp & 0xFF; // 低字芿 AppendCRC(modbusTxBuf, 7); // 添加CRC校验 @@ -240,9 +254,9 @@ void Process_Modbus(void) modbusTxBuf[0] = SLAVE_ADDR; // 从机地址 modbusTxBuf[1] = 0x03; // 功能�? modbusTxBuf[2] = 0x02; // 返回字节�?(2字节) - uint16_t temp = temperature_int; // 模拟温度�?(实际应从传感器读�?) - modbusTxBuf[3] = temp >> 8; // 高字�? - modbusTxBuf[4] = temp & 0xFF; // 低字�? + uint16_t temp = ntc_value(); // 模拟温度�?(实际应从传感器读�?) + modbusTxBuf[3] = temp >> 8; // 高字芿 + modbusTxBuf[4] = temp & 0xFF; // 低字芿 AppendCRC(modbusTxBuf, 5); // 添加CRC校验 HAL_UART_Transmit(&huart2, modbusTxBuf, 7, 100); // 发鿿7字节响应 } @@ -253,7 +267,6 @@ void Process_Modbus(void) } - void HAL_GPIO_EXTI_Rising_Callback(uint16_t GPIO_Pin) { if (GPIO_Pin == GPIO_PIN_2)