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

4000modbus

This commit is contained in:
guzz 2025-02-25 14:58:14 +08:00
parent 091a70874e
commit 25aaac1080
14 changed files with 10269 additions and 1323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/stm32fxxx_app/app/dido_manager.c
View File

@ -226,7 +226,7 @@ const GpioStatus relay_status_to_ctrl[kDoStatus_End] ={kGpioStatus_Low, kGpioSta
void bms_poll_di_do(uint32_t base_time) void bms_poll_di_do(uint32_t base_time)
{ {
uint32_t i; uint32_t i,j = 0;
DoStatus rly_st; DoStatus rly_st;
if(do_item.bmsCircuitCtrl != NULL) if(do_item.bmsCircuitCtrl != NULL)
@ -248,6 +248,10 @@ void bms_poll_di_do(uint32_t base_time)
do_item.tick[i] = 0; do_item.tick[i] = 0;
rly_st = do_item.ctrl_status[i]; rly_st = do_item.ctrl_status[i];
do_item.actual_status[i] = rly_st; do_item.actual_status[i] = rly_st;
if((relay_status_to_ctrl[rly_st] == kGpioStatus_Low) && (i == 1))
{
j = 1;
}
drv_gpio_set_pin_status(do_item.relay_start_io + i, relay_status_to_ctrl[rly_st]); drv_gpio_set_pin_status(do_item.relay_start_io + i, relay_status_to_ctrl[rly_st]);
} }
else else

23
app/stm32fxxx_app/app/hv_adc_manager.c
View File

@ -295,17 +295,18 @@ void get_ad_sample(void)
drv_enter_auto_rst_mode_Data(outputdata, 6); drv_enter_auto_rst_mode_Data(outputdata, 6);
#else #else
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_0); outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_0);
i += 1;
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_1); // i += 1;
i += 1; // outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_1);
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_2); // i += 1;
i += 1; // outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_2);
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_3); // i += 1;
i += 1; // outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_3);
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_4); // i += 1;
i += 1; // outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_4);
outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_5); // i += 1;
i += 1; // outputdata[i] = drv_get_ads8688_ch_data(MAN_Ch_5);
// i += 1;
#endif #endif
for (i = 0; i < kAdIc_End; i++) for (i = 0; i < kAdIc_End; i++)

4
app/stm32fxxx_app/app/soc_calculate.c
View File

@ -599,7 +599,7 @@ void bms_integral_soc(int32_t current, uint16_t base_time)
sox_item.tmp_chg_cap += tmp_32u; sox_item.tmp_chg_cap += tmp_32u;
//单位 kWms //单位 kWms
//tmp_32少除了100，这里应该多除个100,2.20 //tmp_32少除了100，这里应该多除个100--2.20
sox_item.tmp_chg_energy += tmp_32u * total_volt / 1000000; sox_item.tmp_chg_energy += tmp_32u * total_volt / 1000000;
if(sox_item.calculate_cap < sox_item.rated_cap) if(sox_item.calculate_cap < sox_item.rated_cap)
@ -646,7 +646,7 @@ void bms_integral_soc(int32_t current, uint16_t base_time)
sox_item.tmp_dis_cap += tmp_32u; sox_item.tmp_dis_cap += tmp_32u;
//单位 kWms //单位 kWms
sox_item.tmp_dis_energy += tmp_32u * total_volt / 10000; sox_item.tmp_dis_energy += tmp_32u * total_volt / 1000000;
if(sox_item.calculate_cap > 0) if(sox_item.calculate_cap > 0)
{ {

8
app/stm32fxxx_app/app/soc_calculate.h
View File

@ -23,26 +23,26 @@ typedef enum
typedef enum typedef enum
{ {
kCumulateData_DayDisTime, kCumulateData_DayDisTime, //0
kCumulateData_DayChgTime, kCumulateData_DayChgTime,
kCumulateData_SigDisTime, kCumulateData_SigDisTime,
kCumulateData_SigDisCap, kCumulateData_SigDisCap,
kCumulateData_SigDisEnergy, kCumulateData_SigDisEnergy,
kCumulateData_SigChgTime, kCumulateData_SigChgTime, //5
kCumulateData_SigChgCap, kCumulateData_SigChgCap,
kCumulateData_SigChgEnergy, kCumulateData_SigChgEnergy,
kCumulateData_DayDisCap, kCumulateData_DayDisCap,
kCumulateData_DayDisEnergy, kCumulateData_DayDisEnergy,
kCumulateData_DayChgCap, kCumulateData_DayChgCap, //10
kCumulateData_DayChgEnergy, kCumulateData_DayChgEnergy,
kCumulateData_AccDisTime, kCumulateData_AccDisTime,
kCumulateData_AccDisCap, kCumulateData_AccDisCap,
kCumulateData_AccDisEnergy, kCumulateData_AccDisEnergy,
kCumulateData_AccChgTime, kCumulateData_AccChgTime,
kCumulateData_AccChgCap, kCumulateData_AccChgCap, //16
kCumulateData_AccChgEnergy, kCumulateData_AccChgEnergy,
kCumulateData_End, kCumulateData_End,
}CumulateData; }CumulateData;

408
app/stm32fxxx_app/prj/BCU_APP.uvguix.Emb
View File

File diff suppressed because one or more lines are too long

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

@ -50,7 +50,7 @@
<InvalidFlash>1</InvalidFlash> <InvalidFlash>1</InvalidFlash>
</TargetStatus> </TargetStatus>
<OutputDirectory>.\Objects\</OutputDirectory> <OutputDirectory>.\Objects\</OutputDirectory>
<OutputName>BCU_APP</OutputName> <OutputName>BCU_APP2</OutputName>
<CreateExecutable>1</CreateExecutable> <CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib> <CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile> <CreateHexFile>1</CreateHexFile>
@ -83,7 +83,7 @@
<AfterMake> <AfterMake>
<RunUserProg1>1</RunUserProg1> <RunUserProg1>1</RunUserProg1>
<RunUserProg2>0</RunUserProg2> <RunUserProg2>0</RunUserProg2>
<UserProg1Name>fromelf --m32combined --output=@L.s19 .\Objects\@L.axf</UserProg1Name> <UserProg1Name>D:\Soft\Setup\Keil\ARM\ARM_Compiler_5.06u7\bin\fromelf.exe --bin -o D:\Code\BMS\BCU\app/BCU_APP2.bin D:\Code\BMS\BCU\app/BCU_APP2.axf"</UserProg1Name>
<UserProg2Name></UserProg2Name> <UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode>

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

File diff suppressed because it is too large Load Diff

17
app/stm32fxxx_app/protocol/protocol_modbus_bcu.c
View File

@ -1271,9 +1271,24 @@ BspMdExCode bcu_modbus_485_0x10_fun(uint16_t start_addr, uint16_t reg_num, uint8
bcu_data_set_0x06_msg(start_addr + i, data); bcu_data_set_0x06_msg(start_addr + i, data);
} }
} }
//@wangk , 2-25, add 0x10function(4000~4449)
else if((start_addr >= 4000) && (start_addr <= 4449))
{
uint16_t *reg_data = (uint16_t *)buf;
for (uint16_t i = 0; i < reg_num; i++)
{
uint16_t reg_value = (reg_data[i] >> 8) | (reg_data[i] << 8);
uint16_t offset_addr = start_addr - 4000 + i;
if (!hmi_write_modbus_cfg(offset_addr, reg_value))
{
err = kBspMdEx_InvalidAddr;
}
}
}
else else
{ {
err = kBspMdEx_InvalidAddr; err = kBspMdEx_InvalidAddr;
} }
return err; return err;
} }

9
app/stm32fxxx_boot/bcu_boot_bn/BCU/BCU_BOOT/prj/BCU_BOOT.uvprojx
View File

@ -10,15 +10,15 @@
<TargetName>stm32f407</TargetName> <TargetName>stm32f407</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pArmCC>5060960::V5.06 update 7 (build 960)::.\ARMCC</pArmCC> <pArmCC>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pArmCC>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed> <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pCCUsed>
<uAC6>0</uAC6> <uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
<Device>STM32F407ZGTx</Device> <Device>STM32F407ZGTx</Device>
<Vendor>STMicroelectronics</Vendor> <Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.14.0</PackID> <PackID>Keil.STM32F4xx_DFP.3.0.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL> <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> <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>

2598
app/stm32fxxx_boot/bcu_boot_bn/BCU/BCU_BOOT/prj/JLinkLog.txt
View File

File diff suppressed because it is too large Load Diff

68
app/stm32fxxx_boot/prj/bcu_bootloader.uvguix.Emb
View File

File diff suppressed because one or more lines are too long

7
library/core/system_stm32f4xx.c
View File

@ -518,8 +518,8 @@ void SystemInit(void)
/* Configure the System clock source, PLL Multiplier and Divider factors, /* Configure the System clock source, PLL Multiplier and Divider factors,
AHB/APBx prescalers and Flash settings ----------------------------------*/ AHB/APBx prescalers and Flash settings ----------------------------------*/
//SetSysClock(); SetSysClock();
SystemClock_Config(); //SystemClock_Config();
/* Configure the Vector Table location add offset address ------------------*/ /* Configure the Vector Table location add offset address ------------------*/
#ifdef VECT_TAB_SRAM #ifdef VECT_TAB_SRAM
@ -573,6 +573,7 @@ void SystemCoreClockUpdate(void)
#endif /* STM32F412xG || STM32F413_423xx || STM32F446xx */ #endif /* STM32F412xG || STM32F413_423xx || STM32F446xx */
/* Get SYSCLK source -------------------------------------------------------*/ /* Get SYSCLK source -------------------------------------------------------*/
tmp = RCC->CFGR & RCC_CFGR_SWS; tmp = RCC->CFGR & RCC_CFGR_SWS;
//tmp = RCC_CFGR_SWS_HSE;
switch (tmp) switch (tmp)
{ {
@ -711,7 +712,7 @@ void SystemClock_Config(void)
RCC->CFGR |= RCC_CFGR_PPRE2_DIV2; RCC->CFGR |= RCC_CFGR_PPRE2_DIV2;
/* PCLK1 = HCLK / 4 */ /* PCLK1 = HCLK / 4 */
RCC->CFGR |= RCC_CFGR_PPRE1_DIV4; RCC->CFGR |= RCC_CFGR_PPRE1_DIV8;
/* Configure the main PLL for 168 MHz using HSI */ /* Configure the main PLL for 168 MHz using HSI */
RCC->PLLCFGR = (16 << 0) // PLL_M = 16 (HSI = 16 MHz input for PLL) RCC->PLLCFGR = (16 << 0) // PLL_M = 16 (HSI = 16 MHz input for PLL)

9
library/drv_peripheral/drv_ads8688.c
View File

@ -29,17 +29,18 @@ uint8_t drv_ads8688_spi_send_rev(uint8_t data)
bool drv_ads8688_Init(void) bool drv_ads8688_Init(void)
{ {
uint8_t i = 0, value = 0; uint8_t i = 0, value = 0;
drv_spi_init(kSpiDev_2, kSpiFreq_Div256, kSpiMode_C0E1, SpiFrame_MSBFirst, kGpioType_ADC_Clk, kGpioType_ADC_Miso, kGpioType_ADC_Mosi); drv_spi_init(kSpiDev_2, kSpiFreq_Div64, kSpiMode_C1E1, SpiFrame_MSBFirst, kGpioType_ADC_Clk, kGpioType_ADC_Miso, kGpioType_ADC_Mosi);
drv_reset_ads8688(); drv_reset_ads8688();
OSTimeDly(20); OSTimeDly(20);
OSTimeDly(20); OSTimeDly(20);
drv_enter_standby_mode(); drv_enter_standby_mode();
drv_enter_pwrdn_mode(); //drv_enter_pwrdn_mode();
OSTimeDly(20); //OSTimeDly(20);
drv_set_ch_range(Channel_0_Input_Range,VREF_125_125); drv_set_ch_range(Channel_0_Input_Range,VREF_125_125);
OSTimeDly(20);
drv_set_ch_range(Channel_1_Input_Range,VREF_125_125); drv_set_ch_range(Channel_1_Input_Range,VREF_125_125);
drv_set_ch_range(Channel_2_Input_Range,VREF_125_125); drv_set_ch_range(Channel_2_Input_Range,VREF_125_125);
drv_set_ch_range(Channel_3_Input_Range,VREF_125_125); drv_set_ch_range(Channel_3_Input_Range,VREF_125_125);
@ -176,7 +177,7 @@ uint16_t drv_manual_chn_mode_Data(void)
datah = drv_ads8688_spi_send_rev(0xFF); datah = drv_ads8688_spi_send_rev(0xFF);
datal = drv_ads8688_spi_send_rev(0xFF); datal = drv_ads8688_spi_send_rev(0xFF);
drv_set_ads8688_cs(kGpioStatus_High); drv_set_ads8688_cs(kGpioStatus_High);
kit_time_dly_ms(10);
return (datah << 8 | datal); return (datah << 8 | datal);
} }