Version 2 can send force data and joint ad dat to pc104

Changes to be committed: modified: Debug/Exe/QYProject.out modified: Debug/Obj/ADC.o modified: Debug/Obj/ADC.pbi modified: Debug/Obj/ADC.pbi.cout modified: Debug/Obj/ADCF.o modified: Debug/Obj/ADCF.pbi modified: Debug/Obj/ADCF.pbi.cout modified: Debug/Obj/Angle_PID.o modified: Debug/Obj/Angle_PID.pbi modified: Debug/Obj/Angle_PID.pbi.cout modified: Debug/Obj/CAN.o modified: Debug/Obj/CAN.pbi modified: Debug/Obj/CAN.pbi.cout modified: Debug/Obj/GPIO.o modified: Debug/Obj/GPIO.pbi modified: Debug/Obj/GPIO.pbi.cout modified: Debug/Obj/Interrupt.o modified: Debug/Obj/Interrupt.pbi modified: Debug/Obj/Interrupt.pbi.cout modified: Debug/Obj/PIT.o modified: Debug/Obj/PIT.pbi modified: Debug/Obj/PIT.pbi.cout modified: Debug/Obj/PWM.o modified: Debug/Obj/PWM.pbi modified: Debug/Obj/PWM.pbi.cout modified: Debug/Obj/QYProject.pbd modified: Debug/Obj/QYProject.pbd.browse modified: Debug/Obj/SPI.o modified: Debug/Obj/SPI.pbi modified: Debug/Obj/SPI.pbi.cout modified: Debug/Obj/System_Init.o modified: Debug/Obj/System_Init.pbi modified: Debug/Obj/System_Init.pbi.cout modified: Debug/Obj/UART.o modified: Debug/Obj/UART.pbi modified: Debug/Obj/UART.pbi.cout modified: Debug/Obj/Vector.o modified: Debug/Obj/Vector.pbi modified: Debug/Obj/Vector.pbi.cout modified: Debug/Obj/main.o modified: Debug/Obj/main.pbi modified: Debug/Obj/main.pbi.cout modified: Library/Drivers/CAN/CAN.c modified: MyFunction/ADCF.c modified: MyFunction/ADCF.h modified: MyFunction/Angle_PID.c modified: MyFunction/Interrupt.c modified: MyFunction/Interrupt.h modified: MyFunction/Macro.h modified: MyFunction/System_Init.c modified: MyFunction/main.c modified: QYProject.dep modified: settings/QYProject.dbgdt modified: settings/QYProject.dni modified: settings/QYProject.wsdt modified: settings/QYProject.wspos
sunzhon · Nov 20, 2016 · 58e588c · 58e588c
1 parent 119d34b
commit 58e588c
Show file tree

Hide file tree

Showing 56 changed files with 698 additions and 496 deletions.
diff --git a/Debug/Exe/QYProject.out b/Debug/Exe/QYProject.out
diff --git a/Debug/Obj/ADC.o b/Debug/Obj/ADC.o
diff --git a/Debug/Obj/ADC.pbi b/Debug/Obj/ADC.pbi
diff --git a/Debug/Obj/ADC.pbi.cout b/Debug/Obj/ADC.pbi.cout
@@ -1,46 +1,46 @@
-"E:\IAR\QY\Library\Drivers\ADC\ADC.c"
+"E:\IAR\DC-QY\QY\Library\Drivers\ADC\ADC.c"
 -std=c99
 -ferror-limit=100
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\c
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -D__CHAR_BITS__=8
 -D__CHAR_MAX__=0xff
 -D__CHAR_MIN__=0
@@ -224,8 +224,8 @@ E:\IAR\QY\MyFunction
 -D__HAS_LOCATED_DECLARATION__=1
 -D__HAS_LOCATED_WITH_INIT__=1
 -D__IAR_COMPILERBASE__=593666
--D__DATE__="Aug  1 2016"
--D__TIME__="16:17:22"
+-D__DATE__="Nov 18 2016"
+-D__TIME__="20:26:38"
 -D__STDC__=1
 -D__STDC_VERSION__=199901L
 -D__STDC_HOSTED__=1

diff --git a/Debug/Obj/ADCF.o b/Debug/Obj/ADCF.o
diff --git a/Debug/Obj/ADCF.pbi b/Debug/Obj/ADCF.pbi
diff --git a/Debug/Obj/ADCF.pbi.cout b/Debug/Obj/ADCF.pbi.cout
@@ -1,46 +1,46 @@
-"E:\IAR\QY\MyFunction\ADCF.c"
+"E:\IAR\DC-QY\QY\MyFunction\ADCF.c"
 -std=c99
 -ferror-limit=100
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\c
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -D__CHAR_BITS__=8
 -D__CHAR_MAX__=0xff
 -D__CHAR_MIN__=0
@@ -224,8 +224,8 @@ E:\IAR\QY\MyFunction
 -D__HAS_LOCATED_DECLARATION__=1
 -D__HAS_LOCATED_WITH_INIT__=1
 -D__IAR_COMPILERBASE__=593666
--D__DATE__="Aug  1 2016"
--D__TIME__="16:17:29"
+-D__DATE__="Nov 18 2016"
+-D__TIME__="20:26:44"
 -D__STDC__=1
 -D__STDC_VERSION__=199901L
 -D__STDC_HOSTED__=1

diff --git a/Debug/Obj/Angle_PID.o b/Debug/Obj/Angle_PID.o
diff --git a/Debug/Obj/Angle_PID.pbi b/Debug/Obj/Angle_PID.pbi
diff --git a/Debug/Obj/Angle_PID.pbi.cout b/Debug/Obj/Angle_PID.pbi.cout
@@ -1,46 +1,46 @@
-"E:\IAR\QY\MyFunction\Angle_PID.c"
+"E:\IAR\DC-QY\QY\MyFunction\Angle_PID.c"
 -std=c99
 -ferror-limit=100
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\c
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -D__CHAR_BITS__=8
 -D__CHAR_MAX__=0xff
 -D__CHAR_MIN__=0
@@ -224,8 +224,8 @@ E:\IAR\QY\MyFunction
 -D__HAS_LOCATED_DECLARATION__=1
 -D__HAS_LOCATED_WITH_INIT__=1
 -D__IAR_COMPILERBASE__=593666
--D__DATE__="Aug  1 2016"
--D__TIME__="16:17:27"
+-D__DATE__="Nov 18 2016"
+-D__TIME__="20:26:43"
 -D__STDC__=1
 -D__STDC_VERSION__=199901L
 -D__STDC_HOSTED__=1

diff --git a/Debug/Obj/CAN.o b/Debug/Obj/CAN.o
diff --git a/Debug/Obj/CAN.pbi b/Debug/Obj/CAN.pbi
diff --git a/Debug/Obj/CAN.pbi.cout b/Debug/Obj/CAN.pbi.cout
@@ -1,46 +1,46 @@
-"E:\IAR\QY\Library\Drivers\CAN\CAN.c"
+"E:\IAR\DC-QY\QY\Library\Drivers\CAN\CAN.c"
 -std=c99
 -ferror-limit=100
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\c
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -D__CHAR_BITS__=8
 -D__CHAR_MAX__=0xff
 -D__CHAR_MIN__=0
@@ -224,8 +224,8 @@ E:\IAR\QY\MyFunction
 -D__HAS_LOCATED_DECLARATION__=1
 -D__HAS_LOCATED_WITH_INIT__=1
 -D__IAR_COMPILERBASE__=593666
--D__DATE__="Aug  1 2016"
--D__TIME__="16:17:22"
+-D__DATE__="Nov 18 2016"
+-D__TIME__="20:26:38"
 -D__STDC__=1
 -D__STDC_VERSION__=199901L
 -D__STDC_HOSTED__=1

diff --git a/Debug/Obj/GPIO.o b/Debug/Obj/GPIO.o
diff --git a/Debug/Obj/GPIO.pbi b/Debug/Obj/GPIO.pbi
diff --git a/Debug/Obj/GPIO.pbi.cout b/Debug/Obj/GPIO.pbi.cout
@@ -1,46 +1,46 @@
-"E:\IAR\QY\Library\Drivers\GPIO\GPIO.c"
+"E:\IAR\DC-QY\QY\Library\Drivers\GPIO\GPIO.c"
 -std=c99
 -ferror-limit=100
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc
 -I
 D:\Program Files (x86)\IAR Systems\Embedded Workbench 7.0\arm\inc\c
 -I
-E:\IAR\QY\Library\CPU
+E:\IAR\DC-QY\QY\Library\CPU
 -I
-E:\IAR\QY\Library\Drivers\ADC
+E:\IAR\DC-QY\QY\Library\Drivers\ADC
 -I
-E:\IAR\QY\Library\Drivers\UART
+E:\IAR\DC-QY\QY\Library\Drivers\UART
 -I
-E:\IAR\QY\Library\Drivers\GPIO
+E:\IAR\DC-QY\QY\Library\Drivers\GPIO
 -I
-E:\IAR\QY\Library\Drivers\PIT
+E:\IAR\DC-QY\QY\Library\Drivers\PIT
 -I
-E:\IAR\QY\Library\Drivers\PWM
+E:\IAR\DC-QY\QY\Library\Drivers\PWM
 -I
-E:\IAR\QY\Library\Drivers\SPI
+E:\IAR\DC-QY\QY\Library\Drivers\SPI
 -I
-E:\IAR\QY\Library\Drivers\CAN
+E:\IAR\DC-QY\QY\Library\Drivers\CAN
 -I
-E:\IAR\QY\MyFunction
+E:\IAR\DC-QY\QY\MyFunction
 -D__CHAR_BITS__=8
 -D__CHAR_MAX__=0xff
 -D__CHAR_MIN__=0
@@ -224,8 +224,8 @@ E:\IAR\QY\MyFunction
 -D__HAS_LOCATED_DECLARATION__=1
 -D__HAS_LOCATED_WITH_INIT__=1
 -D__IAR_COMPILERBASE__=593666
--D__DATE__="Aug  1 2016"
--D__TIME__="16:17:23"
+-D__DATE__="Nov 18 2016"
+-D__TIME__="20:26:39"
 -D__STDC__=1
 -D__STDC_VERSION__=199901L
 -D__STDC_HOSTED__=1

diff --git a/Debug/Obj/Interrupt.o b/Debug/Obj/Interrupt.o
diff --git a/Debug/Obj/Interrupt.pbi b/Debug/Obj/Interrupt.pbi