Difference between revisions of "Upd merge history"
From DIDEAS Wiki
m |
m (→actions) |
||
| Line 6: | Line 6: | ||
==actions== | ==actions== | ||
| − | * take all of S1:tarerror.h | + | * take all of S1:tarerror.h - adds new items - nothing lost |
| − | * take all of S1:tarmap.h | + | * take all of S1:tarmap.h - need both a rev100 and rev200 |
| − | * take all of S1:tk_rttimer.c | + | * take all of S1:tk_rttimer.c - ecode remove from macro |
* TA S1:io_spi.c, io_spi.h | * TA S1:io_spi.c, io_spi.h | ||
* TA S1:io_dig.c, io_dig.h | * TA S1:io_dig.c, io_dig.h | ||
* TA S1:io_chan.h | * TA S1:io_chan.h | ||
| − | |||
== files that have forked == | == files that have forked == | ||
Revision as of 22:18, 22 February 2009
Contents
Rev 100 to Rev 200 hardware update SC merge DY:Rev 521 to CEB:Rev537
- source1: svn://pedant/PowerFoot/branches/dyoung/StateControl-dev : 521
- source2: svn://pedant/PowerFoot/branches/cbarn/StateControl : 547
- destination : svn://pedant/PowerFoot/branches/cbarn/StateControl : 566
actions
- take all of S1:tarerror.h - adds new items - nothing lost
- take all of S1:tarmap.h - need both a rev100 and rev200
- take all of S1:tk_rttimer.c - ecode remove from macro
- TA S1:io_spi.c, io_spi.h
- TA S1:io_dig.c, io_dig.h
- TA S1:io_chan.h
files that have forked
- ap_header.c, io_adc.c, tk_cmdset.c
ap_header.c
- ignore DY changes
io_adc.c
- 3 significant differences
- ADC channel maping change : apply lines 143, 150 to same
- 2 places where macros used to return ecodes
- lines 461-467
- lines 564-571
tk_cmdset.c=
- take S1:tk_cmdset.c lines 539-546 push into S2
files that will remain different
- tk_cmdset.c : changed by both - see above
- io_adc.c : changed by both -see above
- ap_header.c : changed by both, ignore DY changes
- ap_header.h : changed by CEB only
- hostcmds.h : changed by CEB only
- tk_fup.c : changed by CEB only
