diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b418a5..170fe14 100644 --- a/.vscode/settings.json +++ b/.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" + } } \ No newline at end of file diff --git a/README.md b/README.md index cfe2907..ea3eac0 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ 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,8 +31,13 @@ cmake -DPICO_BOARD=pico_w .. make + # FreeRTOS 版本构建 + cd ~/Danger-alarm/SOFTWARE-FreeRTOS + mkdir build + cmake -DPICO_BOARD=pico_w .. && make -j4 - # 树莓派Zero W 433MHZ HC-12接收服务端构建 + + # 树莓派Zero W 433MHZ HC-12接收服务端构建(需要自己设置Raspberry Pi 串口) apt install libmysqlclient-dev cd ~ git clone https://github.com/WiringPi/WiringPi.git diff --git a/SOFTWARE-FreeRTOS/Source/DS18B20.cpp b/SOFTWARE-FreeRTOS/Source/DS18B20.cpp index 62e6cc1..7dcc182 100644 --- a/SOFTWARE-FreeRTOS/Source/DS18B20.cpp +++ b/SOFTWARE-FreeRTOS/Source/DS18B20.cpp @@ -10,6 +10,7 @@ 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 { @@ -23,19 +24,24 @@ void DS18B20(void *pvParameters) 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); - sleep_ms(1000); 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) { - char TEMPERATURE_TEMP[BUFER] = { 0 }; + sprintf(TEMPERATURE_TEMP, "Temperature: %.3f°C\n", TEMPERATURE); _HC_12(TEMPERATURE_TEMP); - + memset(TEMPERATURE_TEMP, 0, BUFER); TEMPERATURE = -1; } /* @@ -45,7 +51,7 @@ void DS18B20(void *pvParameters) */ //_printTaskStackHighWaterMark("DS18B20"); //watchdog_update(); // 喂狗 - vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时 + vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时 } return ; diff --git a/SOFTWARE-FreeRTOS/Source/DS18B20.hpp b/SOFTWARE-FreeRTOS/Source/DS18B20.hpp index d9f2e41..7d0ac14 100644 --- a/SOFTWARE-FreeRTOS/Source/DS18B20.hpp +++ b/SOFTWARE-FreeRTOS/Source/DS18B20.hpp @@ -7,6 +7,7 @@ #include "semphr.h" #include "queue.h" +#include #include #include #include "pico/stdlib.h" diff --git a/SOFTWARE-FreeRTOS/Source/MHZ14B.cpp b/SOFTWARE-FreeRTOS/Source/MHZ14B.cpp index c4c8dee..5839579 100644 --- a/SOFTWARE-FreeRTOS/Source/MHZ14B.cpp +++ b/SOFTWARE-FreeRTOS/Source/MHZ14B.cpp @@ -20,7 +20,8 @@ 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 }; @@ -41,12 +42,14 @@ static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK) // 校准传感器 零点 (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"); @@ -58,8 +61,9 @@ static uint16_t MH_Z14B(int *MH_Z14B_DATA_IS_OK) 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"); @@ -67,16 +71,16 @@ void CO2(void *pvParameters) CO2_DATA = MH_Z14B(&MH_Z14B_DATA_IS_OK); if (CO2_DATA != -1 && MH_Z14B_DATA_IS_OK == 1) { printf("CO2 Concentration: %d ppm\n", CO2_DATA); - - char CO2_DATA_TEMP[BUFER] = { 0 }; - sprintf(CO2_DATA_TEMP, "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); } //_printTaskStackHighWaterMark("CO2"); watchdog_update(); // 喂狗 - vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时 + vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时 printf("\n"); } diff --git a/SOFTWARE-FreeRTOS/Source/MHZ14B.hpp b/SOFTWARE-FreeRTOS/Source/MHZ14B.hpp index 4defe7b..da4031d 100644 --- a/SOFTWARE-FreeRTOS/Source/MHZ14B.hpp +++ b/SOFTWARE-FreeRTOS/Source/MHZ14B.hpp @@ -7,6 +7,7 @@ #include "semphr.h" #include "queue.h" +#include #include "pico/stdlib.h" #include "hardware/clocks.h" #include "hardware/watchdog.h" diff --git a/SOFTWARE-FreeRTOS/Source/ZC13.cpp b/SOFTWARE-FreeRTOS/Source/ZC13.cpp index 26b9500..a24fdc9 100644 --- a/SOFTWARE-FreeRTOS/Source/ZC13.cpp +++ b/SOFTWARE-FreeRTOS/Source/ZC13.cpp @@ -105,18 +105,19 @@ int ZC13(const char *model) void CH4(void *pvParameters) { ZC13_INIT(); + char CH4_DATA[BUFER] = { 0 }; _printTaskStackHighWaterMark("CH4"); while (1) { - char CH4_DATA[BUFER] = { 0 }; - sprintf(CH4_DATA, "CH4 Concentration: %d\n", ZC13("ZC05")); + 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(3000)); // 非阻塞延时 + vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时 } return ; diff --git a/SOFTWARE-FreeRTOS/Source/ZC13.hpp b/SOFTWARE-FreeRTOS/Source/ZC13.hpp index 4b3829f..9f89b1d 100644 --- a/SOFTWARE-FreeRTOS/Source/ZC13.hpp +++ b/SOFTWARE-FreeRTOS/Source/ZC13.hpp @@ -7,6 +7,7 @@ #include "semphr.h" #include "queue.h" +#include #include #include #include "pico/stdlib.h" diff --git a/SOFTWARE-FreeRTOS/Source/ZE07CO.cpp b/SOFTWARE-FreeRTOS/Source/ZE07CO.cpp index 97716df..9b4edec 100644 --- a/SOFTWARE-FreeRTOS/Source/ZE07CO.cpp +++ b/SOFTWARE-FreeRTOS/Source/ZE07CO.cpp @@ -21,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) { @@ -81,7 +82,7 @@ void CO(void *pvParameters) //_printTaskStackHighWaterMark("CO"); //watchdog_update(); // 喂狗 - vTaskDelay(pdMS_TO_TICKS(3000)); // 非阻塞延时 + vTaskDelay(pdMS_TO_TICKS(5000)); // 非阻塞延时 } return;