SXDT-Embedded
/
BLE_TYQ_CH584M
mirror of https://gitee.com/SXDT-Embedded/BLE_TYQ_CH584M.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2250mV

This commit is contained in:
stark1898y 2025-06-03 17:07:25 +08:00
parent 2585ab4895
commit 1738e85dce
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.mrs/launch.json
View File

@ -5,7 +5,7 @@
"type": "mrs-debugger", "type": "mrs-debugger",
"request": "launch", "request": "launch",
"name": "BLE_TYQ_CH584M", "name": "BLE_TYQ_CH584M",
"cwd": "f:\\BaiduSyncdisk\\SXDT\\BLE_TYQ\\Firmware\\BLE_TYQ_CH584M", "cwd": "c:\\Users\\16586\\Desktop\\BLE_TYQ_CH584M",
"openOCDCfg": { "openOCDCfg": {
"useLocalOpenOCD": true, "useLocalOpenOCD": true,
"executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe", "executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe",
@ -39,8 +39,8 @@
"additionalCommands": [] "additionalCommands": []
}, },
"loadedFiles": { "loadedFiles": {
"executableFile": "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": "f:\\BaiduSyncdisk\\SXDT\\BLE_TYQ\\Firmware\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf", "symbolFile": "c:\\Users\\16586\\Desktop\\BLE_TYQ_CH584M\\obj\\BLE_TYQ_CH584M.elf",
"executableFileOffset": 0, "executableFileOffset": 0,
"symbolFileOffset": 0 "symbolFileOffset": 0
}, },

3
APP/peripheral_main.c
View File

@ -295,6 +295,9 @@ int main(void)
// 手机APP显示是倒序的[5-0],不是[0-5] // 手机APP显示是倒序的[5-0],不是[0-5]
logDebug("MacAddr: %02X:%02X:%02X:%02X:%02X:%02X", MacAddr[5], MacAddr[4] logDebug("MacAddr: %02X:%02X:%02X:%02X:%02X:%02X", MacAddr[5], MacAddr[4]
, MacAddr[3], MacAddr[2], MacAddr[1], MacAddr[0]); , 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); // DelayMs(1000);

7
BSP/inc/bsp_valve.h
View File

@ -2,7 +2,7 @@
* @Author : stark1898y 1658608470@qq.com * @Author : stark1898y 1658608470@qq.com
* @Date : 2024-12-12 15:55:38 * @Date : 2024-12-12 15:55:38
* @LastEditors : stark1898y 1658608470@qq.com * @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 * @FilePath : \BLE_TYQ_CH584M\BSP\inc\bsp_valve.h
* @Description : * @Description :
* *
@ -37,7 +37,6 @@ extern volatile uint8_t boost_en_flag;
#define VAVLE_UPDATE_EVT (0x0001 << 10) // 上传更行阀门状态 #define VAVLE_UPDATE_EVT (0x0001 << 10) // 上传更行阀门状态
// #define VALVE_LOW_VBAT_ALARM_PERIOD_MS (1000 * 60 * 10) // #define VALVE_LOW_VBAT_ALARM_PERIOD_MS (1000 * 60 * 10)
#define VALVE_DECT_PERIOD_MS (1000 * 60 * 3) #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_VALUE 2000
#define LOW_VABAT_CLOSE_MV 2200 #define LOW_VABAT_CLOSE_MV 2250
#define HIGN_TEMP_CLOSE_C 60 #define HIGN_TEMP_CLOSE_C 60
@ -58,6 +57,8 @@ extern volatile uint8_t boost_en_flag;
#define FRAME_HEADER 0xAA #define FRAME_HEADER 0xAA
#define FRAME_TAIL 0x55 #define FRAME_TAIL 0x55
// 0xAA CMD/DATA/ DATA_LEN (DATA) checksum 0x55 // 0xAA CMD/DATA/ DATA_LEN (DATA) checksum 0x55
typedef enum typedef enum

4
BSP/src/bsp_i2c.c
View File

@ -409,10 +409,10 @@ int BSP_ReadTempHumi(float *humi, float *temp)
int ret; int ret;
GXHTC3C_Wakeup(); GXHTC3C_Wakeup();
DelayMs(2); DelayMs(1);
GXHTC3C_GetStart(); GXHTC3C_GetStart();
DelayMs(4); DelayMs(3);
float _humi, _temp; float _humi, _temp;
ret = GXHTC3C_GetTempHumi(&_humi, &_temp); ret = GXHTC3C_GetTempHumi(&_humi, &_temp);
if (ret == 0) if (ret == 0)

2
HAL/include/CONFIG.h
View File

@ -134,7 +134,7 @@
#define BLE_TX_NUM_EVENT 1 #define BLE_TX_NUM_EVENT 1
#endif #endif
#ifndef BLE_TX_POWER #ifndef BLE_TX_POWER
#define BLE_TX_POWER LL_TX_POWEER_0_DBM #define BLE_TX_POWER LL_TX_POWEER_4_DBM
#endif #endif
#ifndef PERIPHERAL_MAX_CONNECTION #ifndef PERIPHERAL_MAX_CONNECTION
#define PERIPHERAL_MAX_CONNECTION 1 #define PERIPHERAL_MAX_CONNECTION 1