edit pwm adc
Merge branch 'master' of https://github.com/linqing51/stm32f4_lamp_power

Conflicts:
	bsp/stm32f40x/project.uvguix.linqing
	bsp/stm32f40x/project.uvoptx