1、修改故障日志存储地址，解决SN被擦除问题；

2、调整助力比。

MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -14,7 +14,7 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.1.0.4</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IROM(0x08000000,0x20000) IRAM(0x20000000,0x5000) CPUTYPE("Cortex-M3") CLOCK(72000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -84,6 +84,8 @@
             <UserProg2Name>.\crc_gen_keil.bat</UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
           </AfterMake>
           <SelectedForBatchBuild>0</SelectedForBatchBuild>
           <SVCSIdString></SVCSIdString>
@@ -127,7 +129,7 @@
             <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
             <RunToMain>1</RunToMain>
             <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>1</RestoreWatchpoints>
+            <RestoreWatchpoints>0</RestoreWatchpoints>
             <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
             <RestoreFunctions>1</RestoreFunctions>
             <RestoreToolbox>1</RestoreToolbox>
@@ -145,10 +147,9 @@
             <RestoreToolbox>1</RestoreToolbox>
             <RestoreTracepoints>1</RestoreTracepoints>
             <RestoreSysVw>1</RestoreSysVw>
-            <UsePdscDebugDescription>1</UsePdscDebugDescription>
           </Target>
           <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>1</TargetSelection>
+          <TargetSelection>6</TargetSelection>
           <SimDlls>
             <CpuDll></CpuDll>
             <CpuDllArguments></CpuDllArguments>
@@ -162,7 +163,7 @@
             <PeripheralDll></PeripheralDll>
             <PeripheralDllArguments></PeripheralDllArguments>
             <InitializationFile></InitializationFile>
-            <Driver>BIN\UL2CM3.DLL</Driver>
+            <Driver>Segger\JL2CM3.dll</Driver>
           </TargetDlls>
         </DebugOption>
         <Utilities>
@@ -362,6 +363,8 @@
             <uSurpInc>0</uSurpInc>
             <uC99>1</uC99>
             <useXO>0</useXO>
+            <v6Lang>0</v6Lang>
+            <v6LangP>0</v6LangP>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>

MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -121,13 +121,21 @@ ARM Macro Assembler    Page 2
                                                             ler
    98 00000096                 ENDP
    99 00000096                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_app\stm32f1xx_stucpure
-gsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-01
-0A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC
-:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICRO
-LIB SETA 1" --list=stm32f1xx_stucpuregsaddressing.lst ..\SelfTestUser\src_speci
-fic\stm32f1xx_STUCpuRegsAddressing.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuregsaddressing.d -o.\qd007a_ctl_a
+pp\stm32f1xx_stucpuregsaddressing.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-0
+10A_CTRL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.
+6.0\CMSIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\In
+clude --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" 
+--predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_s
+
+
+
+ARM Macro Assembler    Page 3 
+
+
+tucpuregsaddressing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddres
+sing.s
 
 
 
@@ -239,4 +247,4 @@ ssing.s
 ssing.s
 Comment: FailSafePOR used once
 3 symbols
-338 symbols in table
+341 symbols in table

MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1591,13 +1591,14 @@ ARM Macro Assembler    Page 25
  1170 000006D0         
  1171 000006D0         
  1172 000006D0                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_stucpuwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
-L_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil
-_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SE
-TA 1" --list=stm32f1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
-f1xx_STUCpuWalkpatKEIL.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_stucpuwalkpatkeil.d -o.\qd007a_ctl_app\
+stm32f1xx_stucpuwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CT
+RL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CM
+SIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include 
+--predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --pred
+efine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuw
+alkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
 
 
 
@@ -2665,4 +2666,4 @@ KEIL.s
 KEIL.s
 
 1 symbol
-398 symbols in table
+401 symbols in table

MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -428,13 +428,14 @@ ARM Macro Assembler    Page 7
   329 000001F2                 ENDP
   330 000001F2         
   331 000001F2                 END
-Command Line: --debug --xref --cpu=Cortex-M3 --apcs=interwork --depend=.\qd007a
-_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\stm32f1xx_sturamwalkp
-atkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010A_CTR
-L_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.1.0\CMSIS\Include -IC:\Keil
-_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.0.4\Device\Include --predefine="__MICROLIB SE
-TA 1" --list=stm32f1xx_sturamwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32
-f1xx_STURamWalkpatKEIL.s
+Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
+ork --depend=.\qd007a_ctl_app\stm32f1xx_sturamwalkpatkeil.d -o.\qd007a_ctl_app\
+stm32f1xx_sturamwalkpatkeil.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CT
+RL_APP\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CM
+SIS\Core\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include 
+--predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --pred
+efine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamw
+alkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
 
 
 
@@ -811,4 +812,4 @@ IL.s
       None
 Comment: FailSafePOR unused
 1 symbol
-360 symbols in table
+363 symbols in table

User/Inc/eeprom_flash.h

@@ -21,8 +21,8 @@
 #define    EEPROM_FLASH_ADDR_MOTOR_PARAM         EEPROM_FLASH_BEGIN_ADDRESS + (uint32_t)216         //马达参数 16bytes + 4bytes
 #define    EEPROM_FLASH_ADDR_TORQUE_LINE_CP      EEPROM_FLASH_BEGIN_ADDRESS + (uint32_t)236         //力矩传感器线性校正参数 60bytes + 4bytes
 
-#define    EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS    0x0801F400
-#define    EEPROM_FLASH_ADDR_TEMP_END_ADDRESS      0x0801F7FF
+#define    EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS    0x0801E800
+#define    EEPROM_FLASH_ADDR_TEMP_END_ADDRESS      0x0801EFFF
 
 #define    EEPROM_FLASH_ADDR_POWEROFF_BKP_FLAG   EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS               //掉电保存的关键数据标志 4bytes + 4bytes
 #define    EEPROM_FLASH_ADDR_POWEROFF_BKP        EEPROM_FLASH_ADDR_TEMP_BEGIN_ADDRESS + (uint32_t)8 //掉电保存的关键数据 40bytes + 4bytes

User/Inc/log_save.h

@@ -5,8 +5,8 @@
 #include "motor_control.h"
 #include "eeprom_flash.h"
 
-#define LOG_ADDRESS_BEGIN               0x0801F800
-#define LOG_ADDRESS_END                 0x0801FBFF
+#define LOG_ADDRESS_BEGIN               0x0801F000
+#define LOG_ADDRESS_END                 0x0801F3FF
 
 //故障日志记录信息 64 bytes，1K空间可以保存最近16条故障记录
 typedef struct

User/Src/motor_control.c

@@ -1435,13 +1435,17 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
 				TorqueDecStep = MC_AssisParam.Gear_TURBO.DecCnt;
 				
 			  /*根据车速调节助力比*/
-				if(MC_RunInfo.BikeSpeed <= 100)
+				if(MC_RunInfo.BikeSpeed <= 50)
+				{
+				  Gain_K_ByCadence = 2270 + (50 - MC_RunInfo.BikeSpeed) * 10;
+				}
+        else if(MC_RunInfo.BikeSpeed <= 100)
 				{
-					Gain_K_ByCadence = 1843;  //1.8
+					Gain_K_ByCadence = 2270;  //1.9
 				}
 				else if(MC_RunInfo.BikeSpeed <= 240)
 				{
-					Gain_K_ByCadence = 3153 - (131 * MC_RunInfo.BikeSpeed / 10);
+					Gain_K_ByCadence = 3890 - (162 * MC_RunInfo.BikeSpeed / 10);
 				}
 				else
 				{
@@ -1477,21 +1481,20 @@ MC_CalParam_Struct_t MC_AssistRunMode_Torque_Process(uint16_t SenorData, MC_Gear
 				//控制输入给定减速斜率
 				TorqueDecStep = MC_AssisParam.Gear_SMART.DecCnt;
 
-					/*根据车速调节助力比*/
+				/*根据车速调节助力比*/
 				if(MC_RunInfo.BikeSpeed <= 100)
 				{
-					Gain_K_ByCadence = 1843;  //1.8
+					Gain_K_ByCadence = 2361;  //1.9
 				}
 				else if(MC_RunInfo.BikeSpeed <= 240)
 				{
-					Gain_K_ByCadence = 3153 - (131 * MC_RunInfo.BikeSpeed / 10);
+					Gain_K_ByCadence = 4047 - (168 * MC_RunInfo.BikeSpeed / 10);
 				}
 				else
 				{
 					Gain_K_ByCadence = 0;
 				}
 				
-				
 				Gain_K_ByCadenceFltSum += (((int32_t )Gain_K_ByCadence << 10) - Gain_K_ByCadenceFltSum) >> 9;
 				Gain_K_ByCadenceFlted = Gain_K_ByCadenceFltSum >> 10;
 				

User/Src/var.c

@@ -64,16 +64,16 @@ const MC_ConfigParam1_Struct_t MC_ConfigParam1_Default =
   (MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //支持指拨模式，0x55-不支持，0x-AA支持
 	(MC_StarMode_Struct_t)MC_StarMode_NORM,          //启动模式 
 	(uint16_t)100,                                   //停机时间 ms	
-	(uint8_t)25,                                     //限速 km/h
+	(uint8_t)24,                                     //限速 km/h
 	(uint8_t)3,                                      //下降速度
-	(uint8_t)14,                                     //前齿数 T
-	(uint8_t)9,                                      //后齿数 T
-	(uint8_t)17,                                     //限流 A
+	(uint8_t)16,                                     //前齿数 T
+	(uint8_t)16,                                     //后齿数 T
+	(uint8_t)15,                                     //限流 A
 	(uint8_t)135,                                    //高温预警值 +40℃
 	(uint8_t)165,                                    //高温保护值 +40℃
   (MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //无码表支持，0x55-不支持，0x-AA支持	
   (uint8_t)219,                                    //轮胎周长 cm
-  (uint8_t)0,                                      //系列号,
+  (uint8_t)2,                                      //系列号,
 	{100,100},                                       //ECO
   {100,100},                                       //NORM
   {100,100},                                       //SPORT
@@ -95,15 +95,15 @@ const MC_ConfigParam2_Struct_t MC_ConfigParam2_Default =
 	(int16_t)0,
 	(MC_SupportFlag_Struct_t)MC_SUPPORT_DISABLE,     //0x55-不支持，0x-AA支持
 	(MC_TailLight_Mode_Struct_t)MC_TAIL_LIGHT_MODE2, 
-	(MC_LightVoltage_Struct_t)0,
-	(MC_LightVoltage_Struct_t)0,
+	(MC_LightVoltage_Struct_t)6,
+	(MC_LightVoltage_Struct_t)6,
 };
 
 //MC默认马达参数，占用16bytes
 const MC_MotorParam_Struct_t MC_MotorParam_Default =
 {
   (uint16_t)250,    //W
-	(uint16_t)2000,   //rpm
+	(uint16_t)1200,   //rpm
 	(uint16_t)200,    //mohm
 	(uint16_t)10,     //mH
 	(uint16_t)10,     //mH
@@ -226,7 +226,7 @@ const nGearParam_Struct_t GearParam_Default_TURBO_Volans =
 	(uint16_t)100,
 	(uint16_t)1400,  //800,
 	(uint8_t)4, //1,
-	(uint8_t)2,  //1,
+	(uint8_t)2, //1,
 	(uint16_t)1024  //250
 };
 
@@ -236,10 +236,10 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans =
   (uint16_t)1000,
 	(uint16_t)2000,
 	(uint16_t)100,
-	(uint16_t)1260,  //800,
-	(uint8_t)2, //1,
-	(uint8_t)1,  //1,
-	(uint16_t)870  //250
+	(uint16_t)1400,
+	(uint8_t)4,
+	(uint8_t)2,
+	(uint16_t)1024
 };
 
 
@@ -288,7 +288,7 @@ const nGearParam_Struct_t GearParam_Default_TURBO_Volans_Plus =
 	(uint16_t)100,
 	(uint16_t)1400,  //800,
 	(uint8_t)4, //1,
-	(uint8_t)2,  //1,
+	(uint8_t)2, //1,
 	(uint16_t)1024  //250
 };
 
@@ -298,10 +298,10 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans_Plus =
   (uint16_t)1000,
 	(uint16_t)2000,
 	(uint16_t)100,
-	(uint16_t)1260,  //800,
-	(uint8_t)2, //1,
-	(uint8_t)1,  //1,
-	(uint16_t)870  //250
+	(uint16_t)1400,
+	(uint8_t)4,
+	(uint8_t)2,
+	(uint16_t)1024
 };
 
 /************Pegasi助力参数************/