copy 2 projects to my project, one is PWM, the other one is Examples\ADC

[Linda]

Posted on June 18, 2014 at 21:18

I copy 2 projects into mine, one is PWM, the other one is Examples\ADC\ADC_RegularConversion_DMA.  Both of them work perfectly separately

before, but after copied, only one can work.

I

guess it might because  some functions occurs 3 times, 1 in the Main(), 1 in PWM, 1 in ADC, like:  HAL_Init(); SystemClock_Config(); BSP_LED_Init(LED3);

I delete some, but the program still doesn’t work.

Please help.

Thanks

[Tesla DeLorean]

Posted on June 18, 2014 at 21:55

Try using a Merge tool, and understand the differences in the projects, figure out the parts you need to take from each, and what you have to integrate.

[Linda]

Posted on June 18, 2014 at 22:49

what Merge tool I can use?

Thanks

[Tesla DeLorean]

Posted on June 18, 2014 at 23:24

http://winmerge.org/

http://www.araxis.com/merge/index.en