Bläddra i källkod

从主分支新建分支,完成江苏宁录便携式色诱2.0定制更换传感器的需求,已进行测试

niujiuru 3 månader sedan
förälder
incheckning
ae8d00e33d

BIN
build/MCU_V1.2.6.2(江苏宁录定制).bin


+ 1 - 1
ctrl_board_g070_app/Core/Inc/main.h

@@ -73,7 +73,7 @@ void Error_Handler(void);
 #define VERSION_MAJOR      1       // 主版本号 (重大功能更新)
 #define VERSION_MAJOR      1       // 主版本号 (重大功能更新)
 #define VERSION_MINOR      2       // 次版本号 (新功能增加)
 #define VERSION_MINOR      2       // 次版本号 (新功能增加)
 #define VERSION_BUILD      6       // 构建版本 (Bug修复)
 #define VERSION_BUILD      6       // 构建版本 (Bug修复)
-#define VERSION_REVISION   1       // 修订版本 (小修改)
+#define VERSION_REVISION   2       // 修订版本 (小修改)
 
 
 /* 2.2 组合成32位版本号 */
 /* 2.2 组合成32位版本号 */
 #define MAKE_VERSION(major, minor, build, revision) \
 #define MAKE_VERSION(major, minor, build, revision) \

+ 34 - 18
ctrl_board_g070_app/User/sensor.c

@@ -37,7 +37,7 @@ struct
 	uint32_t timestamp;
 	uint32_t timestamp;
 	uint32_t tsk_timer;
 	uint32_t tsk_timer;
 	int retry;
 	int retry;
-	int rx_len;
+	volatile int rx_len;
 	uint32_t rx_timer;
 	uint32_t rx_timer;
 	uint8_t rx_buf[128];
 	uint8_t rx_buf[128];
 } sensor_ctx;
 } sensor_ctx;
@@ -132,58 +132,73 @@ void sensor_task(void)
 		sensor_ctx.tsk_sta = SENSOR_STA_WAIT_PWR;
 		sensor_ctx.tsk_sta = SENSOR_STA_WAIT_PWR;
 		break;
 		break;
 	case SENSOR_STA_WAIT_PWR: // 等待传感器上电完成
 	case SENSOR_STA_WAIT_PWR: // 等待传感器上电完成
-		if (HAL_GetTick() - sensor_ctx.tsk_timer > 1000)
+		if (HAL_GetTick() - sensor_ctx.tsk_timer > 3000)
 		{
 		{
 			sensor_ctx.tsk_sta = SENSOR_STA_TX;
 			sensor_ctx.tsk_sta = SENSOR_STA_TX;
 		}
 		}
 		break;
 		break;
 	case SENSOR_STA_TX:
 	case SENSOR_STA_TX:
 	{
 	{
-		const uint8_t read_cmd[] = {0x01, 0x03, 0x00, 0x00, 0x00, 0x07, 0x04, 0x08};
+		const uint8_t read_cmd[] = {0x01, 0x03, 0x00, 0x00, 0x00, 0x02, 0xC4, 0x0B};
 
 
 		sensor_set_bus_sta(BUS_STA_TX);
 		sensor_set_bus_sta(BUS_STA_TX);
 		sensor_write((uint8_t *)read_cmd, sizeof(read_cmd));
 		sensor_write((uint8_t *)read_cmd, sizeof(read_cmd));
 		sensor_set_bus_sta(BUS_STA_RX);
 		sensor_set_bus_sta(BUS_STA_RX);
-		sensor_ctx.tsk_sta = SENSOR_STA_WAIT_ACK;
+
+		sensor_ctx.rx_len = 0;
 		sensor_ctx.tsk_timer = HAL_GetTick();
 		sensor_ctx.tsk_timer = HAL_GetTick();
 		sensor_ctx.retry++;
 		sensor_ctx.retry++;
+
+	  sensor_ctx.tsk_sta = SENSOR_STA_WAIT_ACK;
 	}
 	}
 	break;
 	break;
 	case SENSOR_STA_WAIT_ACK: // 等待传感器应答
 	case SENSOR_STA_WAIT_ACK: // 等待传感器应答
 	{
 	{
 		int need_retry = 0;
 		int need_retry = 0;
 
 
-		if (sensor_ctx.rx_len >= 19)
+		if (sensor_ctx.rx_len >= 9)
 		{
 		{
-			if (CRC16(sensor_ctx.rx_buf, 19) == 0)
+			if(CRC16(sensor_ctx.rx_buf, 9) == 0)
 			{
 			{
-				sensor_data.temperature = ((uint16_t)sensor_ctx.rx_buf[7] << 8) + sensor_ctx.rx_buf[8];
-				sensor_data.humidity = (uint16_t)(sensor_ctx.rx_buf[9] << 8) + sensor_ctx.rx_buf[10];
-				sensor_data.illuminance = ((uint32_t)(sensor_ctx.rx_buf[13] << 8) + sensor_ctx.rx_buf[14]) * 10 + ((uint32_t)(sensor_ctx.rx_buf[15] << 8) + sensor_ctx.rx_buf[16]);
+				int16_t temperature = (int16_t)(((uint16_t)sensor_ctx.rx_buf[3] << 8) | sensor_ctx.rx_buf[4]);
+				int16_t humidity    = (int16_t)(((uint16_t)sensor_ctx.rx_buf[5] << 8) | sensor_ctx.rx_buf[6]);
+				if (temperature == 0x7FFF || humidity == 0x7FFF)
+        { // 传感器还没准备好
+					dbg_log("read sensor invalid: temperature=0x%04X, humidity=0x%04X", temperature, humidity);
+          sensor_ctx.rx_len = 0; sensor_ctx.tsk_timer = HAL_GetTick();
+        }
+        else
+        { // 传感器读到正确值
+          sensor_data.temperature = temperature;
+          sensor_data.humidity = humidity;
+          sensor_data.illuminance = 0;
+					sensor_ctx.retry = 0;
+					dbg_log("read sensor success: temperature=0x%04X, humidity=0x%04X", temperature, humidity);
+        }
 			}
 			}
 			else
 			else
 			{
 			{
 				need_retry = 1;
 				need_retry = 1;
 			}
 			}
 		}
 		}
-		else if (HAL_GetTick() - sensor_ctx.tsk_timer < 500)
-		{
-			break;
-		}
 		else
 		else
 		{
 		{
-			need_retry = 1;
+			if (HAL_GetTick() - sensor_ctx.tsk_timer < 1000)
+      {
+        break;
+      }
+      need_retry = 1;
 		}
 		}
+
 		if (need_retry)
 		if (need_retry)
 		{
 		{
-			if (sensor_ctx.retry < 3)
+			if (sensor_ctx.retry < 5)
 			{
 			{
-				sensor_ctx.rx_len = 0;
-				sensor_ctx.tsk_timer = 0;
 				sensor_ctx.tsk_sta = SENSOR_STA_TX;
 				sensor_ctx.tsk_sta = SENSOR_STA_TX;
 				break;
 				break;
 			}
 			}
 		}
 		}
+
 		// 成功采集到数据或达到最大重试次数
 		// 成功采集到数据或达到最大重试次数
 		// 保存数据
 		// 保存数据
 		rec_data_t rec_data;
 		rec_data_t rec_data;
@@ -203,9 +218,10 @@ void sensor_task(void)
 		else
 		else
 		{
 		{
 			rec_data.timestamp = sensor_ctx.timestamp;
 			rec_data.timestamp = sensor_ctx.timestamp;
-			rec_write(&rec_data);
 		}
 		}
 
 
+		rec_write(&rec_data);
+
 		sensor_ctx.tsk_sta = SENSOR_STA_STOP;
 		sensor_ctx.tsk_sta = SENSOR_STA_STOP;
 		HAL_GPIO_WritePin(PWR_RS485_GPIO_Port, PWR_RS485_Pin, GPIO_PIN_RESET);
 		HAL_GPIO_WritePin(PWR_RS485_GPIO_Port, PWR_RS485_Pin, GPIO_PIN_RESET);
 
 

BIN
ctrl_board_g070_app/docs/2926312501温湿度传感器DL15-M485-S1_V1.0.6说明书-Wps.pdf