V25.00
test Dma modbus ok
Dma change
Merge branch 'testDMA'

Conflicts:
	.cproject
	.settings/language.settings.xml
	main.cpp
	source/Averaging.cpp
	source/clAlarm.cpp
	source/cl_Adc.cpp
	source/cl_Adc.h
	source/cl_FrRms.cpp
	source/cl_Min.cpp
	source/cl_Min.h
	source/global.cpp
	source/stm32f4xx_it.cpp