Upd merge history

http://antwrp.gsfc.nasa.gov/apod/image/0012/halebopp_gleason.jpg

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

MC Rev 100 to Rev 200 updates

DY changed

• ap_header.c +CB - ignore DY changes
• io_adc.c +CB - xref_m changes - make conditional, remove setting of bug bits

• io_chan.h - make a rev 100 and rev 200
• io_dig.c +CB - make a rev 100 and rev 200 (ignore CB in 200)
• io_dig.h - make a rev 100 and rev 200
• io_mot.c +CB - make conditional and support both hardware

• tarmap.h - make a rev 100 and rev 200
• tarerror.h +CB - merge changes (include both additions)

• tk_cmdset.c +CB - ignore DY changes, he had problem with special cmd 1108
• tk_rttimer.c - make changes conditional

• svn/svgen.s +CB - DY used CB's macro to switch PDC2 and PDC3; make a rev 100 and rev 200

action

• io_adc.c - merged DY changes

• io_chan.h - made Rev 100, 200 - added conditional compilation
• io_dig.c - made Rev 100, 200 - added conditional compilation
• io_dig.h - made Rev 100, 200 - added conditional compilation
• io_mot.c - added conditional for macro PWM1CON

• tarmap.h - made Rev 100, 200 - added conditional compilation
• tarerror.h - merged DY code to latest

• tk_rttimer.c - made conditional the debug bits