Commite4b1121

committed

[ADC] Able to build without HAL module

Note: no size changeSigned-off-by: Frederic Pillon <frederic.pillon@st.com>

1 parent0753358 commite4b1121Copy full SHA for e4b1121

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,13 @@`
`44`	`44`	`extern"C" {`
`45`	`45`	`#endif`
`46`	`46`
	`47`	`+`
	`48`	`+/* Private_Variables */`
	`49`	`+staticPinNameg_current_pin=NC;`
	`50`	`+`
`47`	`51`	`/* Private_Defines */`
	`52`	`+#ifdefHAL_ADC_MODULE_ENABLED`
	`53`	`+`
`48`	`54`	`#if defined(ADC_SAMPLETIME_8CYCLES_5)`
`49`	`55`	`#defineSAMPLINGTIME ADC_SAMPLETIME_8CYCLES_5;`
`50`	`56`	`#elif defined(ADC_SAMPLETIME_12CYCLES_5)`
`@@ -79,9 +85,6 @@ extern "C" {`
`79`	`85`	`#defineADC_REGULAR_RANK_1 1`
`80`	`86`	`#endif`
`81`	`87`
`82`		`-/* Private_Variables */`
`83`		`-staticPinNameg_current_pin=NC;`
`84`		`-`
`85`	`88`	`/* Private Functions */`
`86`	`89`	`staticuint32_tget_adc_channel(PinNamepin)`
`87`	`90`	`{`
`@@ -155,6 +158,7 @@ static uint32_t get_adc_channel(PinName pin)`
`155`	`158`	`}`
`156`	`159`	`returnchannel;`
`157`	`160`	`}`
	`161`	`+#endif/* HAL_ADC_MODULE_ENABLED */`
`158`	`162`
`159`	`163`	`staticuint32_tget_pwm_channel(PinNamepin)`
`160`	`164`	`{`
`@@ -337,7 +341,7 @@ void dac_stop(PinName pin)`
`337`	`341`	`}`
`338`	`342`	`#endif//HAL_DAC_MODULE_ENABLED`
`339`	`343`
`340`		`-`
	`344`	`+#ifdefHAL_ADC_MODULE_ENABLED`
`341`	`345`	`////////////////////////// ADC INTERFACE FUNCTIONS /////////////////////////////`
`342`	`346`
`343`	`347`	`/**`
`@@ -641,6 +645,7 @@ uint16_t adc_read_value(PinName pin)`
`641`	`645`
`642`	`646`	`returnuhADCxConvertedValue;`
`643`	`647`	`}`
	`648`	`+#endif/* HAL_ADC_MODULE_ENABLED */`
`644`	`649`
`645`	`650`	`////////////////////////// PWM INTERFACE FUNCTIONS /////////////////////////////`
`646`	`651`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,11 @@`
`20`	`20`	`/*`
`21`	`21`	`* Defined by default`
`22`	`22`	`*/`
	`23`	`+#if !defined(HAL_ADC_MODULE_DISABLED)`
`23`	`24`	`#defineHAL_ADC_MODULE_ENABLED`
	`25`	`+#else`
	`26`	`+#undef HAL_ADC_MODULE_ENABLED`
	`27`	`+#endif`
`24`	`28`
`25`	`29`	`#if !defined(HAL_I2C_MODULE_DISABLED)`
`26`	`30`	`#defineHAL_I2C_MODULE_ENABLED`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,15 @@ static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)`
`64`	`64`	`uint32_tanalogRead(uint32_tulPin)`
`65`	`65`	`{`
`66`	`66`	`uint32_tvalue=0;`
	`67`	`+#ifdefHAL_ADC_MODULE_ENABLED`
`67`	`68`	`PinNamep=analogInputToPinName(ulPin);`
`68`	`69`	`if (p!=NC) {`
`69`	`70`	`value=adc_read_value(p);`
`70`	`71`	`value=mapResolution(value,ADC_RESOLUTION,_readResolution);`
`71`	`72`	`}`
	`73`	`+#else`
	`74`	`+UNUSED(ulPin);`
	`75`	`+#endif`
`72`	`76`	`returnvalue;`
`73`	`77`	`}`
`74`	`78`

Comments

(0)