Merge pull request #13 from robertlipe/clean_ca

Clean whitespace in customer_apps
This commit is contained in:
Yafei 2020-11-10 09:39:29 +08:00 committed by GitHub
commit fef645af6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
111 changed files with 705 additions and 705 deletions

4
customer_app/bl602_boot2/bl602_boot2/blsp_boot2.c Executable file → Normal file
View File

@ -432,9 +432,9 @@ int main(void)
MSG_DBG("MCU SDK:%s\r\n",MCU_SDK_VERSION);
MSG_DBG("BSP:%s\r\n",BSP_VERSION);
#endif
if(BLSP_Boot2_Dump_Critical_Flag()){
if(BLSP_Boot2_Dump_Critical_Flag()){
BLSP_Dump_Data(&clkCfg,16);
BLSP_Dump_Data(&flashCfg,16);
BLSP_Dump_Data(&flashCfg,16);
}
MSG_DBG("Get efuse config\r\n");

View File

View File

View File

View File

0
customer_app/bl602_boot2/bl602_boot2/blsp_bootinfo.h Executable file → Normal file
View File

0
customer_app/bl602_boot2/bl602_boot2/blsp_common.c Executable file → Normal file
View File

0
customer_app/bl602_boot2/bl602_boot2/blsp_common.h Executable file → Normal file
View File

0
customer_app/bl602_boot2/bl602_boot2/blsp_media_boot.c Executable file → Normal file
View File

0
customer_app/bl602_boot2/bl602_boot2/blsp_media_boot.h Executable file → Normal file
View File

46
customer_app/bl602_boot2/bl602_boot2/blsp_port.c Executable file → Normal file
View File

@ -279,7 +279,7 @@ void BLSP_Boot2_Pass_Parameter(void *data,uint32_t len)
{
static uint8_t *pParameter=NULL;
if(len==0){
GLB_Set_EM_Sel(0);
GLB_Set_EM_Sel(0);
pParameter=(uint8_t *)(0x42030000+103*1024);
return;
}
@ -705,22 +705,22 @@ uint32_t ATTR_TCM_SECTION BLSP_Boot2_Get_Baudrate(void)
*******************************************************************************/
void bflb_platform_init_uart_debug_gpio()
{
GLB_GPIO_Cfg_Type cfg;
GLB_GPIO_Cfg_Type cfg;
uint8_t gpio=BLSP_Boot2_Get_TX_GPIO();
cfg.drive=0;
cfg.smtCtrl=1;
cfg.drive=0;
cfg.smtCtrl=1;
/*set GPIO as UART0 TX */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=7;
cfg.gpioMode=GPIO_MODE_OUTPUT;
cfg.pullType=GPIO_PULL_UP;
GLB_GPIO_Init(&cfg);
/*set GPIO as UART0 TX */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=7;
cfg.gpioMode=GPIO_MODE_OUTPUT;
cfg.pullType=GPIO_PULL_UP;
GLB_GPIO_Init(&cfg);
/* select uart gpio function */
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),GLB_UART_SIG_FUN_UART0_TXD);
/* select uart gpio function */
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),GLB_UART_SIG_FUN_UART0_TXD);
}
/****************************************************************************//**
@ -733,21 +733,21 @@ void bflb_platform_init_uart_debug_gpio()
*******************************************************************************/
void bflb_platform_deinit_uart_debug_gpio()
{
GLB_GPIO_Cfg_Type cfg;
GLB_GPIO_Cfg_Type cfg;
uint8_t gpio=BLSP_Boot2_Get_TX_GPIO();
cfg.gpioMode=GPIO_MODE_INPUT;
cfg.pullType=GPIO_PULL_NONE;
cfg.drive=0;
cfg.smtCtrl=1;
cfg.gpioMode=GPIO_MODE_INPUT;
cfg.pullType=GPIO_PULL_NONE;
cfg.drive=0;
cfg.smtCtrl=1;
/*set GPIO as input */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=11;
GLB_GPIO_Init(&cfg);
/*set GPIO as input */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=11;
GLB_GPIO_Init(&cfg);
/* restore uart function sel*/
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),
/* restore uart function sel*/
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),
(GLB_UART_SIG_FUN_Type)(GLB_UART_SIG_0+(GLB_UART_SIG_Type)(gpio%12)));
}

0
customer_app/bl602_boot2/bl602_boot2/blsp_port.h Executable file → Normal file
View File

View File

@ -279,7 +279,7 @@ void BLSP_Boot2_Pass_Parameter(void *data,uint32_t len)
{
static uint8_t *pParameter=NULL;
if(len==0){
GLB_Set_EM_Sel(0);
GLB_Set_EM_Sel(0);
pParameter=(uint8_t *)(0x42030000+103*1024);
return;
}
@ -709,22 +709,22 @@ void bflb_platform_init_uart_debug_gpio_delete()
void bflb_platform_init_uart_debug_gpio()
#endif
{
GLB_GPIO_Cfg_Type cfg;
GLB_GPIO_Cfg_Type cfg;
uint8_t gpio=BLSP_Boot2_Get_TX_GPIO();
cfg.drive=0;
cfg.smtCtrl=1;
cfg.drive=0;
cfg.smtCtrl=1;
/*set GPIO as UART0 TX */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=7;
cfg.gpioMode=GPIO_MODE_OUTPUT;
cfg.pullType=GPIO_PULL_UP;
GLB_GPIO_Init(&cfg);
/*set GPIO as UART0 TX */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=7;
cfg.gpioMode=GPIO_MODE_OUTPUT;
cfg.pullType=GPIO_PULL_UP;
GLB_GPIO_Init(&cfg);
/* select uart gpio function */
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),GLB_UART_SIG_FUN_UART0_TXD);
/* select uart gpio function */
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),GLB_UART_SIG_FUN_UART0_TXD);
}
/****************************************************************************//**
@ -737,21 +737,21 @@ void bflb_platform_init_uart_debug_gpio()
*******************************************************************************/
void bflb_platform_deinit_uart_debug_gpio()
{
GLB_GPIO_Cfg_Type cfg;
GLB_GPIO_Cfg_Type cfg;
uint8_t gpio=BLSP_Boot2_Get_TX_GPIO();
cfg.gpioMode=GPIO_MODE_INPUT;
cfg.pullType=GPIO_PULL_NONE;
cfg.drive=0;
cfg.smtCtrl=1;
cfg.gpioMode=GPIO_MODE_INPUT;
cfg.pullType=GPIO_PULL_NONE;
cfg.drive=0;
cfg.smtCtrl=1;
/*set GPIO as input */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=11;
GLB_GPIO_Init(&cfg);
/*set GPIO as input */
cfg.gpioPin=GLB_GPIO_PIN_0+(GLB_GPIO_Type)(gpio);
cfg.gpioFun=11;
GLB_GPIO_Init(&cfg);
/* restore uart function sel*/
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),
/* restore uart function sel*/
GLB_UART_Fun_Sel((GLB_UART_SIG_Type)(GLB_UART_SIG_0+(gpio%8)),
(GLB_UART_SIG_FUN_Type)(GLB_UART_SIG_0+(GLB_UART_SIG_Type)(gpio%12)));
}

0
customer_app/bl602_demo_at/bl602_demo_at/at_cmd_usr.c Executable file → Normal file
View File

View File

@ -82,11 +82,11 @@ static void wifiprov_password_ind(void *buf,size_t size)
}
struct conn_callback WifiProv_conn_callback = {
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
};
#endif

View File

@ -74,10 +74,10 @@ static void blesync_complete_cb (void *p_arg)
}
static struct blesync_wifi_func WifiProv_conn_callback = {
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.local_wifi_scan = wifiprov_wifi_scan,
.local_wifi_state_get = wifiprov_api_state_get,
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.local_wifi_scan = wifiprov_wifi_scan,
.local_wifi_state_get = wifiprov_api_state_get,
};
static void app_delayed_action_bleadv(void *arg)

0
customer_app/bl602_demo_at/bl602_demo_at/main.c Executable file → Normal file
View File

View File

@ -98,11 +98,11 @@ static void wifiprov_password_ind(void *buf,size_t size)
}
struct conn_callback WifiProv_conn_callback = {
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
};
#endif
@ -120,35 +120,35 @@ void model_gen_cb(uint8_t value)
#if defined(CONFIG_BT_MESH_MODEL)
static void example_handle_gen_onoff_msg(bfl_ble_mesh_model_t *model,
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_gen_onoff_set_t *set)
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_gen_onoff_set_t *set)
{
bfl_ble_mesh_gen_onoff_srv_t *srv = model->user_data;
bfl_ble_mesh_gen_onoff_srv_t *srv = model->user_data;
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
break;
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET:
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK:
if (set->op_en == false) {
srv->state.onoff = set->onoff;
} else {
/* TODO: Delay and state transition */
srv->state.onoff = set->onoff;
}
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
break;
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET:
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK:
if (set->op_en == false) {
srv->state.onoff = set->onoff;
} else {
/* TODO: Delay and state transition */
srv->state.onoff = set->onoff;
}
model_gen_cb(set->onoff);
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS,
sizeof(srv->state.onoff), &srv->state.onoff, ROLE_NODE);
break;
default:
break;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS,
sizeof(srv->state.onoff), &srv->state.onoff, ROLE_NODE);
break;
default:
break;
}
}
@ -197,39 +197,39 @@ static void example_ble_mesh_generic_server_cb(bfl_ble_mesh_generic_server_cb_ev
#if defined(CONFIG_BT_MESH_MODEL_LIGHT_SRV)
static void example_handle_light_lgn_msg(bfl_ble_mesh_model_t *model,
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_light_lightness_set_t *set)
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_light_lightness_set_t *set)
{
bfl_ble_mesh_light_lightness_srv_t *srv = model->user_data;
bfl_ble_mesh_light_lightness_srv_t *srv = model->user_data;
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
break;
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET:
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK:
if (set->op_en == false) {
srv->state->lightness_actual = set->lightness;
} else {
/* TODO: Delay and state transition */
srv->state->lightness_actual = set->lightness;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS,
sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual, ROLE_NODE);
break;
default:
break;
}
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
break;
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET:
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK:
if (set->op_en == false) {
srv->state->lightness_actual = set->lightness;
} else {
/* TODO: Delay and state transition */
srv->state->lightness_actual = set->lightness;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS,
sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual, ROLE_NODE);
break;
default:
break;
}
}
static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_event_t event,
bfl_ble_mesh_lighting_server_cb_param_t *param)
bfl_ble_mesh_lighting_server_cb_param_t *param)
{
printf("event 0x%02x, opcode 0x%04x, src 0x%04x, dst 0x%04x\n",
event, param->ctx.recv_op, param->ctx.addr, param->ctx.recv_dst);
@ -241,19 +241,19 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK) {
printf("Light lightness [%x]\n", param->value.state_change.lightness_set.lightness);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
printf("Light ctl ln[%x]tp[%x]uv[%x]\n",
param->value.state_change.ctl_set.lightness,
param->value.state_change.ctl_set.temperature,
param->value.state_change.ctl_set.delta_uv);
param->value.state_change.ctl_set.lightness,
param->value.state_change.ctl_set.temperature,
param->value.state_change.ctl_set.delta_uv);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x]h[%x]s[%x]\n",
param->value.state_change.hsl_set.lightness,
param->value.state_change.hsl_set.hue,
param->value.state_change.hsl_set.saturation);
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x]h[%x]s[%x]\n",
param->value.state_change.hsl_set.lightness,
param->value.state_change.hsl_set.hue,
param->value.state_change.hsl_set.saturation);
}
break;
case BFL_BLE_MESH_LIGHTING_SERVER_RECV_GET_MSG_EVT:
@ -263,20 +263,20 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
printf("onoff 0x%02x\n", srv->state->lightness_actual);
example_handle_light_lgn_msg(param->model, &param->ctx, NULL);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_GET) {
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_GET) {
bfl_ble_mesh_light_ctl_srv_t *srv = param->model->user_data;
printf("Light ctl ln[%x]ln_t[%x] tp[%x]tp_t[%x] uv[%x]uv_t[%x]\n",
srv->state->lightness, srv->state->target_lightness,
srv->state->temperature, srv->state->target_temperature,
srv->state->delta_uv, srv->state->target_delta_uv);
srv->state->lightness, srv->state->target_lightness,
srv->state->temperature, srv->state->target_temperature,
srv->state->delta_uv, srv->state->target_delta_uv);
//example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_GET) {
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_GET) {
bfl_ble_mesh_light_hsl_srv_t *srv = param->model->user_data;
printf("Light ctl l[%x]l_t[%x] h[%x]h_t[%x] s[%x]s_t[%x]\n",
srv->state->lightness, srv->state->target_lightness,
srv->state->hue, srv->state->target_hue,
srv->state->saturation, srv->state->target_saturation);
srv->state->lightness, srv->state->target_lightness,
srv->state->hue, srv->state->target_hue,
srv->state->saturation, srv->state->target_saturation);
//example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
}
break;
@ -291,26 +291,26 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
}
example_handle_light_lgn_msg(param->model, &param->ctx, &param->value.set.lightness);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
printf("Light ctl ln[%x] tp[%d] uv[%x] tid[%x]\n",
param->value.set.ctl.lightness,
param->value.set.ctl.temperature,
param->value.set.ctl.delta_uv,
param->value.set.ctl.tid);
param->value.set.ctl.lightness,
param->value.set.ctl.temperature,
param->value.set.ctl.delta_uv,
param->value.set.ctl.tid);
if (param->value.set.ctl.op_en) {
printf("trans_time [%x], delay [%x]\n",
param->value.set.ctl.trans_time, param->value.set.ctl.delay);
}
//example_handle_gen_onoff_msg(param->model, &param->ctx, &param->value.set.onoff);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x] h[%d] s[%x] tid[%x]\n",
param->value.set.hsl.lightness,
param->value.set.hsl.hue,
param->value.set.hsl.saturation,
param->value.set.hsl.tid);
param->value.set.hsl.lightness,
param->value.set.hsl.hue,
param->value.set.hsl.saturation,
param->value.set.hsl.tid);
if (param->value.set.hsl.op_en) {
printf("trans_time 0x%02x, delay 0x%02x\n",
param->value.set.hsl.trans_time, param->value.set.hsl.delay);
@ -341,14 +341,14 @@ void bt_enable_cb(int err)
#if defined(CONFIG_BT_MESH_MODEL)
#if defined(CONFIG_BT_MESH_MODEL_GEN_SRV)
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
bfl_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
bfl_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
#endif
#if defined(CONFIG_BT_MESH_MODEL_LIGHT_SRV)
bfl_ble_mesh_register_lighting_server_callback(example_ble_mesh_lighting_server_cb);
bfl_ble_mesh_register_lighting_server_callback(example_ble_mesh_lighting_server_cb);
#endif
#else
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
mesh_gen_srv_callback_register(model_gen_cb);
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
mesh_gen_srv_callback_register(model_gen_cb);
#endif /* CONFIG_BT_MESH_MODEL */
#endif

2
customer_app/bl602_demo_event/bl602_demo_event/main.c Executable file → Normal file
View File

@ -199,7 +199,7 @@ void vApplicationSleep( TickType_t xExpectedIdleTime_ms )
bleSleepDuration_32768cycles = ble_controller_sleep();
if(bleSleepDuration_32768cycles < TIME_5MS_IN_32768CYCLE)
if(bleSleepDuration_32768cycles < TIME_5MS_IN_32768CYCLE)
{
/*BLE controller does not allow sleep. Do not enter a sleep state.Restart the tick
and exit the critical section. */

View File

@ -94,11 +94,11 @@ static void wifiprov_password_ind(void *buf,size_t size)
}
struct conn_callback WifiProv_conn_callback = {
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.get_remote_ap_ssid = wifiprov_ssid_ind,
.get_remote_ap_bssid = wifiprov_bssid_ind,
.get_remote_password = wifiprov_password_ind,
};
#endif
@ -116,35 +116,35 @@ void model_gen_cb(uint8_t value)
#if defined(CONFIG_BT_MESH_MODEL)
static void example_handle_gen_onoff_msg(bfl_ble_mesh_model_t *model,
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_gen_onoff_set_t *set)
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_gen_onoff_set_t *set)
{
bfl_ble_mesh_gen_onoff_srv_t *srv = model->user_data;
bfl_ble_mesh_gen_onoff_srv_t *srv = model->user_data;
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
break;
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET:
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK:
if (set->op_en == false) {
srv->state.onoff = set->onoff;
} else {
/* TODO: Delay and state transition */
srv->state.onoff = set->onoff;
}
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
break;
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET:
case BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET_UNACK:
if (set->op_en == false) {
srv->state.onoff = set->onoff;
} else {
/* TODO: Delay and state transition */
srv->state.onoff = set->onoff;
}
model_gen_cb(set->onoff);
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS,
sizeof(srv->state.onoff), &srv->state.onoff, ROLE_NODE);
break;
default:
break;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS, sizeof(srv->state.onoff), &srv->state.onoff);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_GEN_ONOFF_STATUS,
sizeof(srv->state.onoff), &srv->state.onoff, ROLE_NODE);
break;
default:
break;
}
}
@ -193,39 +193,39 @@ static void example_ble_mesh_generic_server_cb(bfl_ble_mesh_generic_server_cb_ev
#if defined(CONFIG_BT_MESH_MODEL_LIGHT_SRV)
static void example_handle_light_lgn_msg(bfl_ble_mesh_model_t *model,
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_light_lightness_set_t *set)
bfl_ble_mesh_msg_ctx_t *ctx,
bfl_ble_mesh_server_recv_light_lightness_set_t *set)
{
bfl_ble_mesh_light_lightness_srv_t *srv = model->user_data;
bfl_ble_mesh_light_lightness_srv_t *srv = model->user_data;
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
break;
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET:
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK:
if (set->op_en == false) {
srv->state->lightness_actual = set->lightness;
} else {
/* TODO: Delay and state transition */
srv->state->lightness_actual = set->lightness;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS,
sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual, ROLE_NODE);
break;
default:
break;
}
switch (ctx->recv_op) {
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_GET:
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
break;
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET:
case BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK:
if (set->op_en == false) {
srv->state->lightness_actual = set->lightness;
} else {
/* TODO: Delay and state transition */
srv->state->lightness_actual = set->lightness;
}
if (ctx->recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET) {
bfl_ble_mesh_server_model_send_msg(model, ctx,
BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS, sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual);
}
bfl_ble_mesh_model_publish(model, BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_STATUS,
sizeof(srv->state->lightness_actual), (uint8_t*)&srv->state->lightness_actual, ROLE_NODE);
break;
default:
break;
}
}
static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_event_t event,
bfl_ble_mesh_lighting_server_cb_param_t *param)
bfl_ble_mesh_lighting_server_cb_param_t *param)
{
printf("event 0x%02x, opcode 0x%04x, src 0x%04x, dst 0x%04x\n",
event, param->ctx.recv_op, param->ctx.addr, param->ctx.recv_dst);
@ -237,19 +237,19 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_LIGHTNESS_SET_UNACK) {
printf("Light lightness [%x]\n", param->value.state_change.lightness_set.lightness);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
printf("Light ctl ln[%x]tp[%x]uv[%x]\n",
param->value.state_change.ctl_set.lightness,
param->value.state_change.ctl_set.temperature,
param->value.state_change.ctl_set.delta_uv);
param->value.state_change.ctl_set.lightness,
param->value.state_change.ctl_set.temperature,
param->value.state_change.ctl_set.delta_uv);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x]h[%x]s[%x]\n",
param->value.state_change.hsl_set.lightness,
param->value.state_change.hsl_set.hue,
param->value.state_change.hsl_set.saturation);
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x]h[%x]s[%x]\n",
param->value.state_change.hsl_set.lightness,
param->value.state_change.hsl_set.hue,
param->value.state_change.hsl_set.saturation);
}
break;
case BFL_BLE_MESH_LIGHTING_SERVER_RECV_GET_MSG_EVT:
@ -259,20 +259,20 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
printf("onoff 0x%02x\n", srv->state->lightness_actual);
example_handle_light_lgn_msg(param->model, &param->ctx, NULL);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_GET) {
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_GET) {
bfl_ble_mesh_light_ctl_srv_t *srv = param->model->user_data;
printf("Light ctl ln[%x]ln_t[%x] tp[%x]tp_t[%x] uv[%x]uv_t[%x]\n",
srv->state->lightness, srv->state->target_lightness,
srv->state->temperature, srv->state->target_temperature,
srv->state->delta_uv, srv->state->target_delta_uv);
srv->state->lightness, srv->state->target_lightness,
srv->state->temperature, srv->state->target_temperature,
srv->state->delta_uv, srv->state->target_delta_uv);
//example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_GET) {
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_GET) {
bfl_ble_mesh_light_hsl_srv_t *srv = param->model->user_data;
printf("Light ctl l[%x]l_t[%x] h[%x]h_t[%x] s[%x]s_t[%x]\n",
srv->state->lightness, srv->state->target_lightness,
srv->state->hue, srv->state->target_hue,
srv->state->saturation, srv->state->target_saturation);
srv->state->lightness, srv->state->target_lightness,
srv->state->hue, srv->state->target_hue,
srv->state->saturation, srv->state->target_saturation);
//example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
}
break;
@ -287,26 +287,26 @@ static void example_ble_mesh_lighting_server_cb(bfl_ble_mesh_lighting_server_cb_
}
example_handle_light_lgn_msg(param->model, &param->ctx, &param->value.set.lightness);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_CTL_SET_UNACK) {
printf("Light ctl ln[%x] tp[%d] uv[%x] tid[%x]\n",
param->value.set.ctl.lightness,
param->value.set.ctl.temperature,
param->value.set.ctl.delta_uv,
param->value.set.ctl.tid);
param->value.set.ctl.lightness,
param->value.set.ctl.temperature,
param->value.set.ctl.delta_uv,
param->value.set.ctl.tid);
if (param->value.set.ctl.op_en) {
printf("trans_time [%x], delay [%x]\n",
param->value.set.ctl.trans_time, param->value.set.ctl.delay);
}
//example_handle_gen_onoff_msg(param->model, &param->ctx, &param->value.set.onoff);
}
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
else if (param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET ||
param->ctx.recv_op == BFL_BLE_MESH_MODEL_OP_LIGHT_HSL_SET_UNACK) {
printf("Light hsl l[%x] h[%d] s[%x] tid[%x]\n",
param->value.set.hsl.lightness,
param->value.set.hsl.hue,
param->value.set.hsl.saturation,
param->value.set.hsl.tid);
param->value.set.hsl.lightness,
param->value.set.hsl.hue,
param->value.set.hsl.saturation,
param->value.set.hsl.tid);
if (param->value.set.hsl.op_en) {
printf("trans_time 0x%02x, delay 0x%02x\n",
param->value.set.hsl.trans_time, param->value.set.hsl.delay);
@ -336,14 +336,14 @@ void bt_enable_cb(int err)
#if defined(CONFIG_BT_MESH_MODEL)
#if defined(CONFIG_BT_MESH_MODEL_GEN_SRV)
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
bfl_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
bfl_ble_mesh_register_generic_server_callback(example_ble_mesh_generic_server_cb);
#endif
#if defined(CONFIG_BT_MESH_MODEL_LIGHT_SRV)
bfl_ble_mesh_register_lighting_server_callback(example_ble_mesh_lighting_server_cb);
bfl_ble_mesh_register_lighting_server_callback(example_ble_mesh_lighting_server_cb);
#endif
#else
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
mesh_gen_srv_callback_register(model_gen_cb);
bl_gpio_enable_output(LED_PIN, LED_PIN_PULLUP, LED_PIN_PULDONW);
mesh_gen_srv_callback_register(model_gen_cb);
#endif /* CONFIG_BT_MESH_MODEL */
#endif

0
customer_app/bl602_demo_nano/bl602_demo_nano/main.c Executable file → Normal file
View File

0
customer_app/bl602_demo_wifi/bl602_demo_wifi/main.c Executable file → Normal file
View File

View File

@ -73,10 +73,10 @@ static void blesync_complete_cb (void *p_arg)
}
static struct blesync_wifi_func WifiProv_conn_callback = {
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.local_wifi_scan = wifiprov_wifi_scan,
.local_wifi_state_get = wifiprov_api_state_get,
.local_connect_remote_ap = wifiprov_connect_ap_ind,
.local_disconnect_remote_ap = wifiprov_disc_from_ap_ind,
.local_wifi_scan = wifiprov_wifi_scan,
.local_wifi_state_get = wifiprov_api_state_get,
};
static void blsync_init(int err)

0
customer_app/sdk_app_ble_sync/sdk_app_ble_sync/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_blog/sdk_app_blog/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_cli/sdk_app_cli/main.c Executable file → Normal file
View File

View File

0
customer_app/sdk_app_dac/sdk_app_dac/main.c Executable file → Normal file
View File

View File

0
customer_app/sdk_app_event/sdk_app_event/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_fdt/sdk_app_fdt/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_gpio/sdk_app_gpio/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_hbnram/sdk_app_hbnram/main.c Executable file → Normal file
View File

2
customer_app/sdk_app_heap/sdk_app_heap/main.c Executable file → Normal file
View File

@ -284,7 +284,7 @@ static void __heap_test_fun (void *p_arg)
p_handle = (TaskHandle_t *)p_arg;
vTaskDelete(*p_handle);
return;
}
}
counts = 0;
ptr = NULL;

View File

View File

0
customer_app/sdk_app_i2c/sdk_app_i2c/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_ir/sdk_app_ir/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_mdns/sdk_app_mdns/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_pwm/sdk_app_pwm/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_romfs/sdk_app_romfs/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_timer/sdk_app_timer/main.c Executable file → Normal file
View File

0
customer_app/sdk_app_uart_ctl/sdk_app_uart_ctl/main.c Executable file → Normal file
View File

View File