add bms_volt_points and bms_temp_points
This commit is contained in:
parent
e35d808b94
commit
5d74b601b7
|
@ -10,15 +10,15 @@
|
|||
<TargetName>stm32f407</TargetName>
|
||||
<ToolsetNumber>0x4</ToolsetNumber>
|
||||
<ToolsetName>ARM-ADS</ToolsetName>
|
||||
<pArmCC>5060960::V5.06 update 7 (build 960)::.\ARMCC</pArmCC>
|
||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
||||
<pArmCC>5050106::V5.05 update 1 (build 106)::ARMCC</pArmCC>
|
||||
<pCCUsed>5050106::V5.05 update 1 (build 106)::ARMCC</pCCUsed>
|
||||
<uAC6>0</uAC6>
|
||||
<TargetOption>
|
||||
<TargetCommonOption>
|
||||
<Device>STM32F407ZGTx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
|
||||
<PackURL>https://www.keil.com/pack/</PackURL>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<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>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
<StartupFile></StartupFile>
|
||||
|
@ -187,6 +187,7 @@
|
|||
<RvdsVP>2</RvdsVP>
|
||||
<RvdsMve>0</RvdsMve>
|
||||
<RvdsCdeCp>0</RvdsCdeCp>
|
||||
<nBranchProt>0</nBranchProt>
|
||||
<hadIRAM2>1</hadIRAM2>
|
||||
<hadIROM2>0</hadIROM2>
|
||||
<StupSel>8</StupSel>
|
||||
|
@ -1067,8 +1068,8 @@
|
|||
<TargetCommonOption>
|
||||
<Device>STM32F407VGTx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
|
||||
<PackURL>https://www.keil.com/pack/</PackURL>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<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>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
<StartupFile></StartupFile>
|
||||
|
@ -1237,6 +1238,7 @@
|
|||
<RvdsVP>2</RvdsVP>
|
||||
<RvdsMve>0</RvdsMve>
|
||||
<RvdsCdeCp>0</RvdsCdeCp>
|
||||
<nBranchProt>0</nBranchProt>
|
||||
<hadIRAM2>1</hadIRAM2>
|
||||
<hadIROM2>0</hadIROM2>
|
||||
<StupSel>8</StupSel>
|
||||
|
|
|
@ -828,25 +828,23 @@ const int bms_point_count = sizeof(bms_points) / sizeof(bms_points[0]);
|
|||
*/
|
||||
const devCellPointMap bms_volt_points[] =
|
||||
{
|
||||
{"BCU_", 191, 0, 39,bms_get_baseInfo}, // 1ºÅ~40ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 40, 79,bms_get_baseInfo}, // 41ºÅ~80ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 80, 119,bms_get_baseInfo}, // 81ºÅ~120ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 120, 159,bms_get_baseInfo}, // 121ºÅ~160ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 160, 199,bms_get_baseInfo}, // 161ºÅ~200ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 200, 239,bms_get_baseInfo}, // 201ºÅ~240ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 240, 279,bms_get_baseInfo}, // 241ºÅ~280ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 280, 319,bms_get_baseInfo}, // 281ºÅ~320ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 320, 359,bms_get_baseInfo}, // 321ºÅ~360ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 360, 399,bms_get_baseInfo}, // 361ºÅ~400ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 0, 39, bms_get_cell_volt}, // 1ºÅ~40ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 40, 79, bms_get_cell_volt}, // 41ºÅ~80ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 80, 119, bms_get_cell_volt}, // 81ºÅ~120ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 120, 159, bms_get_cell_volt}, // 121ºÅ~160ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 160, 199, bms_get_cell_volt}, // 161ºÅ~200ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 200, 239, bms_get_cell_volt}, // 201ºÅ~240ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 240, 279, bms_get_cell_volt}, // 241ºÅ~280ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 280, 319, bms_get_cell_volt}, // 281ºÅ~320ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 320, 359, bms_get_cell_volt}, // 321ºÅ~360ºÅµç³Øµçѹ
|
||||
{"BCU_", 191, 360, 399, bms_get_cell_volt}, // 361ºÅ~400ºÅµç³Øµçѹ
|
||||
};
|
||||
|
||||
const devCellPointMap bms_temp_points[] =
|
||||
{
|
||||
{"BCU_", 611, 0, 39,bms_get_baseInfo}, // 1ºÅ~40ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 40, 79,bms_get_baseInfo}, // 41ºÅ~80ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 80, 119,bms_get_baseInfo}, // 81ºÅ~120ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 120, 159,bms_get_baseInfo}, // 121ºÅ~160ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 160, 199,bms_get_baseInfo}, // 161ºÅ~200ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 0, 39, bms_get_cell_temp}, // 1ºÅ~40ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 40, 79, bms_get_cell_temp}, // 41ºÅ~80ºÅµç³ØÎ¶È
|
||||
{"BCU_", 611, 80, 99, bms_get_cell_temp}, // 81ºÅ~100ºÅµç³ØÎ¶È
|
||||
};
|
||||
|
||||
const int bms_volt_count = sizeof(bms_volt_points) / sizeof(devCellPointMap);
|
||||
|
@ -936,7 +934,7 @@ void protocol_build_volt_json(uint8_t i)
|
|||
|
||||
for (int i = item->startCellIndex; i <= item->endCellIndex; ++i)
|
||||
{
|
||||
sprintf(key,"%s%d",item->key,item->pointId + i);
|
||||
sprintf(key,"%s%d",item->key,item->pointId + i);
|
||||
if (item->get_val != NULL)
|
||||
{
|
||||
val = item->get_val(i);
|
||||
|
@ -961,7 +959,7 @@ void protocol_build_volt_json(uint8_t i)
|
|||
|
||||
void protocol_build_temp_json(uint8_t i)
|
||||
{
|
||||
const devCellPointMap* item = &bms_temp_points[i];
|
||||
const devCellPointMap* item = &bms_temp_points[i];
|
||||
int val = 0;
|
||||
char key[10] = {0};
|
||||
cJSON* root = cJSON_CreateObject();
|
||||
|
@ -988,7 +986,7 @@ void protocol_build_temp_json(uint8_t i)
|
|||
|
||||
for (int i = item->startCellIndex; i <= item->endCellIndex; ++i)
|
||||
{
|
||||
sprintf(key,"%s%d",item->key,item->pointId + i);
|
||||
sprintf(key,"%s%d",item->key,item->pointId + i);
|
||||
if (item->get_val != NULL)
|
||||
{
|
||||
val = item->get_val(i);
|
||||
|
|
Loading…
Reference in New Issue