V4.0.7_20211217

1 Smart档助力参数调弱；
2 屏蔽按键开关灯功能；
3 软件版本号改为：V4.0.7_20211217；

MDK-ARM/QD007A_CTL_APP.uvprojx

@@ -10,6 +10,7 @@
       <TargetName>QD007A_CTL_APP</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
@@ -124,47 +125,6 @@
             <HexOffset>0</HexOffset>
             <Oh166RecLen>16</Oh166RecLen>
           </OPTHX>
-          <Simulator>
-            <UseSimulator>0</UseSimulator>
-            <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
-            <RunToMain>1</RunToMain>
-            <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>1</RestoreWatchpoints>
-            <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-            <RestoreFunctions>1</RestoreFunctions>
-            <RestoreToolbox>1</RestoreToolbox>
-            <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
-            <RestoreSysVw>1</RestoreSysVw>
-          </Simulator>
-          <Target>
-            <UseTarget>1</UseTarget>
-            <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
-            <RunToMain>1</RunToMain>
-            <RestoreBreakpoints>1</RestoreBreakpoints>
-            <RestoreWatchpoints>1</RestoreWatchpoints>
-            <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-            <RestoreFunctions>0</RestoreFunctions>
-            <RestoreToolbox>1</RestoreToolbox>
-            <RestoreTracepoints>1</RestoreTracepoints>
-            <RestoreSysVw>1</RestoreSysVw>
-          </Target>
-          <RunDebugAfterBuild>0</RunDebugAfterBuild>
-          <TargetSelection>6</TargetSelection>
-          <SimDlls>
-            <CpuDll></CpuDll>
-            <CpuDllArguments></CpuDllArguments>
-            <PeripheralDll></PeripheralDll>
-            <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile></InitializationFile>
-          </SimDlls>
-          <TargetDlls>
-            <CpuDll></CpuDll>
-            <CpuDllArguments></CpuDllArguments>
-            <PeripheralDll></PeripheralDll>
-            <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile></InitializationFile>
-            <Driver>Segger\JL2CM3.dll</Driver>
-          </TargetDlls>
         </DebugOption>
         <Utilities>
           <Flash1>
@@ -229,6 +189,7 @@
             <useUlib>1</useUlib>
             <EndSel>0</EndSel>
             <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
             <RwSelD>3</RwSelD>
             <CodeSel>0</CodeSel>
@@ -365,6 +326,11 @@
             <useXO>0</useXO>
             <v6Lang>0</v6Lang>
             <v6LangP>0</v6LangP>
+            <vShortEn>1</vShortEn>
+            <vShortWch>1</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F103xB</Define>
@@ -382,6 +348,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>

MDK-ARM/RTE/_QD007A_CTL_APP/RTE_Components.h

@@ -1,6 +1,6 @@
 
 /*
- * Auto generated Run-Time-Environment Configuration File
+ * Auto generated Run-Time-Environment Component Configuration File
  *      *** Do not modify ! ***
  *
  * Project: 'QD007A_CTL_APP' 
@@ -17,5 +17,4 @@
 #define CMSIS_device_header "stm32f10x.h"
 
 
-
 #endif /* RTE_COMPONENTS_H */

MDK-ARM/startup_stm32f103xb.lst

@@ -524,12 +524,12 @@ ork --depend=.\qd007a_ctl_app\startup_stm32f103xb.d -o.\qd007a_ctl_app\startup_
 ARM Macro Assembler    Page 9 
 
 
-stm32f103xb.o -ID:\SoftDesign\20190311_QD007A_CTL\TT-KZ-010A_CTRL_APP\TT-KZ-010
-A_CTRL_APP\MDK-ARM\RTE -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\4.4.0\CMSIS\Include -IC:
-\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --predefine="__MICROL
-IB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine="_RTE_ SETA 1" 
---predefine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.lst startup_stm32f
-103xb.s
+stm32f103xb.o -ID:\MOTINOVAϵͳ\Motor\TT_KZ_010A\TC013041ÃÀÂÖ¶¨ÖƳÌÐò\TT-KZ-010
+A_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.0\CM
+SIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --pre
+define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 522" --predefine
+="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=startup_stm32f103xb.ls
+t startup_stm32f103xb.s
 
 
 

MDK-ARM/stm32f1xx_stucpuregsaddressing.lst

@@ -123,19 +123,19 @@ ARM Macro Assembler    Page 2
    99 00000096                 END
 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\4.
-4.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include
- --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --pre
-define="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpu
+pp\stm32f1xx_stucpuregsaddressing.o -ID:\MOTINOVAϵͳ\Motor\TT_KZ_010A\TC013041
+ÃÀÂÖ¶¨ÖƳÌÐò\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\P
+ACK\ARM\CMSIS\5.0.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.
+0\Device\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION
+ SETA 522" --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=
 
 
 
 ARM Macro Assembler    Page 3 
 
 
-regsaddressing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuRegsAddressing.
-s
+stm32f1xx_stucpuregsaddressing.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCp
+uRegsAddressing.s
 
 
 

MDK-ARM/stm32f1xx_stucpuwalkpatkeil.lst

@@ -1593,12 +1593,13 @@ ARM Macro Assembler    Page 25
  1172 000006D0                 END
 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\4.4.0\CM
-SIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --pre
-define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine
-="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_stucpuwalkpa
-tkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatKEIL.s
+stm32f1xx_stucpuwalkpatkeil.o -ID:\MOTINOVAϵͳ\Motor\TT_KZ_010A\TC013041ÃÀÂÖ¶¨
+ÖƳÌÐò\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\AR
+M\CMSIS\5.0.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Devi
+ce\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 
+522" --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f
+1xx_stucpuwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STUCpuWalkpatK
+EIL.s
 
 
 

MDK-ARM/stm32f1xx_sturamwalkpatkeil.lst

@@ -430,12 +430,13 @@ ARM Macro Assembler    Page 7
   331 000001F2                 END
 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\4.4.0\CM
-SIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Device\Include --pre
-define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 515" --predefine
-="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f1xx_sturamwalkpa
-tkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatKEIL.s
+stm32f1xx_sturamwalkpatkeil.o -ID:\MOTINOVAϵͳ\Motor\TT_KZ_010A\TC013041ÃÀÂÖ¶¨
+ÖƳÌÐò\TT-KZ-010A_CTRL_APP\MDK-ARM\RTE\_QD007A_CTL_APP -IC:\Keil_v5\ARM\PACK\AR
+M\CMSIS\5.0.0\CMSIS\Include -IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\1.1.0\Devi
+ce\Include --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 
+522" --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --list=stm32f
+1xx_sturamwalkpatkeil.lst ..\SelfTestUser\src_specific\stm32f1xx_STURamWalkpatK
+EIL.s
 
 
 

User/Src/can_process.c

@@ -151,7 +151,8 @@ void DataProcess(uint16_t ID, uint8_t Mode, uint16_t Cmd, uint8_t* Data)
 				{
 				  if(MC_WorkMode == MC_WorkMode_Run)
 					{
-					  memcpy(&MC_ControlCode.GearSt, Data, DataLength);
+//					  memcpy(&MC_ControlCode.GearSt, Data, DataLength);
+						MC_ControlCode.GearSt = Data[0];
 					  Update_MC_ControlCode_Back();
 					}			
 		      MC_RunInfo.GearSt = MC_ControlCode.GearSt;//µ±Ç°ÖúÁ¦µµÎ»¸üÐÂ

User/Src/var.c

@@ -226,10 +226,10 @@ const nGearParam_Struct_t GearParam_Default_SMART_Volans =
   (uint16_t)1000,
 	(uint16_t)2000,
 	(uint16_t)100,
-	(uint16_t)1400,  //800,
-	(uint8_t)4, //1,
-	(uint8_t)2,  //1,
-	(uint16_t)1024  //250
+	(uint16_t)1260,  //800,
+	(uint8_t)2, //1,
+	(uint8_t)1,  //1,
+	(uint16_t)870  //250
 };
 
 
@@ -492,8 +492,8 @@ void Var_Init(void)
 		
 	//MC版本信息初始化，Mode和SN从EEPROM读取
   strncpy(MC_VerInfo.HW_Version, (char*)"TT_KZ_010D.   ", 16);
-	strncpy(MC_VerInfo.FW_Version, (char*)"V4r0r6_20210818.", 16);
-	strncpy(Firmware_Special, (char*)"TC013041-BM2102-V0r2.           ", 32);
+	strncpy(MC_VerInfo.FW_Version, (char*)"V4r0r7_20211217.", 16);
+	strncpy(Firmware_Special, (char*)"TC013041-BM2102-V0r3.           ", 32);
 	
 	//电机型号
 	strncpy(MC_VerInfo.Mode, (char*)"VL6500J01.      ", 16);