From 1738e85dce8bbc33315ea8b46c9f6f46e28b5d93 Mon Sep 17 00:00:00 2001 From: stark1898y <1658608470@qq.com> Date: Tue, 3 Jun 2025 17:07:25 +0800 Subject: [PATCH] 2250mV --- .mrs/launch.json | 6 +++--- APP/peripheral_main.c | 3 +++ BSP/inc/bsp_valve.h | 7 ++++--- BSP/src/bsp_i2c.c | 4 ++-- HAL/include/CONFIG.h | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.mrs/launch.json b/.mrs/launch.json index 2de4e41..3ad6b01 100644 --- a/.mrs/launch.json +++ b/.mrs/launch.json @@ -5,7 +5,7 @@ "type": "mrs-debugger", "request": "launch", "name": "BLE_TYQ_CH584M", - "cwd": "f:\\BaiduSyncdisk\\SXDT\\BLE_TYQ\\Firmware\\BLE_TYQ_CH584M", + "cwd": "c:\\Users\\16586\\Desktop\\BLE_TYQ_CH584M", "openOCDCfg": { "useLocalOpenOCD": true, "executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe", @@ -39,8 +39,8 @@ "additionalCommands": [] }, "loadedFiles": { - "executableFile": "f:\\BaiduSyncdisk\\SXDT\\BLE_TYQ\\Firmware\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf", - "symbolFile": "f:\\BaiduSyncdisk\\SXDT\\BLE_TYQ\\Firmware\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf", + "executableFile": "c:\\Users\\16586\\Desktop\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf", + "symbolFile": "c:\\Users\\16586\\Desktop\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf", "executableFileOffset": 0, "symbolFileOffset": 0 }, diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c index 629aa6a..6671280 100644 --- a/APP/peripheral_main.c +++ b/APP/peripheral_main.c @@ -295,6 +295,9 @@ int main(void) // 手机APP显示是倒序的[5-0],不是[0-5] logDebug("MacAddr: %02X:%02X:%02X:%02X:%02X:%02X", MacAddr[5], MacAddr[4] , MacAddr[3], MacAddr[2], MacAddr[1], MacAddr[0]); + // DC:32:62:2B:D1:35 + logDebug("ID: %02X%02X%02X%02X%02X%02X", MacAddr[5], MacAddr[4] + , MacAddr[3], MacAddr[2], MacAddr[1], MacAddr[0]); // DelayMs(1000); diff --git a/BSP/inc/bsp_valve.h b/BSP/inc/bsp_valve.h index c0de180..cd2c7c5 100644 --- a/BSP/inc/bsp_valve.h +++ b/BSP/inc/bsp_valve.h @@ -2,7 +2,7 @@ * @Author : stark1898y 1658608470@qq.com * @Date : 2024-12-12 15:55:38 * @LastEditors : stark1898y 1658608470@qq.com - * @LastEditTime : 2025-05-30 16:33:29 + * @LastEditTime : 2025-06-03 17:06:52 * @FilePath : \BLE_TYQ_CH584M\BSP\inc\bsp_valve.h * @Description : * @@ -37,7 +37,6 @@ extern volatile uint8_t boost_en_flag; #define VAVLE_UPDATE_EVT (0x0001 << 10) // 上传更行阀门状态 - // #define VALVE_LOW_VBAT_ALARM_PERIOD_MS (1000 * 60 * 10) #define VALVE_DECT_PERIOD_MS (1000 * 60 * 3) @@ -50,7 +49,7 @@ extern volatile uint8_t boost_en_flag; // #define LOW_VABAT_CLOSE_VALUE 2000 -#define LOW_VABAT_CLOSE_MV 2200 +#define LOW_VABAT_CLOSE_MV 2250 #define HIGN_TEMP_CLOSE_C 60 @@ -58,6 +57,8 @@ extern volatile uint8_t boost_en_flag; #define FRAME_HEADER 0xAA #define FRAME_TAIL 0x55 + + // 0xAA CMD/DATA/ DATA_LEN (DATA) checksum 0x55 typedef enum diff --git a/BSP/src/bsp_i2c.c b/BSP/src/bsp_i2c.c index 24a22b0..02e157e 100644 --- a/BSP/src/bsp_i2c.c +++ b/BSP/src/bsp_i2c.c @@ -409,10 +409,10 @@ int BSP_ReadTempHumi(float *humi, float *temp) int ret; GXHTC3C_Wakeup(); - DelayMs(2); + DelayMs(1); GXHTC3C_GetStart(); - DelayMs(4); + DelayMs(3); float _humi, _temp; ret = GXHTC3C_GetTempHumi(&_humi, &_temp); if (ret == 0) diff --git a/HAL/include/CONFIG.h b/HAL/include/CONFIG.h index e4d871b..be4828f 100644 --- a/HAL/include/CONFIG.h +++ b/HAL/include/CONFIG.h @@ -134,7 +134,7 @@ #define BLE_TX_NUM_EVENT 1 #endif #ifndef BLE_TX_POWER -#define BLE_TX_POWER LL_TX_POWEER_0_DBM +#define BLE_TX_POWER LL_TX_POWEER_4_DBM #endif #ifndef PERIPHERAL_MAX_CONNECTION #define PERIPHERAL_MAX_CONNECTION 1