新增电脑通过USB发送产品code,然后dongle根据新的code重新发起广播的功能

This commit is contained in:
2026-07-27 15:00:47 +08:00
parent c843fb24e0
commit df37ff1b23
51 changed files with 2326 additions and 1812 deletions
+15 -7
View File
@@ -15,6 +15,7 @@
#include "vm.h"
#include "bleproto.h"
#include "bleproto_api.h"
#include "usr_usb_jb.h"
#define LOG_TAG_CONST APP
#define LOG_TAG "[APP]"
@@ -93,9 +94,12 @@ void usr_ble_adv_init()
{
int8_t txpower = 0;
uint8_t manucode[BLEPROTO_ADV_TLV_LENGTH_MANUCODE] = {0};
uint8_t prodcode[BLEPROTO_ADV_TLV_LENGTH_PRODCODE] = {'C', 'B', 'C', '0'};
uint8_t prodcode[BLEPROTO_ADV_TLV_LENGTH_PRODCODE] = {0};
uint8_t gmac[6] = {0};
uint8_t pcode[6] = {'P', 'I', 'C', 'B', 'C', '0'};
uint8_t pcode[BLE_PROTO_ADV_LENGTH_PCODE] = {0};
/* flash 优先,无有效数据则用模块内默认值 */
usr_prodcode_get(prodcode, pcode);
usr_set_adv_interval(80);
if (usr_var.usr_ota_succ_flag) {
@@ -105,15 +109,24 @@ void usr_ble_adv_init()
if (usr_var.usr_goto_pair) {
usr_clear_pair_info_noreset();
printf("power on force to pair flag= %d\n", usr_auth_data.paired_flag);
printf("adv prodcode=%c%c%c%c pcode=%c%c%c%c%c%c\n",
prodcode[0], prodcode[1], prodcode[2], prodcode[3],
pcode[0], pcode[1], pcode[2], pcode[3], pcode[4], pcode[5]);
muti_adv_data_len = bleproto_advdata_encode4bind(muti_adv_data, txpower, manucode, pcode, prodcode);
usr_var.usr_adv_flag = 1;
} else {
usr_get_pair_info();
if (usr_auth_data.paired_flag == 0) {
printf("adv prodcode=%c%c%c%c pcode=%c%c%c%c%c%c\n",
prodcode[0], prodcode[1], prodcode[2], prodcode[3],
pcode[0], pcode[1], pcode[2], pcode[3], pcode[4], pcode[5]);
muti_adv_data_len = bleproto_advdata_encode4bind(muti_adv_data, txpower, manucode, pcode, prodcode);
usr_var.usr_adv_flag = 0;
} else {
memcpy(gmac, usr_auth_data.gwmac, 6);
printf("adv prodcode=%c%c%c%c pcode=%c%c%c%c%c%c\n",
prodcode[0], prodcode[1], prodcode[2], prodcode[3],
pcode[0], pcode[1], pcode[2], pcode[3], pcode[4], pcode[5]);
muti_adv_data_len = bleproto_advdata_encode4reconn(muti_adv_data, txpower, gmac, manucode, pcode, prodcode);
usr_var.usr_adv_flag = 1;
}
@@ -125,11 +138,6 @@ void usr_ble_adv_init()
}
}
u8 usr_get_pair_flag()
{
return usr_auth_data.paired_flag;
}
void usr_ble_adv_updata()
{
static u16 usr_goto_slow_adv = 0;