Bluesun
/
BCU
forked from gary/BCU
2
0
Fork 0
Code Pull Requests Activity

Compare commits

base: Bluesun:63d4260020953d08b8f26e4f133e123c56ed5559
Branches Tags
Bluesun:master
Bluesun:adapt
Bluesun:comm
Bluesun:wk
Bluesun:gary
gary:master
gary:wk
gary:gary
..
compare: Bluesun:13dd3caeb6f31572e4699bceabdf6b782eb44f32
Branches Tags
Bluesun:adapt
Bluesun:comm
Bluesun:wk
Bluesun:master
Bluesun:gary
gary:master
gary:wk
gary:gary

No commits in common. "63d4260020953d08b8f26e4f133e123c56ed5559" and "13dd3caeb6f31572e4699bceabdf6b782eb44f32" have entirely different histories.
63d4260020 ... 13dd3caeb6

5 changed files with 6955 additions and 164 deletions
Show Stats Expand all files Collapse all files

5
app/stm32fxxx_app/app/task_register.c
View File

@ -62,7 +62,6 @@ void task_100ms_handler(uint32_t base_time)
bms_poll_run_status(base_time);
bms_poll_sop(base_time);
bms_poll_soh(base_time);
task_mqtt_handler(base_time);
is_first_run = true;
}
@ -133,8 +132,6 @@ void poll_1ms_task_init(void)
// KIT_PRINTF("signal init ok \r\n");
KIT_SET_BIT_MASK_32(is_data_ok, SIGNAL_FINISH_BIT);
bsp_create_task(&ord_ctrl_task, (uint8_t *)"ctrl");
poll_mqtt_init();
}
void poll_10ms_task_init(void)
@ -181,7 +178,7 @@ void poll_10ms_task_init(void)
tcp_server_task[i].interval = 100;
tcp_server_task[i].timeout = 1000;
tcp_server_task[i].handler_func = tcp_server_poll[i];
bsp_create_task(&tcp_server_task[i], (uint8_t *)&tcp_server_task_name[i][0]);
bsp_create_task(&tcp_server_task[i], (uint8_t *)&tcp_server_task_name[i][0]);
}
}

10
app/stm32fxxx_app/prj/BCU_APP.uvprojx
View File

@ -17,8 +17,8 @@
<TargetCommonOption>
<Device>STM32F407ZGTx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
@ -187,7 +187,6 @@
<RvdsVP>2</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<nBranchProt>0</nBranchProt>
<hadIRAM2>1</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@ -1068,8 +1067,8 @@
<TargetCommonOption>
<Device>STM32F407VGTx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
@ -1238,7 +1237,6 @@
<RvdsVP>2</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<nBranchProt>0</nBranchProt>
<hadIRAM2>1</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>

7086
app/stm32fxxx_app/prj/JLinkLog.txt
View File

File diff suppressed because it is too large Load Diff

8
app/stm32fxxx_app/protocol/protocol_mqtt_bcu.c
View File

@ -850,6 +850,8 @@ const devCellPointMap bms_temp_points[] =
const int bms_volt_count = sizeof(bms_volt_points) / sizeof(devCellPointMap);
const int bms_temp_count = sizeof(bms_temp_points) / sizeof(devCellPointMap);
void protocol_build_json(uint16_t groupId)
{
int val = 0;
@ -869,8 +871,6 @@ void protocol_build_json(uint16_t groupId)
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
cJSON_AddStringToObject(deviceObj, "devId", "001");
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
cJSON_AddNumberToObject(deviceObj, "currentPack", groupId); // 当前包数
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); //总包数
// 构建 data 对象
cJSON* dataObj = cJSON_CreateObject();
@ -926,8 +926,6 @@ void protocol_build_volt_json(uint8_t i)
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
cJSON_AddStringToObject(deviceObj, "devId", "001");
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
cJSON_AddNumberToObject(deviceObj, "currentPack", i + 3); // 当前包数
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); // 总包数
// 构建 data 对象
cJSON* dataObj = cJSON_CreateObject();
@ -980,8 +978,6 @@ void protocol_build_temp_json(uint8_t i)
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
cJSON_AddStringToObject(deviceObj, "devId", "001");
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
cJSON_AddNumberToObject(deviceObj, "currentPack", i + 14); // 当前包数
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); // 总包数
// 构建 data 对象
cJSON* dataObj = cJSON_CreateObject();

10
library/drv_peripheral/drv_qfc41d.c
View File

@ -193,11 +193,11 @@ uint8_t drv_qfc41d_init(void)
//设置接收回调函数
drv_uart_set_interrupt(QFC41D_UART_PORT, kUartInterrupt_Rx, APP_CFG_INT_PRIO_UART2_RX, drv_qf41d_uart_rx_it_call);//#define SIM_UART_PORT kUartDev_2
//³õʼ»¯wifi
if(drv_wifi_init() != 0)
{
return 1;
}
//³õʼ»¯wifi
if(drv_wifi_init() != 0)
{
return 1;
}
/* 蓝牙预留
//初始化蓝牙（BLE）