修改完成
This commit is contained in:
kkkjtr
parent
e4af8b2619
commit
eae43f03b7
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
|
||||
|
||||
<component name="EventRecorderStub" version="1.0.0"/> <!--name and version of the component-->
|
||||
<events>
|
||||
</events>
|
||||
|
||||
</component_viewer>
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
T8684 1513:581.568 SEGGER J-Link V7.96q Log File
|
||||
T8684 1513:581.696 DLL Compiled: Jun 28 2024 12:33:32
|
||||
T8684 1513:581.696 Logging started @ 2024-09-06 11:31
|
||||
T8684 1513:581.696 Process: C:\APP\KeilMDK\UV4\UV4.exe
|
||||
T8684 1513:581.696 - 1451569.920ms
|
||||
T8684 1513:581.696 JLINK_SetWarnOutHandler(...)
|
||||
T8684 1513:581.696 - 0.003ms
|
||||
T8684 1513:581.696 JLINK_OpenEx(...)
|
||||
T8684 1513:583.360 Firmware: J-Link ARM-OB STM32 compiled Aug 22 2012 19:52:04
|
||||
T8684 1513:584.000 Firmware: J-Link ARM-OB STM32 compiled Aug 22 2012 19:52:04
|
||||
T8684 1513:585.408 Hardware: V7.00
|
||||
T8684 1513:585.408 S/N: 20090928
|
||||
T8684 1513:585.408 OEM: SEGGER
|
||||
T8684 1513:585.408 Feature(s): RDI,FlashDL,FlashBP,JFlash,GDB
|
||||
T8684 1513:585.664 Bootloader: (Could not read)
|
||||
T8684 1513:586.176 TELNET listener socket opened on port 19021
|
||||
T8684 1513:614.080 Device "CORTEX-M0" selected.
|
||||
T8684 1513:615.104 WEBSRV WEBSRV_Init(): Starting webserver thread(s)
|
||||
T8684 1513:615.232 WEBSRV Webserver running on local port 19080
|
||||
T8684 1513:615.232 Looking for J-Link GUI Server exe at: C:\APP\KeilMDK\ARM\Segger\JLinkGUIServer.exe
|
||||
T8684 1513:615.360 Looking for J-Link GUI Server exe at: C:\Program Files\SEGGER\JLink_V796q\JLinkGUIServer.exe
|
||||
T8684 1513:615.360 Forking J-Link GUI Server: C:\Program Files\SEGGER\JLink_V796q\JLinkGUIServer.exe
|
||||
T8684 1513:627.264 J-Link GUI Server info: "J-Link GUI server V7.96q "
|
||||
T8684 1513:630.208 - 48.508ms returns "O.K."
|
||||
T8684 1513:630.208 JLINK_GetEmuCaps()
|
||||
T8684 1513:630.208 - 0.008ms returns 0x88EA5833
|
||||
T8684 1513:630.208 JLINK_TIF_GetAvailable(...)
|
||||
T8684 1513:632.768 - 2.520ms
|
||||
T8684 1513:633.152 JLINK_SetErrorOutHandler(...)
|
||||
T8684 1513:633.152 - 0.017ms
|
||||
T8684 1513:633.152 JLINK_ExecCommand("ProjectFile = "D:\home\Desktop\items\Ó²¼þСÏîÄ¿\Öпذå\Èí¼þ\bleSDK6_v1.4.1\projects\blezongkong\mdk\JLinkSettings.ini"", ...).
|
||||
T8684 1513:637.120 Device "CORTEX-M0" selected.
|
||||
T8684 1513:637.632 - 4.325ms returns 0x00
|
||||
T8684 1513:639.936 JLINK_ExecCommand("Device = B6x", ...).
|
||||
T8684 1513:640.064 Flash bank @ 0x18000000: SFL: Parsing sectorization info from ELF file
|
||||
T8684 1513:640.064 FlashDevice.SectorInfo[0]: .SectorSize = 0x00001000, .SectorStartAddr = 0x00000000
|
||||
T8684 1513:640.064 OFL: Init() present @ offset 0x000000AB
|
||||
T8684 1513:640.064 OFL: UnInit() present @ offset 0x000001E1
|
||||
T8684 1513:640.064 OFL: EraseSector() present @ offset 0x00000293
|
||||
T8684 1513:640.064 OFL: ProgramPage() present @ offset 0x000002C5
|
||||
T8684 1513:640.064 OFL: EraseChip() present @ offset 0x00000225
|
||||
T8684 1513:640.064 OFL: BlankCheck() N/A
|
||||
T8684 1513:640.064 OFL: Verify() present @ offset 0x00000383
|
||||
T8684 1513:640.064 OFL: SEGGER_FL_Erase() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_Erase() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Program() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_Program() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Read() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_Read() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_CalcCRC() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_CalcCRC() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Start() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_Start() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_GetFlashInfo() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_OPEN_GetFlashInfo() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Verify() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_CheckBlank() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Prepare() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_Restore() N/A
|
||||
T8684 1513:640.192 OFL: SEGGER_FL_EraseChip() N/A
|
||||
T8684 1513:640.192 OFL var <SEGGER_FL_GoIntEn>: N/A
|
||||
T8684 1513:643.904 Device "B6X" selected.
|
||||
T8684 1513:644.288 - 4.394ms returns 0x00
|
||||
T8684 1513:644.288 JLINK_ExecCommand("DisableConnectionTimeout", ...).
|
||||
T8684 1513:644.288 ERROR: Unknown command
|
||||
T8684 1513:644.288 - 0.011ms returns 0x01
|
||||
T8684 1513:644.416 JLINK_GetHardwareVersion()
|
||||
T8684 1513:644.416 - 0.006ms returns 70000
|
||||
T8684 1513:644.416 JLINK_GetDLLVersion()
|
||||
T8684 1513:644.416 - 0.006ms returns 79617
|
||||
T8684 1513:644.416 JLINK_GetOEMString(...)
|
||||
T8684 1513:644.416 JLINK_GetFirmwareString(...)
|
||||
T8684 1513:644.416 - 0.037ms
|
||||
T8684 1513:652.096 JLINK_GetDLLVersion()
|
||||
T8684 1513:652.224 - 0.024ms returns 79617
|
||||
T8684 1513:652.224 JLINK_GetCompileDateTime()
|
||||
T8684 1513:652.224 - 0.006ms
|
||||
T8684 1513:654.144 JLINK_GetFirmwareString(...)
|
||||
T8684 1513:654.144 - 0.014ms
|
||||
T8684 1513:655.808 JLINK_GetHardwareVersion()
|
||||
T8684 1513:655.936 - 0.010ms returns 70000
|
||||
T8684 1513:657.600 JLINK_GetSN()
|
||||
T8684 1513:657.600 - 0.012ms returns 20090928
|
||||
T8684 1513:659.008 JLINK_GetOEMString(...)
|
||||
T8684 1513:664.640 JLINK_TIF_Select(JLINKARM_TIF_SWD)
|
||||
T8684 1513:664.896 - 0.316ms returns 0x00
|
||||
T8684 1513:664.896 JLINK_HasError()
|
||||
T8684 1513:664.896 JLINK_SetSpeed(5000)
|
||||
T8684 1513:664.896 - 0.059ms
|
||||
T8684 1513:664.896 JLINK_GetId()
|
||||
T8684 1513:668.992 ConfigTargetSettings() start
|
||||
T8684 1513:668.992 J-Link Script File: Executing ConfigTargetSettings()
|
||||
T8684 1513:670.528 ConfigTargetSettings() end - Took 14us
|
||||
T8684 1513:774.848 Failed to attach to CPU. Trying connect under reset.
|
||||
T8684 1514:295.552 Connect fallback: Reset via Reset pin & Connect.
|
||||
T8684 1514:351.360 ConfigTargetSettings() start
|
||||
T8684 1514:351.360 J-Link Script File: Executing ConfigTargetSettings()
|
||||
T8684 1514:352.384 ConfigTargetSettings() end - Took 10us
|
||||
T8684 1514:458.752 - 793.763ms returns 0x00000000
|
||||
T8684 1582:110.080 JLINK_Close()
|
||||
T8684 1582:130.432 - 20.341ms
|
||||
T8684 1582:130.432
|
||||
T8684 1582:130.432 Closed
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -48,7 +48,7 @@
|
|||
<InvalidFlash>1</InvalidFlash>
|
||||
</TargetStatus>
|
||||
<OutputDirectory>.\output\</OutputDirectory>
|
||||
<OutputName>OTA_V2_8</OutputName>
|
||||
<OutputName>OTA_V2_9</OutputName>
|
||||
<CreateExecutable>1</CreateExecutable>
|
||||
<CreateLib>0</CreateLib>
|
||||
<CreateHexFile>1</CreateHexFile>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ float temp_bat_voltage=0;
|
|||
|
||||
// uint8_t bat_str[50]={0,0},bat_str_len=0;
|
||||
|
||||
const float coulomp_voltage_tables[3][21] = {
|
||||
const float coulomp_voltage_tablesSLA[3][21] = {
|
||||
{ // 4串
|
||||
420.0f, 423.6f, 427.2f, 430.8f, 434.4f, 438.0f, 441.6f, 445.2f, 448.8f, 452.4f,
|
||||
456.0f, 459.6f, 463.2f, 466.8f, 470.4f, 474.0f, 477.6f, 481.2f, 484.8f, 488.4f, 492.0f
|
||||
|
|
@ -45,11 +45,25 @@ const float coulomp_voltage_tables[3][21] = {
|
|||
}
|
||||
};
|
||||
|
||||
const float coulomp_voltage_tablesLi[3][21] = {
|
||||
{ // 4串
|
||||
|
||||
},
|
||||
{ // 5串
|
||||
|
||||
},
|
||||
{ // 6串
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
uint8_t pmu_voltage_to_percent(uint32_t volt){//电压转百分比
|
||||
|
||||
uint8_t table_index = BAT_Message.Bat_PACK ;
|
||||
|
||||
const float* voltage_table = coulomp_voltage_tables[table_index];
|
||||
const float* voltage_table = coulomp_voltage_tablesSLA[table_index];
|
||||
|
||||
uint8_t i, percent;
|
||||
float step, base;
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
|
|||
}
|
||||
}else if(CMDCode == 0x06){
|
||||
BAT_Message.Bat_Voltage = get_bat_voltage() * 10;
|
||||
BAT_Message.Bat_Percent = pmu_voltage_to_percent(BAT_Message.Bat_Voltage);
|
||||
BAT_Message.Bat_Percent = pmu_voltage_to_percent(BAT_Message.Bat_Voltage);
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_STA;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_Percent;
|
||||
break;
|
||||
|
|
@ -430,30 +430,30 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
|
|||
}
|
||||
case 0x0308: // 电池类型信息
|
||||
if(CMDCode == 0x03){
|
||||
MODBUS_Sent_BUF[len_count++] =radar_data.distance >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =radar_data.distance & 0xff;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_TYPE >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_TYPE & 0xff;
|
||||
MODBUS_Sent_BUF[2] +=2;
|
||||
if(0 == --reg_val_num){
|
||||
break;
|
||||
}
|
||||
}else if(CMDCode == 0x06){
|
||||
BAT_Message.Bat_TYPE =reg_val_num ? 1 : 0;
|
||||
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V & 0xff;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_TYPE >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_TYPE & 0xff;
|
||||
break;
|
||||
}
|
||||
case 0x0309: // 电池包信息
|
||||
if(CMDCode == 0x03){
|
||||
MODBUS_Sent_BUF[len_count++] =radar_data.distance >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =radar_data.distance & 0xff;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_PACK >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_PACK & 0xff;
|
||||
MODBUS_Sent_BUF[2] +=2;
|
||||
if(0 == --reg_val_num){
|
||||
break;
|
||||
}
|
||||
}else if(CMDCode == 0x06){
|
||||
BAT_Message.Bat_PACK =reg_val_num ? 1 : 0;
|
||||
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V & 0xff;
|
||||
BAT_Message.Bat_PACK =reg_val_num > 10 ? 10 : reg_val_num;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_PACK >> 8;
|
||||
MODBUS_Sent_BUF[len_count++] =BAT_Message.Bat_PACK & 0xff;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ void conf_init(void);
|
|||
|
||||
/**************************系统版本**************************/
|
||||
// 软件本号
|
||||
#define SW_VERSION (8)
|
||||
#define SW_VERSION (9) //之前是8
|
||||
// 硬件本号
|
||||
#define HW_VERSION (2)
|
||||
// 版本类型：0：0x04000；1：0x20000//不可修改
|
||||
|
|
|
|||
Loading…
Reference in New Issue