ekko/SR_Switch_Hilink_14.2.0.308_20250411
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 修复删除设备后无法正常配网的问题，原因是因为wifi在ble设置广播时间为0后不进行扫描了，修改为ble advtime为0的时候就不设置就好了

Browse Source 
2. 添加产测 wifi 信号测试的步骤。测试中灯全亮，测试成功灯灭了
3. 修复GPIO 模式配置的问题导致控制led和开关失效的问题。
This commit is contained in:
Ekko.bao
2025-07-22 09:20:01 +08:00
parent feef3bf1f7
commit 6cd2908eaf
8 changed files with 245 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/samples/wifi/ohos_connect/hilink_adapt/entry/hilink_ble_main.c
View File

@ -271,10 +271,12 @@ static void HILINK_BT_StateChangeHandler(HILINK_BT_SdkStatus event, const void *
HILINK_SAL_ERROR("set addr err\n");
}
/* 设置蓝牙广播格式，包括靠近发现、碰一碰等，下一次发送广播生效 */
BLE_SetAdvType(BLE_ADV_LOCAL_NAME);
BLE_SetAdvType(BLE_ADV_NEARBY_V0);
/* BLE配网广播控制：参数代表广播时间，0:停止；0xFFFFFFFF:一直广播，其他：广播指定时间后停止，单位秒 */
(void)BLE_CfgNetAdvCtrl(ble_adv_time);
if(ble_adv_time) {
(void)BLE_CfgNetAdvCtrl(ble_adv_time);
}
ble_sdk_running = 1;
e_printf("callback set ble adv time: %ds\n", ble_adv_time);
}
@ -403,7 +405,7 @@ static int BleRcvCustomData(unsigned char *buff, unsigned int len)
HILINK_SAL_NOTICE("buff is NULL\r\n");
return -1;
}
HILINK_SAL_NOTICE("custom data, len: %u, data: %s", len, buff);
HILINK_SAL_NOTICE("custom data, len: %u, data: %s\n", len, buff);
/* 处理自定义数据 */
if (BleHandleCustomData((const char *)buff, len) != 0) {
@ -495,7 +497,7 @@ int hilink_ble_main(void)
}
/* 设置广播方式为靠近发现 */
BLE_SetAdvType(BLE_ADV_LOCAL_NAME);
BLE_SetAdvType(BLE_ADV_NEARBY_V0);
/* 初始化ble sdk */
ret = BLE_CfgNetInit(&g_bleInitParam, &g_bleCfgNetCb);

7
application/samples/wifi/ohos_connect/hilink_adapt/product/hilink_device.c
View File

@ -19,9 +19,6 @@
#ifdef CONFIG_SUPPORT_HILINK_INDIE_UPGRADE
#include "hilink_entry.h"
#endif
extern void handle_device_online(void);
extern void handle_device_unbind(void);
extern void handle_device_offline(void);
// 声明外部函数
#include "switch_panel/switch_panel.h"
@ -545,11 +542,11 @@ void HILINK_NotifyDevStatus(int status)
break;
case HILINK_DEVICE_UNREGISTER:
/* 设备被解绑，请在此处添加实现 */
handle_device_unbind();
// handle_device_unbind();
break;
case HILINK_REVOKE_FLAG_SET:
/* 设备被复位标记置位，请在此处添加实现 */
handle_device_unbind();
// handle_device_unbind();
break;
case HILINK_NEGO_REG_INFO_FAIL:
/* 设备协商配网信息失败 */