mirror of
https://git.aixiao.me/aixiao/Danger-alarm.git
synced 2025-07-29 19:13:39 +08:00
修复编译错误
This commit is contained in:
@@ -38,7 +38,9 @@ static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK)
|
||||
//printf("CHECKSUM: %X = %X\n", CO2_DATA[8], CHECKSUM);
|
||||
//printf("CO2 Concentration: %d ppm\n", CO2_CONC);
|
||||
*MH_Z14B_DATA_IS_OK = 1;
|
||||
} else {
|
||||
}
|
||||
/*
|
||||
else {
|
||||
// 校准传感器 零点 (ZERO)
|
||||
uint8_t ZERO[] = { 0XFF, 0X01, 0X87, 0X00, 0X00, 0X00, 0X00, 0X00, 0X78 };
|
||||
uart_write_blocking(UART1, ZERO, 9);
|
||||
@@ -54,6 +56,7 @@ static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK)
|
||||
*MH_Z14B_DATA_IS_OK = 0;
|
||||
printf("CO2 concentration reading failed!\n");
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
return CO2_CONC;
|
||||
@@ -75,6 +78,9 @@ void CO2(void *pvParameters)
|
||||
snprintf(CO2_DATA_TEMP, BUFER, "CO2 Concentration: %d ppm\n", CO2_DATA);
|
||||
_HC_12(CO2_DATA_TEMP);
|
||||
memset(CO2_DATA_TEMP, 0, BUFER);
|
||||
} else {
|
||||
printf("CO2 reading failed!!!");
|
||||
vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时
|
||||
}
|
||||
|
||||
//_printTaskStackHighWaterMark("CO2");
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "main.hpp"
|
||||
#include "lwipopts.h"
|
||||
#include "common.hpp"
|
||||
#include "ds18b20.hpp"
|
||||
#include "DS18B20.hpp"
|
||||
#include "ZC13.hpp"
|
||||
#include "ZE07CO.hpp"
|
||||
#include "MHZ14B.hpp"
|
||||
@@ -82,7 +82,7 @@ void CPU(void *pvParameters)
|
||||
}
|
||||
}
|
||||
|
||||
int main(void)
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
stdio_init_all();
|
||||
sleep_ms(3000);
|
||||
|
||||
Reference in New Issue
Block a user