修复编译错误

还存在微小问题，由于CO2传感器必须通过看门狗重启一次后才能正常，这个问题还没解决。（喂狗只在CO2函数内，保证能重启RP2040）

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "SOFTWARE/Lib/pico-onewire"]
 	path = SOFTWARE/Lib/pico-onewire
 	url = https://github.com/adamboardman/pico-onewire.git
-[submodule "SOFTWARE/Server/libconf"]
-	path = SOFTWARE/Server/libconf
-	url = https://git.aixiao.me/aixiao/libconf.git
 [submodule "SOFTWARE-FreeRTOS/FreeRTOS-Kernel"]
 	path = SOFTWARE-FreeRTOS/FreeRTOS-Kernel
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+[submodule "SERVER/libconf"]
+	path = SERVER/libconf
+	url = https://git.aixiao.me/aixiao/libconf.git

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
     "cmake.sourceDirectory": "/mnt/c/Users/niuyuling/Desktop/raspberry-pico/Danger-alarm/SOFTWARE",
-    "C_Cpp.errorSquiggles": "disabled"
+    "C_Cpp.errorSquiggles": "disabled",
+    "files.associations": {
+        "cstring": "cpp"
+    }
 }

README.md

@@ -1,4 +1,4 @@
-# 基于 Raspberry Pico / Pico W 的厨房危险(火灾)报警  （Pico W WiFi传输暂时不玩）
+# 基于 Raspberry Pico / Pico W (RP2040 FreeRTOS) 的厨房危险(火灾)报警  （Pico W WiFi传输暂时不玩）
 
 * 使用 DS18B20温度传感器  
 * 使用 CH4 N55A甲烷气体传感器(进口) (弃用)  
@@ -11,14 +11,20 @@
 ## 源码构建
 
 ```bash
-    # 使用WSL Debian GNU/Linux 12 (bookworm) 构建
+    # 使用WSL Debian GNU/Linux 12 (bookworm) 构建，或者 Operating System: Ubuntu 23.10
     # 确保Pico-SDK环境变量
-    export PICO_SDK_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry-pico/SDK/pico-sdk
-    export PICO_EXTRAS_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry-pico/SDK/pico-extras
+    # 使用官方工具 https://github.com/raspberrypi/pico-setup 下载并设置 SDK 环境变量
+    export PICO_SDK_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry/pico-setup/pico/pico-sdk
+    export PICO_EXAMPLES_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry/pico-setup/pico/pico-examples
+    export PICO_EXTRAS_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry/pico-setup/pico/pico-extras
+    export PICO_PLAYGROUND_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry/pico-setup/pico/pico-playground
+    export PICOTOOL_FETCH_FROM_GIT_PATH=/mnt/c/Users/niuyuling/Desktop/raspberry/pico-setup/pico/picotool
     
     apt install cmake gcc-arm-none-eabi gcc g++
     apt install gdb-multiarch automake autoconf build-essential texinfo libtool libftdi-dev libusb-1.0-0-dev
     
+    # RP2040 SDK 版本构建
+    cd ~
     git clone https://git.aixiao.me/aixiao/Danger-alarm.git
     cd Danger-alarm
     git submodule init
@@ -29,15 +35,21 @@
     cmake -DPICO_BOARD=pico_w ..
     make
 
+    # FreeRTOS 版本构建
+    cd ~/Danger-alarm/SOFTWARE-FreeRTOS
+    mkdir build
+    cd build
+    cmake -DPICO_BOARD=pico_w .. && make -j4
 
-    # 树莓派Zero W 433MHZ HC-12接收服务端构建
+
+    # 树莓派Zero W 433MHZ HC-12接收服务端构建(需要自己开启 Raspberry Pi 串口, 并连接好硬件 HC-12)
     apt install libmysqlclient-dev
     cd ~
     git clone https://github.com/WiringPi/WiringPi.git
     cd WiringPi
     ./build
-    cd ~/Danger-alarm/SOFTWARE/Server/hc-12
-    make clean; make
+    cd ~/Danger-alarm/SERVER/libconf && make clean; make
+    cd ~/Danger-alarm/SERVER/hc-12 && make clean; make
     ./hc-12
     
 ```

SERVER/hc-12/Makefile

@@ -17,5 +17,5 @@ hc-12:  hc-12.o ../libconf/libconf.o mysql.o
 	$(CC) $(CFLAGS) $(MYSQL_CFLAGS) -c $< $@
     
 clean:
-	rm hc-12 hc-12.o ../libconf/libconf.o mysql.o
+	rm hc-12 *.o
 

SOFTWARE-FreeRTOS/CMakeLists.txt

@@ -41,6 +41,7 @@ target_Sources(main PRIVATE
         ${CMAKE_CURRENT_LIST_DIR}/Source/ZC13.cpp
         ${CMAKE_CURRENT_LIST_DIR}/Source/ZE07CO.cpp
         ${CMAKE_CURRENT_LIST_DIR}/Source/MHZ14B.cpp
+        ${CMAKE_CURRENT_LIST_DIR}/Source/HC-12.cpp
     )
 
 target_include_directories(main PRIVATE

SOFTWARE-FreeRTOS/Source/DS18B20.cpp

@@ -1,144 +1,58 @@
 #include "DS18B20.hpp"
+#include "HC-12.hpp"
 #include "common.hpp"
 
 QueueHandle_t xQueue;
 
 
-#define MAX_TIMINGS 85
-
-void ds18b20_init() {
-    gpio_init(DS18B20_PIN);
-    gpio_set_dir(DS18B20_PIN, GPIO_OUT);
-    gpio_put(DS18B20_PIN, 1); // 上拉电阻
-}
-
-void ds18b20_write_bit(uint8_t bit) {
-    gpio_set_dir(DS18B20_PIN, GPIO_OUT);
-    gpio_put(DS18B20_PIN, 0);
-    sleep_us(bit ? 10 : 60);
-    gpio_put(DS18B20_PIN, 1);
-    sleep_us(bit ? 55 : 5);
-}
-
-uint8_t ds18b20_read_bit() {
-    uint8_t bit = 0;
-    gpio_set_dir(DS18B20_PIN, GPIO_OUT);
-    gpio_put(DS18B20_PIN, 0);
-    sleep_us(3);
-    gpio_set_dir(DS18B20_PIN, GPIO_IN);
-    sleep_us(10);
-    bit = gpio_get(DS18B20_PIN);
-    sleep_us(50);
-    return bit;
-}
-
-void ds18b20_write_byte(uint8_t byte) {
-    for (int i = 0; i < 8; i++) {
-        ds18b20_write_bit(byte & 0x01);
-        byte >>= 1;
-    }
-}
-
-uint8_t ds18b20_read_byte() {
-    uint8_t byte = 0;
-    for (int i = 0; i < 8; i++) {
-        byte >>= 1;
-        if (ds18b20_read_bit()) {
-            byte |= 0x80;
-        }
-    }
-    return byte;
-}
-
-int ds18b20_reset() {
-    gpio_set_dir(DS18B20_PIN, GPIO_OUT);
-    gpio_put(DS18B20_PIN, 0);
-    sleep_us(480);
-    gpio_put(DS18B20_PIN, 1);
-    gpio_set_dir(DS18B20_PIN, GPIO_IN);
-    sleep_us(70);
-    int presence = !gpio_get(DS18B20_PIN);
-    sleep_us(410);
-    return presence;
-}
-
-float ds18b20_read_temperature() {
-    if (!ds18b20_reset()) {
-        printf("DS18B20 not found\n");
-        return -1;
-    }
-
-    ds18b20_write_byte(0xCC); // 跳过ROM指令
-    ds18b20_write_byte(0x44); // 启动温度转换
-
-    sleep_ms(750); // 温度转换时间，具体时间请参考传感器数据手册
-
-    if (!ds18b20_reset()) {
-        printf("DS18B20 not found\n");
-        return -1;
-    }
-
-    ds18b20_write_byte(0xCC); // 跳过ROM指令
-    ds18b20_write_byte(0xBE); // 读取暂存器
-
-    uint8_t lsb = ds18b20_read_byte();
-    uint8_t msb = ds18b20_read_byte();
-    int16_t temp = (msb << 8) | lsb;
-
-    // 检查传感器数据有效性
-    if (temp == 0xFFFF) {
-        printf("Invalid temperature data\n");
-        return -1;
-    }
-
-    return temp / 16.0; // 转换为摄氏度
-}
-
-
 // 温度传感器
 void DS18B20(void *pvParameters)
 {
-    
     // One_wire 第三方库方法
     float TEMPERATURE = -1;
-
+    char TEMPERATURE_TEMP[BUFER] = { 0 };
     One_wire one_wire(DS18B20_PIN);
     one_wire.init();
     rom_address_t address {
+        
     };
 
+
     _printTaskStackHighWaterMark("DS18B20");
 
     while (1) {
+
+    
         one_wire.single_device_read_rom(address);
-        one_wire.convert_temperature(address, true, false);
+        int delay_time = one_wire.convert_temperature(address, true, false);
+        //printf("Conversion delay time: %d ms\n", delay_time);
+
         TEMPERATURE = one_wire.temperature(address);
 
-        printf("Device Address: %02x%02x%02x%02x%02x%02x%02x%02x DS18B20 Temperature: %3.1f°C\n", address.rom[0], address.rom[1], address.rom[2], address.rom[3], address.rom[4], address.rom[5], address.rom[6], address.rom[7], one_wire.temperature(address));
-
+        printf("Device Address: %02x%02x%02x%02x%02x%02x%02x%02x DS18B20 Temperature: %3.1f°C\n", \
+                address.rom[0], address.rom[1], address.rom[2], address.rom[3], address.rom[4], \
+                address.rom[5], address.rom[6], address.rom[7], one_wire.temperature(address));
+                
+        if (TEMPERATURE == -1000) {
+            continue;
+        }
+        
+        if (TEMPERATURE != 85) {
+                
+                sprintf(TEMPERATURE_TEMP, "Temperature: %.3f°C\n", TEMPERATURE);
+                _HC_12(TEMPERATURE_TEMP);
+                memset(TEMPERATURE_TEMP, 0, BUFER);
+                TEMPERATURE = -1;
+        }
+/*
         // 发送数据到队列
         xQueueSend(xQueue, &TEMPERATURE, portMAX_DELAY);
         vTaskDelay(pdMS_TO_TICKS(1000));
-
+*/
         //_printTaskStackHighWaterMark("DS18B20");
-        watchdog_update();                  // 喂狗
-        vTaskDelay(pdMS_TO_TICKS(3000));    // 非阻塞延时
+        //watchdog_update();                  // 喂狗
+        vTaskDelay(pdMS_TO_TICKS(5000));    // 非阻塞延时
     }
     
-    /*
-    ds18b20_init();
-
-    while (1) {
-        float temperature = ds18b20_read_temperature();
-        if (temperature != -1) {
-            printf("DS18B20 Temperature: %.2f°C\n", temperature);
-        } else {
-            printf("Failed to read temperature\n");
-        }
-        
-        watchdog_update();                  // 喂狗
-        vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时
-    }
-    */
-    return;
+    return ;
 }

SOFTWARE-FreeRTOS/Source/DS18B20.hpp

@@ -7,6 +7,7 @@
 #include "semphr.h"
 #include "queue.h"
 
+#include <cstring>
 #include <cstdio>
 #include <stdbool.h>
 #include "pico/stdlib.h"
@@ -15,6 +16,7 @@
 #include "../../SOFTWARE/Lib/pico-onewire/api/one_wire.h"
 
 #define DS18B20_PIN 15          // DS18B20 引脚
+#define BUFER 256
 
 extern QueueHandle_t xQueue;
 extern void DS18B20(void *pvParameters);

SOFTWARE-FreeRTOS/Source/HC-12.cpp

@@ -11,7 +11,7 @@ void _HC_12_INIT()
     return;
 }
 
-void _HC_12(const char *string)
+void _HC_12(char *string)
 {
     uart_tx_program_puts(HC_12_PIO, HC_12_PIO_SM_TX, string);
     sleep_ms(100);

SOFTWARE-FreeRTOS/Source/HC-12.hpp

@@ -14,6 +14,6 @@
 #define HC_12_PIO_SERIAL_BAUD 9600
 
 extern void _HC_12_INIT();
-extern void _HC_12(const char *string);
+extern void _HC_12(char *string);
 
 #endif

SOFTWARE-FreeRTOS/Source/MHZ14B.cpp

@@ -1,5 +1,6 @@
 #include "MHZ14B.hpp"
 #include "common.hpp"
+#include "HC-12.hpp"
 
 void MH_Z14B_INIT()
 {
@@ -9,16 +10,18 @@ void MH_Z14B_INIT()
     gpio_set_function(UART1_RX_PIN, GPIO_FUNC_UART);
     uart_set_hw_flow(UART1, false, false);
     uart_set_format(UART1, DATA_BITS, STOP_BITS, PARITY);
+    
+    return ;
 }
 
 // CO2
 static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK)
 {
-
     // 0x86 读气体浓度值
     uint8_t CMD[9] = { 0xFF, 0x01, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79 };
     uart_write_blocking(UART1, CMD, 9);
-    sleep_ms(200);
+    //sleep_ms(200);
+    vTaskDelay(pdMS_TO_TICKS(200));    // 非阻塞延时
 
     // 读取
     uint8_t CO2_DATA[9] = { 0 };
@@ -28,46 +31,64 @@ static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK)
     uint16_t CO2_CONC = (256 * CO2_DATA[2]) + CO2_DATA[3];
 
     // 校验
-    uint8_t CHECKSUM = (0xFF - (CO2_DATA[1] + CO2_DATA[2] + CO2_DATA[3] + CO2_DATA[4] + CO2_DATA[5] + CO2_DATA[6] + CO2_DATA[7])) + 1;
+    uint8_t CHECKSUM = (0xFF - (CO2_DATA[1] + CO2_DATA[2] + CO2_DATA[3] + CO2_DATA[4] + \
+        CO2_DATA[5] + CO2_DATA[6] + CO2_DATA[7])) + 1;
 
     if (CO2_DATA[8] == CHECKSUM && CO2_DATA[1] == 0x86) {
         //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);
-        sleep_ms(200);
+        //sleep_ms(200);
+        vTaskDelay(pdMS_TO_TICKS(200));    // 非阻塞延时
 
         // 校准传感器 跨度点 （SPAN）
         uint8_t SPAN[] = { 0XFF, 0X01, 0X88, 0X07, 0XD0, 0X00, 0X00, 0X00, 0XA0 };
         uart_write_blocking(UART1, SPAN, 9);
-        sleep_ms(200);
+        //sleep_ms(200);
+        vTaskDelay(pdMS_TO_TICKS(200));    // 非阻塞延时
 
         *MH_Z14B_DATA_IS_OK = 0;
         printf("CO2 concentration reading failed!\n");
     }
+    */
+
 
     return CO2_CONC;
 }
 
 void CO2(void *pvParameters)
 {
-    uint16_t CO2_DATA = -1;
+    uint16_t CO2_DATA = 0;
     int MH_Z14B_DATA_IS_OK = 0;
+    char CO2_DATA_TEMP[BUFER] = { 0 };
     MH_Z14B_INIT();
     _printTaskStackHighWaterMark("CO2");
 
     while (1) {
         CO2_DATA = MH_Z14B(&MH_Z14B_DATA_IS_OK);
-        if (CO2_DATA != -1 && MH_Z14B_DATA_IS_OK == 1) {
+         if (CO2_DATA != -1 && MH_Z14B_DATA_IS_OK == 1) {
             printf("CO2 Concentration: %d ppm\n", CO2_DATA);
+
+            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");
         watchdog_update();                  // 喂狗
         
-        vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时
+        vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时
         printf("\n");
     }
+    
+    return ;
 }

SOFTWARE-FreeRTOS/Source/MHZ14B.hpp

@@ -7,6 +7,7 @@
 #include "semphr.h"
 #include "queue.h"
 
+#include <cstring>
 #include "pico/stdlib.h"
 #include "hardware/clocks.h"
 #include "hardware/watchdog.h"
@@ -26,6 +27,7 @@
 #define UART1_TX_PIN 5          // MH-Z14B T
 #define UART1_RX_PIN 4          // MH-Z14B R
 
+#define BUFER 256
 extern void CO2(void *pvParameters);
 
 #endif

SOFTWARE-FreeRTOS/Source/ZC13.cpp

@@ -1,5 +1,6 @@
 #include "ZC13.hpp"
 #include "common.hpp"
+#include "HC-12.hpp"
 
 int ZC13_INIT()
 {
@@ -33,7 +34,7 @@ int ZC13_PIO_UART_RX_DATA(PIO pio, uint sm, uint8_t * DATA, int DATA_LEN)
         if (uart_rx_program_available(pio, sm)) {
             c = uart_rx_program_getc(pio, sm);
             DATA[received_count++] = c;
-            //printf("0x%X ", c);
+            printf("0x%X ", c);
             if (c == '\n') {
                 // 接收到换行符，停止接收数据
                 break;
@@ -66,8 +67,8 @@ int ZC13(const char *model)
     // 接收指令
     CH4_DATA_LEN = ZC13_PIO_UART_RX_DATA(ZC13_PIO, ZC13_PIO_SM_RX, CH4_DATA, 9);
 
-    //printf("\n");
-    // printf("%d\n", CH4_DATA_LEN);
+    printf("\n");
+    printf("%d\n", CH4_DATA_LEN);
 
     uint8_t highByte = CH4_DATA[2]; // 假设这是气体浓度高位字节
     uint8_t lowByte = CH4_DATA[3]; // 假设这是气体浓度高位字节
@@ -104,13 +105,20 @@ int ZC13(const char *model)
 void CH4(void *pvParameters)
 {
     ZC13_INIT();
-    _printTaskStackHighWaterMark("ZC13");
+    char CH4_DATA[BUFER] = { 0 };
+    _printTaskStackHighWaterMark("CH4");
 
-    while (1) {
-
-        ZC13("ZC05");
-        //_printTaskStackHighWaterMark("ZC13");
-        watchdog_update();                  // 喂狗
-        vTaskDelay(pdMS_TO_TICKS(3000));    // 非阻塞延时
+    while (1)
+    {
+        
+        snprintf(CH4_DATA, BUFER, "CH4 Concentration: %d\n", ZC13("ZC05"));
+        _HC_12(CH4_DATA);
+        memset(CH4_DATA, 0, BUFER);
+        
+        //_printTaskStackHighWaterMark("CH4");
+        //watchdog_update();                  // 喂狗
+        vTaskDelay(pdMS_TO_TICKS(5000));    // 非阻塞延时
     }
+    
+    return ;
 }

SOFTWARE-FreeRTOS/Source/ZC13.hpp

@@ -7,6 +7,7 @@
 #include "semphr.h"
 #include "queue.h"
 
+#include <cstring>
 #include <stdio.h>
 #include <strings.h>
 #include "pico/stdlib.h"
@@ -22,6 +23,7 @@
 #define ZC13_PIO_SM_RX 1
 #define ZC13_PIO_SERIAL_BAUD 9600
 
+#define BUFER 256
 extern void CH4(void *pvParameters);
 
 #endif

SOFTWARE-FreeRTOS/Source/ZE07CO.cpp

@@ -1,4 +1,5 @@
 #include "ZE07CO.hpp"
+#include "HC-12.hpp"
 #include "common.hpp"
 
 void ZE07CO_INIT()
@@ -20,6 +21,7 @@ static uint16_t ZE07CO(int ANSWER, int *ZE07_CO_DATA_IS_OK)
         static uint8_t _ANSWER[9] = { 0xFF, 0x01, 0x78, 0x41, 0x00, 0x00, 0x00, 0x00, 0x46 };
         uart_write_blocking(UART0, _ANSWER, 9);
         sleep_ms(100);
+        
     }
     
     if (ANSWER == 2) {
@@ -71,10 +73,16 @@ void CO(void *pvParameters)
         CO_DATA = ZE07CO(2, &ZE07_CO_DATA_IS_OK);
         if (CO_DATA != -1 && ZE07_CO_DATA_IS_OK == 1) {
             printf("CO Concentration: %d ppm\n", CO_DATA);
+            
+            char CO_DATA_TEMP[BUFER] = { 0 };
+            sprintf(CO_DATA_TEMP, "CO Concentration: %d ppm\n", CO_DATA);
+            _HC_12(CO_DATA_TEMP);
+            
         }
+        
         //_printTaskStackHighWaterMark("CO");
-        watchdog_update();                  // 喂狗
-        vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时
+        //watchdog_update();                  // 喂狗
+        vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时
     }
     
     return;

SOFTWARE-FreeRTOS/Source/ZE07CO.hpp

@@ -26,6 +26,7 @@
 #define UART0_TX_PIN 1          // T
 #define UART0_RX_PIN 0          // R
 
+#define BUFER 256
 extern void CO(void *pvParameters);
 
 #endif

SOFTWARE-FreeRTOS/Source/main.cpp

@@ -14,14 +14,15 @@
 #include "main.hpp"
 #include "lwipopts.h"
 #include "common.hpp"
-#include "ds18b20.hpp"
+#include "DS18B20.hpp"
 #include "ZC13.hpp"
 #include "ZE07CO.hpp"
 #include "MHZ14B.hpp"
+#include "HC-12.hpp"
 
 #ifndef PICO_DEFAULT_LED_PIN
-#warning pio/hello_pio example requires a board with a regular LED
-#define PICO_DEFAULT_LED_PIN 25
+    #warning pio/hello_pio example requires a board with a regular LED
+    #define PICO_DEFAULT_LED_PIN 25
 #endif
 
 void Led_Blinky(void *pvParameters)
@@ -48,7 +49,7 @@ void Led_Blinky(void *pvParameters)
             // 处理接收到的数据
             printf("%f\n", TEMPERATURE);
         }
-        //_printTaskStackHighWaterMark("Led_Blinky");
+        _printTaskStackHighWaterMark("Led_Blinky");
     }
 }
 
@@ -60,7 +61,7 @@ void CPU(void *pvParameters)
     adc_set_temp_sensor_enabled(true);
     adc_select_input(4);        // Input 4 is the onboard temperature sensor.
 
-    //_printTaskStackHighWaterMark("Read_Onboard_Temperature");
+    _printTaskStackHighWaterMark("CPU_");
 
     while (1) {
         const float conversionFactor = 3.3f / (1 << 12);
@@ -69,14 +70,19 @@ void CPU(void *pvParameters)
         float tempC = 27.0f - (adc - 0.706f) / 0.001721f;
 
         printf("CPU temperature %.02f°C %.02f°F\n", tempC, (tempC * 9 / 5 + 32));
+        
+        
+        char ONBOARD_TEMPERATURE_TEMP[BUFER] = { 0 };
+        sprintf(ONBOARD_TEMPERATURE_TEMP, "Onboard temperature %.02f°C %.02f°F\n", tempC, (tempC * 9 / 5 + 32));
+        _HC_12(ONBOARD_TEMPERATURE_TEMP);
 
-        //_printTaskStackHighWaterMark("Read_Onboard_Temperature");
+        _printTaskStackHighWaterMark("CPU_");
 
         vTaskDelay(pdMS_TO_TICKS(3000));    // 非阻塞延时
     }
 }
 
-int main(void)
+int main(int argc, char *argv[])
 {
     stdio_init_all();
     sleep_ms(3000);
@@ -88,11 +94,13 @@ int main(void)
         printf("Clean boot\n");
     }
     watchdog_enable(8300, 1);   // 8秒检测是否重新加载看门狗计数器. (不更新计数器则重启硬件, 最高8秒)
-    watchdog_start_tick(12);
+    //watchdog_start_tick(12);
 
     // 创建队列
     xQueue = xQueueCreate(10, sizeof(long));
 
+    _HC_12_INIT();
+
     // 创建任务
     BaseType_t xReturned;
     TaskHandle_t CPU_xHandle = NULL;
@@ -101,7 +109,7 @@ int main(void)
     TaskHandle_t CH4_xHandle = NULL;
     TaskHandle_t CO_xHandle = NULL;
     TaskHandle_t CO2_xHandle = NULL;
-    
+
 
     // 板载CPU温度
     xReturned = xTaskCreate(CPU, "CPU task", 512, NULL, tskIDLE_PRIORITY, &CPU_xHandle);
@@ -122,22 +130,23 @@ int main(void)
     }
 
     // CH4
-    xReturned = xTaskCreate(CH4, "CH4 task", 1024, NULL, tskIDLE_PRIORITY, &CH4_xHandle);
+    xReturned = xTaskCreate(CH4, "CH4 task", 2048, NULL, tskIDLE_PRIORITY, &CH4_xHandle);
     if (xReturned == errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY) {
         printf("CH4() Task Error!");
     }
-    
+
     // CO
     xReturned = xTaskCreate(CO, "CO task", 2048, NULL, tskIDLE_PRIORITY, &CO_xHandle);
     if (xReturned == errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY) {
         printf("CO() Task Error!");
     }
-    
+
     // CO2
-    xReturned = xTaskCreate(CO2, "CO2 task", 1024, NULL, tskIDLE_PRIORITY, &CO2_xHandle);
+    xReturned = xTaskCreate(CO2, "CO2 task", 2048, NULL, tskIDLE_PRIORITY, &CO2_xHandle);
     if (xReturned == errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY) {
         printf("CO2() Task Error!");
     }
+    
 
     vTaskStartScheduler();
     while (1) {};

SOFTWARE-FreeRTOS/Source/main.hpp

@@ -14,4 +14,6 @@
 #include "hardware/pwm.h"
 #include "hardware/adc.h"
 
+#define BUFER 256
+
 #endif

SOFTWARE/CMakeLists.txt

@@ -17,7 +17,7 @@ pico_generate_pio_header(Danger-alarm ${CMAKE_CURRENT_LIST_DIR}/Source/uart_tx.p
 pico_generate_pio_header(Danger-alarm ${CMAKE_CURRENT_LIST_DIR}/Source/uart_rx.pio)
 
 target_sources(Danger-alarm PRIVATE 
-    lib/radio-switch.cc
+    Lib/radio-switch.cc
     ${CMAKE_CURRENT_LIST_DIR}/Source/common.c
     ${CMAKE_CURRENT_LIST_DIR}/Source/MAIN.cpp
     ${CMAKE_CURRENT_LIST_DIR}/Source/DTH11.cpp

SOFTWARE/Source/MAIN.cpp

@@ -150,7 +150,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);
@@ -164,6 +166,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;
 }
@@ -251,7 +254,7 @@ static void core1_main()
     return;
 }
 
-int main()
+int main(int argc, char *argv[])
 {
     stdio_init_all();
     sleep_ms(1000);
@@ -370,7 +373,7 @@ int main()
         printf("\r\n");
 
         watchdog_update();      // 喂狗
-        sleep_ms(3000);
+        sleep_ms(5000);
         watchdog_update();      // 喂狗
     }
 

SOFTWARE/Source/MAIN.hpp

@@ -4,8 +4,8 @@
 #include <cstdio>
 #include "pico/stdlib.h"
 #include "hardware/gpio.h"
-#include "lib/pico-onewire/api/one_wire.h"
-#include "lib/radio-switch.h"
+#include "Lib/pico-onewire/api/one_wire.h"
+#include "Lib/radio-switch.h"
 
 #include "hardware/clocks.h"
 #include "hardware/watchdog.h"