Merge branch 'master' of http://192.168.1.74/MotorController/QD007E_CTRL_APP

# Conflicts:
#	J-scope.jscope
#	MDK-ARM/JLinkLog.txt
#	MDK-ARM/bin/QD007A_CTL_APP.bin
#	User/Src/cadence_sensor.c
#	User/Src/motor_control.c
#	User/Src/var.c
#	修改说明.txt

J-scope.jscope

@@ -10,7 +10,7 @@
             <DataFile Name="" />
             <RawFile Name="" />
             <Scope>
-                <Options TimeResolutionUs="2000000" />
+                <Options TimeResolutionUs="500000" />
             </Scope>
         </Configuration>
         <Windows>
@@ -19,6 +19,7 @@
         </Windows>
         <SelectedSymbols>
             <Symbol>
+<<<<<<< HEAD
                 <Options Name="K_ByVoltage_Old" Address="0x2000011A" Type="ushort" TypeID="7" Size="2" GraphColorRed="255" GraphColorGreen="215" GraphColorBlue="0" YMinSampled="0" YMaxSampled="65535" YAvgSampled="943" Offset="4" ShowInGraph="1" YOffset="200" IsAutoConfig="0" YResolution="500" MaxValue="100000" File="..\User\Src\motor_control.c" Scope="1" DrawStyle="0" />
             </Symbol>
             <Symbol>
@@ -29,6 +30,21 @@
             </Symbol>
             <Symbol>
                 <Options Name="BusVoltage" Address="0x200006D2" Type="ushort" TypeID="7" Size="2" GraphColorRed="160" GraphColorGreen="32" GraphColorBlue="240" YMinSampled="0" YMaxSampled="65535" YAvgSampled="32946" Offset="10" ShowInGraph="1" YOffset="200" IsAutoConfig="1" YResolution="20000" MaxValue="116800" File="..\User\Src\var.c" Scope="0" DrawStyle="0" />
+=======
+                <Options Name="MotorSpeedSetBigin" Address="0x200000C8" Type="uint" TypeID="8" Size="4" GraphColorRed="255" GraphColorGreen="215" GraphColorBlue="0" YMinSampled="0" YMaxSampled="5760" YAvgSampled="264" Offset="4" ShowInGraph="1" YOffset="200" IsAutoConfig="0" YResolution="5000" MaxValue="11680" File="..\User\Src\motor_control.c" Scope="0" DrawStyle="0" />
+            </Symbol>
+            <Symbol>
+                <Options Name="MotorSpeed" Address="0x200006CE" Type="short" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="255" GraphColorBlue="0" YMinSampled="0" YMaxSampled="1042" YAvgSampled="67" Offset="8" ShowInGraph="1" YOffset="200" IsAutoConfig="0" YResolution="200" MaxValue="400" File="..\User\Src\var.c" Scope="0" DrawStyle="0" />
+            </Symbol>
+            <Symbol>
+                <Options Name="Ref_Speed" Address="0x200000AE" Type="short" TypeID="11" Size="2" GraphColorRed="0" GraphColorGreen="0" GraphColorBlue="176" YMinSampled="-1050" YMaxSampled="493" YAvgSampled="-47" Offset="10" ShowInGraph="1" YOffset="200" IsAutoConfig="0" YResolution="1000" MaxValue="200" File="..\User\Src\motor_control.c" Scope="0" DrawStyle="0" />
+            </Symbol>
+            <Symbol>
+                <Options Name="PeriodTest" Address="0x2000034C" Type="ushort" TypeID="7" Size="2" GraphColorRed="160" GraphColorGreen="32" GraphColorBlue="240" YMinSampled="0" YMaxSampled="299" YAvgSampled="149" Offset="12" ShowInGraph="0" YOffset="200" IsAutoConfig="1" YResolution="100" MaxValue="584" File="..\User\Src\tim.c" Scope="1" DrawStyle="0" />
+            </Symbol>
+            <Symbol>
+                <Options Name="qV_Component1" Address="0x20000020" Type="short" TypeID="11" Size="2" GraphColorRed="255" GraphColorGreen="0" GraphColorBlue="0" YMinSampled="-7086" YMaxSampled="31128" YAvgSampled="1373" Offset="14" ShowInGraph="1" YOffset="200" IsAutoConfig="1" YResolution="20000" MaxValue="40000" File="..\User\Src\MC_Globals.c" Scope="0" DrawStyle="0" />
+>>>>>>> 60d6fc0f4e3a7ba232241d84a8fb9a3a96d164b7
             </Symbol>
         </SelectedSymbols>
     </Project>

MDK-ARM/JLinkLog.txt

@@ -1,4 +1,5 @@
 
+<<<<<<< HEAD
 T6E38 000:071 SEGGER J-Link V4.98e Log File (0001ms, 0045ms total)
 T6E38 000:071 DLL Compiled: May  5 2015 11:00:52 (0001ms, 0045ms total)
 T6E38 000:071 Logging started @ 2019-11-08 18:59 (0001ms, 0045ms total)
@@ -8059,3 +8060,38 @@ T6E38 011:548 JLINK_Go() -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4
 T6E38 011:569 JLINK_Close() -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002008) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000200C) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002010) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002014) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE0002018) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000201C) (0011ms, 4172ms total)
 T6E38 011:569  (0011ms, 4172ms total)
 T6E38 011:569 Closed (0011ms, 4172ms total)
+=======
+T1900 000:486 SEGGER J-Link V4.98e Log File (0001ms, 0308ms total)
+T1900 000:486 DLL Compiled: May  5 2015 11:00:52 (0001ms, 0308ms total)
+T1900 000:486 Logging started @ 2019-11-06 15:49 (0001ms, 0308ms total)
+T1900 000:487 JLINK_SetWarnOutHandler(...) (0000ms, 0308ms total)
+T1900 000:487 JLINK_OpenEx(...)
+Firmware: J-Link V9 compiled Jul 19 2017 16:11:45
+Hardware: V9.40
+S/N: 59404398
+Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash  returns O.K. (0291ms, 0599ms total)
+T1900 000:778 JLINK_SetErrorOutHandler(...) (0000ms, 0599ms total)
+T1900 000:778 JLINK_ExecCommand("ProjectFile = "D:\SoftDesign\20190311_QD007A_CTL\QD007E_CTRL_APP\QD007E_CTRL_APP\MDK-ARM\JLinkSettings.ini"", ...)  returns 0x00 (0003ms, 0602ms total)
+T1900 000:781 JLINK_ExecCommand("Device = STM32F103RB", ...)Device "STM32F103RB" selected.  returns 0x00 (0001ms, 0603ms total)
+T1900 000:782 JLINK_ExecCommand("DisableConnectionTimeout", ...)  returns 0x01 (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetHardwareVersion()  returns 0x16F30 (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetDLLVersion()  returns 49805 (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetFirmwareString(...) (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetDLLVersion()  returns 49805 (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetCompileDateTime() (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetFirmwareString(...) (0000ms, 0603ms total)
+T1900 000:782 JLINK_GetHardwareVersion()  returns 0x16F30 (0000ms, 0603ms total)
+T1900 000:782 JLINK_TIF_Select(JLINKARM_TIF_SWD)  returns 0x00 (0004ms, 0607ms total)
+T1900 000:786 JLINK_SetSpeed(5000) (0001ms, 0608ms total)
+T1900 000:788 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)  returns JLINKARM_RESET_TYPE_NORMAL (0000ms, 0608ms total)
+T1900 000:788 JLINK_Reset() >0x108 TIF>Found SWD-DP with ID 0x0BB11477 >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x108 TIF>Found SWD-DP with ID 0x0BB11477 >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF>
+ >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> >0x0D TIF> >0x21 TIF>Found Cortex-M0 r0p0, Little endian.Identified core does not match configuration. (Found: Cortex-M0, Configured: Cortex-M3) -- CPU_WriteMem(4 bytes @ 0xE0002000)
+ -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU_WriteMem(4 bytes @ 0xE000EDF0) -- CPU_ReadMem(4 bytes @ 0xE0002000)FPUnit: 4 code (BP) slots and 0 literal slots -- CPU_ReadMem(4 bytes @ 0xE000EDFC) -- CPU_WriteMem(4 bytes @ 0xE000EDFC) -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001000)CoreSight components:ROMTbl 0 @ E00FF000 -- CPU_ReadMem(16 bytes @ 0xE00FF000) -- CPU_ReadMem(16 bytes @ 0xE000EFF0) -- CPU_ReadMem(16 bytes @ 0xE000EFE0)
+ROMTbl 0 [0]: FFF0F000, CID: B105E00D, PID: 000BB008 SCS -- CPU_ReadMem(16 bytes @ 0xE0001FF0) -- CPU_ReadMem(16 bytes @ 0xE0001FE0)ROMTbl 0 [1]: FFF02000, CID: B105E00D, PID: 000BB00A DWT -- CPU_ReadMem(16 bytes @ 0xE0002FF0) -- CPU_ReadMem(16 bytes @ 0xE0002FE0)ROMTbl 0 [2]: FFF03000, CID: B105E00D, PID: 000BB00B FPB -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDFC) >0x35 TIF> -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000ED0C)
+ -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDF0) -- CPU is running -- CPU_WriteMem(4 bytes @ 0xE000EDFC) -- CPU is running -- CPU_ReadMem(4 bytes @ 0xE000EDF0) -- CPU_WriteMem(4 bytes @ 0xE0002000) -- CPU_ReadMem(4 bytes @ 0xE000EDFC) -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001000) (0114ms, 0722ms total)
+T1900 000:902 JLINK_GetId() >0x0D TIF> >0x21 TIF>  returns 0x0BB11477 (0002ms, 0724ms total)
+T1900 000:907 JLINK_GetFirmwareString(...) (0000ms, 0724ms total)
+T1900 002:599 JLINK_Close() -- CPU_ReadMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001000) -- CPU_WriteMem(4 bytes @ 0xE0001004) >0x42 TIF> >0x28 TIF> >0x0D TIF> >0x21 TIF> (0011ms, 0735ms total)
+T1900 002:599  (0011ms, 0735ms total)
+T1900 002:599 Closed (0011ms, 0735ms total)
+>>>>>>> 60d6fc0f4e3a7ba232241d84a8fb9a3a96d164b7