Revision as of 01:49, 22 February 2009

merge of PEDANT Rev 521 to 437

• source1: svn://pedant/PowerFoot/branches/dyoung/StateControl-dev : 521
• source2: svn://pedant/PowerFoot/branches/cbarn/StateControl : 547
• destination :

actions

• take all of S1:tarerror.h
• take all of S1:tarmap.h
• take all of S1:tk_rttimer.c
• TA S1:io_spi.c, io_spi.h
• TA S1:io_dig.c, io_dig.h
• TA S1:io_chan.h

files that will remain different

• tk_cmdset.c
• io_adc.c
• ap_header.h
• ap_header.c (ignore DY changes)

= files that we both changed

• 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