From ab38b318b2b25ff06f5e9c8934eb6b4e0d489e76 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 1 Sep 2026 15:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E6=B8=A9=E6=B5=8B=E9=87=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OSU_RS485/Core/Src/main.c | 61 ++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/OSU_RS485/Core/Src/main.c b/OSU_RS485/Core/Src/main.c index 323d138..8850eeb 100644 --- a/OSU_RS485/Core/Src/main.c +++ b/OSU_RS485/Core/Src/main.c @@ -51,7 +51,7 @@ uint8_t modbusRxBuf[16]; // Modbus接收缓冲匿 uint8_t modbusTxBuf[16]; // Modbus发鿁缓冲区 volatile uint8_t rxFlag = 0; // 接收完成标志 -static uint16_t temp; +static uint16_t gusOilTemp = 0; static uint16_t level; //uint8_t UART1_Rx_flg = 0; /* USER CODE END PTD */ @@ -176,7 +176,7 @@ void Process_Modbus(void) uint16_t deep = level; // 模拟温度倿(实际应从传感器读叿) modbusTxBuf[3] = deep >> 8; // 高字芿 modbusTxBuf[4] = deep & 0xFF; // 低字芿 - uint16_t temp = temp_value[3]; // 模拟温度倿(实际应从传感器读叿) + uint16_t temp = gusOilTemp; // 模拟温度倿(实际应从传感器读叿) modbusTxBuf[5] = temp >> 8; // 高字芿 modbusTxBuf[6] = temp & 0xFF; // 低字芿 AppendCRC(modbusTxBuf, 7); // 添加CRC校验 @@ -189,7 +189,7 @@ void Process_Modbus(void) modbusTxBuf[0] = SLAVE_ADDR; // 从机地址 modbusTxBuf[1] = 0x03; // 功能砿 modbusTxBuf[2] = 0x02; // 返回字节敿(2字节) - uint16_t temp = temp_value[3]; // 模拟温度倿(实际应从传感器读叿) + uint16_t temp = gusOilTemp; // 模拟温度倿(实际应从传感器读叿) modbusTxBuf[3] = temp >> 8; // 高字芿 modbusTxBuf[4] = temp & 0xFF; // 低字芿 AppendCRC(modbusTxBuf, 5); // 添加CRC校验 @@ -292,6 +292,11 @@ void check_level(void) HAL_GPIO_WritePin(HEAT2_GPIO_Port, HEAT2_Pin,GPIO_PIN_RESET); HAL_GPIO_WritePin(HEAT3_GPIO_Port, HEAT3_Pin,GPIO_PIN_SET); break; + default: + HAL_GPIO_WritePin(HEAT1_GPIO_Port, HEAT1_Pin,GPIO_PIN_RESET); + HAL_GPIO_WritePin(HEAT2_GPIO_Port, HEAT2_Pin,GPIO_PIN_RESET); + HAL_GPIO_WritePin(HEAT3_GPIO_Port, HEAT3_Pin,GPIO_PIN_RESET); + break; } if(HAL_GetTick() < ulTick + 1000) return; @@ -307,35 +312,37 @@ void check_level(void) usIndex++; if(usIndex >= iSampleNum) { - printf("calculate %d\r\n", iCheckIndex); - iLevelBuf[iCheckIndex] = calculate(ausTempBuf[iCheckIndex + 1]); + if (iCheckIndex < 3) { + printf("calculate %d\r\n", iCheckIndex); + iLevelBuf[iCheckIndex] = calculate(ausTempBuf[iCheckIndex + 1]); - if (iLevelBuf[0] && iLevelBuf[1] && iLevelBuf[2]) - { - level = 3; - } else if (iLevelBuf[0] && iLevelBuf[1]) - { - level = 2; - } else if (iLevelBuf[0]) - { - level = 1; - } else - { - level = 0; + if (iLevelBuf[0] && iLevelBuf[1] && iLevelBuf[2]) + { + level = 3; + } else if (iLevelBuf[0] && iLevelBuf[1]) + { + level = 2; + } else if (iLevelBuf[0]) + { + level = 1; + } else + { + level = 0; + } + } else { + gusOilTemp = 0; + for(int i=0 ; i= 3) iCheckIndex = 0; + if(iCheckIndex >= 4) iCheckIndex = 0; } }