fix some bug
This commit is contained in:
parent
bbc6f7a5f9
commit
a619df7ff2
File diff suppressed because it is too large
Load Diff
|
@ -875,6 +875,9 @@ void protocol_build_json(uint16_t groupId)
|
||||||
cJSON_AddNumberToObject(deviceObj, "currentPack", groupId);
|
cJSON_AddNumberToObject(deviceObj, "currentPack", groupId);
|
||||||
cJSON_AddNumberToObject(deviceObj, "totalPack", 16);
|
cJSON_AddNumberToObject(deviceObj, "totalPack", 16);
|
||||||
|
|
||||||
|
cJSON* dataObj = cJSON_CreateObject();
|
||||||
|
cJSON_AddItemToObject(deviceObj, "data", dataObj);
|
||||||
|
|
||||||
for (int i = 0; i < bms_point_count; ++i)
|
for (int i = 0; i < bms_point_count; ++i)
|
||||||
{
|
{
|
||||||
const devPointMap* point = &bms_points[i];
|
const devPointMap* point = &bms_points[i];
|
||||||
|
@ -888,7 +891,7 @@ void protocol_build_json(uint16_t groupId)
|
||||||
{
|
{
|
||||||
val = 0; // 默认值
|
val = 0; // 默认值
|
||||||
}
|
}
|
||||||
cJSON_AddNumberToObject(deviceObj, point->key, val);
|
cJSON_AddNumberToObject(dataObj, point->key, val);
|
||||||
}
|
}
|
||||||
//cJSON_AddNumberToObject(deviceObj, point->key, val); @wangk 放在这分组功能失效
|
//cJSON_AddNumberToObject(deviceObj, point->key, val); @wangk 放在这分组功能失效
|
||||||
}
|
}
|
||||||
|
@ -1050,7 +1053,7 @@ void mqtt_publish_bms_data(uint32_t basetime)
|
||||||
|
|
||||||
mqtt_cycle_tick += basetime;
|
mqtt_cycle_tick += basetime;
|
||||||
|
|
||||||
if(mqtt_cycle_tick > 500)
|
if(mqtt_cycle_tick > 1000)
|
||||||
{
|
{
|
||||||
// drv_wireless_send_string("AT+QMTPUB=0,1,2,0,\"BCU01\",17,\"Hello from FC41D!\"");
|
// drv_wireless_send_string("AT+QMTPUB=0,1,2,0,\"BCU01\",17,\"Hello from FC41D!\"");
|
||||||
mqtt_cycle_tick = 0;
|
mqtt_cycle_tick = 0;
|
||||||
|
|
|
@ -119,7 +119,7 @@ static uint8_t drv_wifi_init()
|
||||||
KIT_PRINTF("Failed to set WiFi mode!\r\n");
|
KIT_PRINTF("Failed to set WiFi mode!\r\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
kit_time_dly_ms(1000);
|
kit_time_dly_ms(2000);
|
||||||
|
|
||||||
// if (!drv_at_send_cmd("AT+QSTAAPINFO=BLUESUNESS,bluesun009", "OK", WIFI_TIMEOUT))
|
// if (!drv_at_send_cmd("AT+QSTAAPINFO=BLUESUNESS,bluesun009", "OK", WIFI_TIMEOUT))
|
||||||
// {
|
// {
|
||||||
|
|
Loading…
Reference in New Issue