Compare commits
3 Commits
13dd3caeb6
...
63d4260020
Author | SHA1 | Date |
---|---|---|
|
63d4260020 | |
|
1889464e18 | |
|
11589be1dd |
|
@ -62,6 +62,7 @@ void task_100ms_handler(uint32_t base_time)
|
||||||
bms_poll_run_status(base_time);
|
bms_poll_run_status(base_time);
|
||||||
bms_poll_sop(base_time);
|
bms_poll_sop(base_time);
|
||||||
bms_poll_soh(base_time);
|
bms_poll_soh(base_time);
|
||||||
|
task_mqtt_handler(base_time);
|
||||||
is_first_run = true;
|
is_first_run = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,6 +133,8 @@ void poll_1ms_task_init(void)
|
||||||
// KIT_PRINTF("signal init ok \r\n");
|
// KIT_PRINTF("signal init ok \r\n");
|
||||||
KIT_SET_BIT_MASK_32(is_data_ok, SIGNAL_FINISH_BIT);
|
KIT_SET_BIT_MASK_32(is_data_ok, SIGNAL_FINISH_BIT);
|
||||||
bsp_create_task(&ord_ctrl_task, (uint8_t *)"ctrl");
|
bsp_create_task(&ord_ctrl_task, (uint8_t *)"ctrl");
|
||||||
|
|
||||||
|
poll_mqtt_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void poll_10ms_task_init(void)
|
void poll_10ms_task_init(void)
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
<Device>STM32F407ZGTx</Device>
|
<Device>STM32F407ZGTx</Device>
|
||||||
<Vendor>STMicroelectronics</Vendor>
|
<Vendor>STMicroelectronics</Vendor>
|
||||||
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
|
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||||
<PackURL>https://www.keil.com/pack/</PackURL>
|
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||||
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
|
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
|
||||||
<FlashUtilSpec></FlashUtilSpec>
|
<FlashUtilSpec></FlashUtilSpec>
|
||||||
<StartupFile></StartupFile>
|
<StartupFile></StartupFile>
|
||||||
|
@ -187,6 +187,7 @@
|
||||||
<RvdsVP>2</RvdsVP>
|
<RvdsVP>2</RvdsVP>
|
||||||
<RvdsMve>0</RvdsMve>
|
<RvdsMve>0</RvdsMve>
|
||||||
<RvdsCdeCp>0</RvdsCdeCp>
|
<RvdsCdeCp>0</RvdsCdeCp>
|
||||||
|
<nBranchProt>0</nBranchProt>
|
||||||
<hadIRAM2>1</hadIRAM2>
|
<hadIRAM2>1</hadIRAM2>
|
||||||
<hadIROM2>0</hadIROM2>
|
<hadIROM2>0</hadIROM2>
|
||||||
<StupSel>8</StupSel>
|
<StupSel>8</StupSel>
|
||||||
|
@ -1067,8 +1068,8 @@
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
<Device>STM32F407VGTx</Device>
|
<Device>STM32F407VGTx</Device>
|
||||||
<Vendor>STMicroelectronics</Vendor>
|
<Vendor>STMicroelectronics</Vendor>
|
||||||
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
|
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||||
<PackURL>https://www.keil.com/pack/</PackURL>
|
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||||
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
|
<Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
|
||||||
<FlashUtilSpec></FlashUtilSpec>
|
<FlashUtilSpec></FlashUtilSpec>
|
||||||
<StartupFile></StartupFile>
|
<StartupFile></StartupFile>
|
||||||
|
@ -1237,6 +1238,7 @@
|
||||||
<RvdsVP>2</RvdsVP>
|
<RvdsVP>2</RvdsVP>
|
||||||
<RvdsMve>0</RvdsMve>
|
<RvdsMve>0</RvdsMve>
|
||||||
<RvdsCdeCp>0</RvdsCdeCp>
|
<RvdsCdeCp>0</RvdsCdeCp>
|
||||||
|
<nBranchProt>0</nBranchProt>
|
||||||
<hadIRAM2>1</hadIRAM2>
|
<hadIRAM2>1</hadIRAM2>
|
||||||
<hadIROM2>0</hadIROM2>
|
<hadIROM2>0</hadIROM2>
|
||||||
<StupSel>8</StupSel>
|
<StupSel>8</StupSel>
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -850,8 +850,6 @@ const devCellPointMap bms_temp_points[] =
|
||||||
const int bms_volt_count = sizeof(bms_volt_points) / sizeof(devCellPointMap);
|
const int bms_volt_count = sizeof(bms_volt_points) / sizeof(devCellPointMap);
|
||||||
const int bms_temp_count = sizeof(bms_temp_points) / sizeof(devCellPointMap);
|
const int bms_temp_count = sizeof(bms_temp_points) / sizeof(devCellPointMap);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void protocol_build_json(uint16_t groupId)
|
void protocol_build_json(uint16_t groupId)
|
||||||
{
|
{
|
||||||
int val = 0;
|
int val = 0;
|
||||||
|
@ -871,6 +869,8 @@ void protocol_build_json(uint16_t groupId)
|
||||||
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
||||||
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
||||||
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "currentPack", groupId); // 当前包数
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); //总包数
|
||||||
|
|
||||||
// 构建 data 对象
|
// 构建 data 对象
|
||||||
cJSON* dataObj = cJSON_CreateObject();
|
cJSON* dataObj = cJSON_CreateObject();
|
||||||
|
@ -926,6 +926,8 @@ void protocol_build_volt_json(uint8_t i)
|
||||||
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
||||||
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
||||||
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "currentPack", i + 3); // 当前包数
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); // 总包数
|
||||||
|
|
||||||
// 构建 data 对象
|
// 构建 data 对象
|
||||||
cJSON* dataObj = cJSON_CreateObject();
|
cJSON* dataObj = cJSON_CreateObject();
|
||||||
|
@ -978,6 +980,8 @@ void protocol_build_temp_json(uint8_t i)
|
||||||
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
cJSON_AddStringToObject(deviceObj, "devName", "BCU");
|
||||||
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
cJSON_AddStringToObject(deviceObj, "devId", "001");
|
||||||
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
cJSON_AddStringToObject(deviceObj, "sn", "SN123456");
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "currentPack", i + 14); // 当前包数
|
||||||
|
cJSON_AddNumberToObject(deviceObj, "totalPack", 16); // 总包数
|
||||||
|
|
||||||
// 构建 data 对象
|
// 构建 data 对象
|
||||||
cJSON* dataObj = cJSON_CreateObject();
|
cJSON* dataObj = cJSON_CreateObject();
|
||||||
|
|
|
@ -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
|
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
|
//³õʼ»¯wifi
|
||||||
if(drv_wifi_init() != 0)
|
if(drv_wifi_init() != 0)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 蓝牙预留
|
/* 蓝牙预留
|
||||||
//初始化蓝牙(BLE)
|
//初始化蓝牙(BLE)
|
||||||
|
|
Loading…
Reference in New Issue