SXDT-Embedded
/
BLE_TYQ_BJQ_CH32V303
mirror of https://gitee.com/SXDT-Embedded/ble_-tyq_-bjq_-ch32-v303.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

提交一次暂存

This commit is contained in:
小马_666 2025-04-09 14:25:24 +08:00
parent b8bdca571e
commit f31113434f
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bsp/inc/bsp_bt.h
View File

@ -46,11 +46,12 @@ typedef enum
typedef enum typedef enum
{ {
kValveEventCtr = 0x01, kValveEventCtr = 0x01,
kValveEventReg, kValveEventReg,//阀门注册
kValveEventRem, kValveEventRem,//阀门移除
kValveEventRep, kValveEventRep,//阀门更换
kValveEventRemAll, kValveEventRemAll,//移除所有，此时不看阀门是否对应，直接删除全部
kValveEventStatus, kValveEventStatus,
kValveEventConnect,//阀门连接状态发生改变，未实现
kValveEventMax kValveEventMax
}ValveEventType; }ValveEventType;

13
bsp/src/bsp_bt.c
View File

@ -2,7 +2,7 @@
* @Author: mbw * @Author: mbw
* @Date: 2024-12-03 10:31:45 * @Date: 2024-12-03 10:31:45
* @LastEditors: mbw && 1600520629@qq.com * @LastEditors: mbw && 1600520629@qq.com
* @LastEditTime: 2025-01-04 16:49:26 * @LastEditTime: 2025-04-08 16:04:01
* @FilePath: \ble_bjq_ch303rct6_ml307\bsp\src\bsp_bt.c * @FilePath: \ble_bjq_ch303rct6_ml307\bsp\src\bsp_bt.c
* @Description: * @Description:
* *
@ -371,7 +371,9 @@ int BSP_Bt_Process(uint8_t *data, uint16_t len)
LOG_HEX("valve_data:", 16, (rt_uint8_t *)&valve[data_buf[3] - 1], sizeof(struct valve_t)); LOG_HEX("valve_data:", 16, (rt_uint8_t *)&valve[data_buf[3] - 1], sizeof(struct valve_t));
break; break;
case kValveEventConnect:
break;
default: default:
LOG_W("unknow cmd: %02X", data[index + 2]); LOG_W("unknow cmd: %02X", data[index + 2]);
break; break;
@ -386,9 +388,9 @@ static void BSP_Bt_Parse_Data(void)
char *rx_ptr = rt_malloc(len + 1); char *rx_ptr = rt_malloc(len + 1);
// rt_uint8_t bt_rx_buf[256] = {0}; // rt_uint8_t bt_rx_buf[256] = {0};
BSP_Bt_Recv_Data(rx_ptr, len); BSP_Bt_Recv_Data((uint8_t *)rx_ptr, len);
// 发送过来的数据格式为：帧头 + 数据长度 + 事件类型 + 数据 + 校验码 + 帧尾 // 发送过来的数据格式为：帧头 + 数据长度 + 事件类型 + 数据 + 校验码 + 帧尾
BSP_Bt_Process(rx_ptr, len); BSP_Bt_Process((uint8_t *)rx_ptr, len);
rt_free(rx_ptr); rt_free(rx_ptr);
} }
@ -408,7 +410,7 @@ void BSP_Bt_Valve_Updata(void)
for (int i = 1; i <= MAX_VALVE_NUM; i++) // 这个循环是为了将数据拷贝到valve_list中， 并且保证id号和flash对应起来 for (int i = 1; i <= MAX_VALVE_NUM; i++) // 这个循环是为了将数据拷贝到valve_list中， 并且保证id号和flash对应起来
{ {
if (Flash_Get_Mac_Addr(mac, i) == 0) // 说明有MAC数据 if (Flash_Get_Mac_Addr(mac, i) == RT_EOK) // 说明有MAC数据
{ {
rt_memcpy(valve[cnt].valve_mac, mac, 6); // 这样做的目的就是读取方便，只需要根据flash中读取到的数量进行读取前N个值 rt_memcpy(valve[cnt].valve_mac, mac, 6); // 这样做的目的就是读取方便，只需要根据flash中读取到的数量进行读取前N个值
valve[cnt].valve_id = i; valve[cnt].valve_id = i;
@ -499,6 +501,7 @@ int BSP_Bt_Init(void)
if (rt_device_set_rx_indicate(rt_bt_device, Bt_Rcv_Cb) != RT_EOK) if (rt_device_set_rx_indicate(rt_bt_device, Bt_Rcv_Cb) != RT_EOK)
{ {
LOG_E("rt_device_set_rx_indicate failed!\n"); LOG_E("rt_device_set_rx_indicate failed!\n");
return RT_ERROR; return RT_ERROR;
} }
/* 静态初始化线程 1*/ /* 静态初始化线程 1*/

1
bsp/src/bsp_flash.c
View File

@ -340,7 +340,6 @@ int Flash_Set_Mac_Addr(rt_uint8_t *mac_addr, rt_uint8_t number)
rt_uint8_t page_buf[FLASH_PAGE_SIZE] = {0}; rt_uint8_t page_buf[FLASH_PAGE_SIZE] = {0};
rt_uint8_t in_page_offset = ((FLASH_VALVE_1_MAC_ADDR_ADDR + (number - 1) * FLASH_VALVE_MAC_ADDR_LEN) - FLASH_CONFIG_INFO_START_ADDR); rt_uint8_t in_page_offset = ((FLASH_VALVE_1_MAC_ADDR_ADDR + (number - 1) * FLASH_VALVE_MAC_ADDR_LEN) - FLASH_CONFIG_INFO_START_ADDR);
LOG_D("FLASH_VALVE_1_MAC_ADDR_ADDR = %X", FLASH_VALVE_1_MAC_ADDR_ADDR); LOG_D("FLASH_VALVE_1_MAC_ADDR_ADDR = %X", FLASH_VALVE_1_MAC_ADDR_ADDR);
LOG_D("FLASH_VALVE_MAC_ADDR_LEN = %d", in_page_offset);
if (mac_addr == RT_NULL) if (mac_addr == RT_NULL)
{ {
return -RT_ERROR; return -RT_ERROR;