Skip to content

Commit be679c9

Browse files
author
lin.jia
committed
Update chassis object dictionary and control logic; Push program to Dr.Zhong for combination test with Arm-Linux
1 parent 4458fdb commit be679c9

File tree

8 files changed

+722
-739
lines changed

8 files changed

+722
-739
lines changed

Diff for: ‎FreeRTOS-CANOpen-STM32F407/PROJ/Project.uvgui.Administrator

+33-25
Large diffs are not rendered by default.

Diff for: ‎FreeRTOS-CANOpen-STM32F407/PROJ/Project.uvopt

+10-107
Original file line numberDiff line numberDiff line change
@@ -140,104 +140,7 @@
140140
<Name>-U20090928 -O78 -S0 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000</Name>
141141
</SetRegEntry>
142142
</TargetDriverDllRegistry>
143-
<Breakpoint>
144-
<Bp>
145-
<Number>0</Number>
146-
<Type>0</Type>
147-
<LineNumber>544</LineNumber>
148-
<EnabledFlag>1</EnabledFlag>
149-
<Address>0</Address>
150-
<ByteObject>0</ByteObject>
151-
<HtxType>0</HtxType>
152-
<ManyObjects>0</ManyObjects>
153-
<SizeOfObject>0</SizeOfObject>
154-
<BreakByAccess>0</BreakByAccess>
155-
<BreakIfRCount>0</BreakIfRCount>
156-
<Filename>D:\Work\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
157-
<ExecCommand></ExecCommand>
158-
<Expression></Expression>
159-
</Bp>
160-
<Bp>
161-
<Number>1</Number>
162-
<Type>0</Type>
163-
<LineNumber>628</LineNumber>
164-
<EnabledFlag>1</EnabledFlag>
165-
<Address>0</Address>
166-
<ByteObject>0</ByteObject>
167-
<HtxType>0</HtxType>
168-
<ManyObjects>0</ManyObjects>
169-
<SizeOfObject>0</SizeOfObject>
170-
<BreakByAccess>0</BreakByAccess>
171-
<BreakIfRCount>0</BreakIfRCount>
172-
<Filename>D:\Work\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
173-
<ExecCommand></ExecCommand>
174-
<Expression></Expression>
175-
</Bp>
176-
<Bp>
177-
<Number>2</Number>
178-
<Type>0</Type>
179-
<LineNumber>544</LineNumber>
180-
<EnabledFlag>1</EnabledFlag>
181-
<Address>0</Address>
182-
<ByteObject>0</ByteObject>
183-
<HtxType>0</HtxType>
184-
<ManyObjects>0</ManyObjects>
185-
<SizeOfObject>0</SizeOfObject>
186-
<BreakByAccess>0</BreakByAccess>
187-
<BreakIfRCount>0</BreakIfRCount>
188-
<Filename>D:\WORK\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
189-
<ExecCommand></ExecCommand>
190-
<Expression></Expression>
191-
</Bp>
192-
<Bp>
193-
<Number>3</Number>
194-
<Type>0</Type>
195-
<LineNumber>549</LineNumber>
196-
<EnabledFlag>1</EnabledFlag>
197-
<Address>0</Address>
198-
<ByteObject>0</ByteObject>
199-
<HtxType>0</HtxType>
200-
<ManyObjects>0</ManyObjects>
201-
<SizeOfObject>0</SizeOfObject>
202-
<BreakByAccess>0</BreakByAccess>
203-
<BreakIfRCount>0</BreakIfRCount>
204-
<Filename>D:\WORK\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
205-
<ExecCommand></ExecCommand>
206-
<Expression></Expression>
207-
</Bp>
208-
<Bp>
209-
<Number>4</Number>
210-
<Type>0</Type>
211-
<LineNumber>628</LineNumber>
212-
<EnabledFlag>1</EnabledFlag>
213-
<Address>0</Address>
214-
<ByteObject>0</ByteObject>
215-
<HtxType>0</HtxType>
216-
<ManyObjects>0</ManyObjects>
217-
<SizeOfObject>0</SizeOfObject>
218-
<BreakByAccess>0</BreakByAccess>
219-
<BreakIfRCount>0</BreakIfRCount>
220-
<Filename>D:\WORK\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
221-
<ExecCommand></ExecCommand>
222-
<Expression></Expression>
223-
</Bp>
224-
<Bp>
225-
<Number>5</Number>
226-
<Type>0</Type>
227-
<LineNumber>633</LineNumber>
228-
<EnabledFlag>1</EnabledFlag>
229-
<Address>0</Address>
230-
<ByteObject>0</ByteObject>
231-
<HtxType>0</HtxType>
232-
<ManyObjects>0</ManyObjects>
233-
<SizeOfObject>0</SizeOfObject>
234-
<BreakByAccess>0</BreakByAccess>
235-
<BreakIfRCount>0</BreakIfRCount>
236-
<Filename>D:\WORK\RTOS\FreeRTOS-CANOpen-STM32F407\USER\src\chassis_control.c</Filename>
237-
<ExecCommand></ExecCommand>
238-
<Expression></Expression>
239-
</Bp>
240-
</Breakpoint>
143+
<Breakpoint/>
241144
<WatchWindow1>
242145
<Ww>
243146
<count>0</count>
@@ -514,10 +417,10 @@
514417
<FileType>1</FileType>
515418
<tvExp>0</tvExp>
516419
<Focus>0</Focus>
517-
<ColumnNumber>0</ColumnNumber>
420+
<ColumnNumber>64</ColumnNumber>
518421
<tvExpOptDlg>0</tvExpOptDlg>
519-
<TopLine>1</TopLine>
520-
<CurrentLine>1</CurrentLine>
422+
<TopLine>157</TopLine>
423+
<CurrentLine>150</CurrentLine>
521424
<bDave2>0</bDave2>
522425
<PathWithFileName>..\USER\src\chassis_control.c</PathWithFileName>
523426
<FilenameWithoutPath>chassis_control.c</FilenameWithoutPath>
@@ -530,7 +433,7 @@
530433
<Focus>0</Focus>
531434
<ColumnNumber>17</ColumnNumber>
532435
<tvExpOptDlg>0</tvExpOptDlg>
533-
<TopLine>199</TopLine>
436+
<TopLine>47</TopLine>
534437
<CurrentLine>186</CurrentLine>
535438
<bDave2>0</bDave2>
536439
<PathWithFileName>..\USER\src\sensor.c</PathWithFileName>
@@ -1436,7 +1339,7 @@
14361339

14371340
<Group>
14381341
<GroupName>Objdict</GroupName>
1439-
<tvExp>1</tvExp>
1342+
<tvExp>0</tvExp>
14401343
<tvExpOptDlg>0</tvExpOptDlg>
14411344
<cbSel>0</cbSel>
14421345
<File>
@@ -1445,10 +1348,10 @@
14451348
<FileType>1</FileType>
14461349
<tvExp>0</tvExp>
14471350
<Focus>0</Focus>
1448-
<ColumnNumber>81</ColumnNumber>
1351+
<ColumnNumber>27</ColumnNumber>
14491352
<tvExpOptDlg>0</tvExpOptDlg>
1450-
<TopLine>46</TopLine>
1451-
<CurrentLine>59</CurrentLine>
1353+
<TopLine>1</TopLine>
1354+
<CurrentLine>10</CurrentLine>
14521355
<bDave2>0</bDave2>
14531356
<PathWithFileName>..\UTILITIES\CanFestival-3\objdict\CHASSIS_OD.c</PathWithFileName>
14541357
<FilenameWithoutPath>CHASSIS_OD.c</FilenameWithoutPath>
@@ -1457,7 +1360,7 @@
14571360

14581361
<Group>
14591362
<GroupName>Doc</GroupName>
1460-
<tvExp>1</tvExp>
1363+
<tvExp>0</tvExp>
14611364
<tvExpOptDlg>0</tvExpOptDlg>
14621365
<cbSel>0</cbSel>
14631366
<File>

Diff for: ‎FreeRTOS-CANOpen-STM32F407/USER/inc/chassis_control.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
******************************************************************************
3-
* @file lifter_control.c
3+
* @file chassis_control.h
44
* @author Jim
55
* @version V1.0
66
* @date 01-Sep-2014
@@ -95,6 +95,7 @@ typedef struct struct_Chassis_Data Chassis_Data;
9595
struct struct_Chassis_Data {
9696
/* Drive Par */
9797
u8 motion_command; // the motion command of the chassis
98+
u8 direction;
9899

99100
s32 V_SET;
100101
s32 V_GET;

0 commit comments

Comments
 (0)