From c7eb86a58c6bf6e79a2c2c908bec4909de6f88e7 Mon Sep 17 00:00:00 2001 From: stark1898y <1658608470@qq.com> Date: Sun, 15 Dec 2024 15:41:49 +0800 Subject: [PATCH] bsp_flash ok --- APP/peripheral_main.c | 4 ++++ BSP/inc/bsP_bt.h | 21 --------------------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 BSP/inc/bsP_bt.h diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c index 3fff56f..5986dd1 100644 --- a/APP/peripheral_main.c +++ b/APP/peripheral_main.c @@ -17,6 +17,7 @@ #include "gattprofile.h" #include "peripheral.h" +#include "bsp_flash.h" #include "bsp_adc.h" #include "bsp_key.h" @@ -173,6 +174,9 @@ int main(void) HAL_Init(); GAPRole_PeripheralInit(); Peripheral_Init(); + + BSP_FLASH_Init(); + Main_Circulation(); } diff --git a/BSP/inc/bsP_bt.h b/BSP/inc/bsP_bt.h deleted file mode 100644 index 102bcf3..0000000 --- a/BSP/inc/bsP_bt.h +++ /dev/null @@ -1,21 +0,0 @@ - - -struct __attribute__((packed)) valve_data -{ - // uint8_t valve_id; - // uint8_t valve_mac[6]; - uint8_t header; - uint8_t cmd; - uint8_t data_len; - uint8_t valve_type; // 阀门类型 - uint8_t valve_bat; // 1B 电池电压 30=3V,18=1.8V - uint8_t valve_status; // 1B 阀门工作状态 超欠压、过流 - uint8_t valve_connct_status; // 1B 阀门连接状态 (电磁阀BLE控制盒) 0=未连接 1=已连接 - uint8_t valve_switch_status; // 1B 阀门开关状态 0=未知 1=关闭 2=关闭过,未按按键恢复 3=关闭过,按下了恢复键 4=打开 - int8_t valve_temp; // 1B 阀门温度 有符号整数 25 ℃ - uint8_t valve_humidity; // 1B 阀门湿度 0~100%; - uint32_t valve_in_pressure; // 4B 阀门入口压力 Pa - uint32_t valve_out_pressure; // 4B 阀门出口压力 Pa - uint32_t valve_atm_pressure; // 4B 阀门大气压力 Pa - uint8_t tail; -};