git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8596 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
77a131bafd
commit
5c2d8efab3
|
@ -468,13 +468,13 @@ void adc_lld_init(void) {
|
|||
#if defined(STM32F3XX)
|
||||
#if STM32_ADC_USE_ADC1 || STM32_ADC_USE_ADC2
|
||||
rccEnableADC12(FALSE);
|
||||
osalSysPolledDelayX(12);
|
||||
// osalSysPolledDelayX(12);
|
||||
ADC1_2_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
rccDisableADC12(FALSE);
|
||||
#endif
|
||||
#if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4
|
||||
rccEnableADC34(FALSE);
|
||||
osalSysPolledDelayX(12);
|
||||
// osalSysPolledDelayX(12);
|
||||
ADC3_4_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
rccDisableADC34(FALSE);
|
||||
#endif
|
||||
|
@ -482,7 +482,7 @@ void adc_lld_init(void) {
|
|||
|
||||
#if defined(STM32L4XX)
|
||||
rccEnableADC123(FALSE);
|
||||
osalSysPolledDelayX(12);
|
||||
// osalSysPolledDelayX(12);
|
||||
ADC123_COMMON->CCR = STM32_ADC_ADC123_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
rccDisableADC123(FALSE);
|
||||
#endif
|
||||
|
|
|
@ -494,8 +494,6 @@
|
|||
/* Port-specific settings (override port settings defaulted in chcore.h). */
|
||||
/*===========================================================================*/
|
||||
|
||||
#define CORTEX_VTOR_INIT 0x00200000U
|
||||
|
||||
#endif /* _CHCONF_H_ */
|
||||
|
||||
/** @} */
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="0"/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?><contentList><content id="r3-(format)" val="4"/><content id="vt_delta-null-chVTDoSetI-(format)" val="4"/></contentList>"/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?><contentList><content id="r0-(format)" val="4"/><content id="r1-(format)" val="4"/><content id="r11-(format)" val="4"/><content id="r3-(format)" val="4"/><content id="r2-(format)" val="4"/><content id="vt_delta-null-chVTDoSetI-(format)" val="4"/></contentList>"/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <globalVariableList/> "/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList> <memoryBlockExpressionItem> <expression text="0x20010744"/> </memoryBlockExpressionItem> </memoryBlockExpressionList> "/>
|
||||
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
|
||||
|
|
|
@ -159,12 +159,6 @@ int main(void) {
|
|||
*/
|
||||
gptStart(&GPTD4, &gpt4cfg1);
|
||||
|
||||
/*
|
||||
* Fixed an errata on the STM32F7xx, the DAC clock is required for ADC
|
||||
* triggering.
|
||||
*/
|
||||
rccEnableDAC1(false);
|
||||
|
||||
/*
|
||||
* Activates the ADC1 driver and the temperature sensor.
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue