X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_adc_stm.c;h=7564c7fa9a0a810e466b0ce5418e0d27b800f53c;hb=8fc643c9768f0db31a248331681af9490f5715af;hp=71299de93c7a4a77814ea843477117d173f1dad6;hpb=9aa7993ee31bdfd6890ad7262a0375c07464ee76;p=fw%2Faltos

diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c
index 71299de9..7564c7fa 100644
--- a/src/stm/ao_adc_stm.c
+++ b/src/stm/ao_adc_stm.c
@@ -60,7 +60,7 @@ static void ao_adc_done(int index)
 #if HAS_MS5607
 	if (!ao_ms5607_valid)
 		step = 0;
-	ao_data_ring[ao_data_head].ms5607 = ao_ms5607_current;
+	ao_data_ring[ao_data_head].ms5607_raw = ao_ms5607_current;
 #endif	
 #if HAS_HMC5883
 	if (!ao_hmc5883_valid)
@@ -156,43 +156,43 @@ ao_adc_init(void)
 #endif
 
 #ifdef AO_ADC_PIN0_PORT
-	stm_moder_set(&AO_ADC_PIN0_PORT, AO_ADC_PIN0_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN0_PORT, AO_ADC_PIN0_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN1_PORT
-	stm_moder_set(&AO_ADC_PIN1_PORT, AO_ADC_PIN1_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN1_PORT, AO_ADC_PIN1_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN2_PORT
-	stm_moder_set(&AO_ADC_PIN2_PORT, AO_ADC_PIN2_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN2_PORT, AO_ADC_PIN2_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN3_PORT
-	stm_moder_set(&AO_ADC_PIN3_PORT, AO_ADC_PIN3_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN3_PORT, AO_ADC_PIN3_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN4_PORT
-	stm_moder_set(&AO_ADC_PIN4_PORT, AO_ADC_PIN4_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN4_PORT, AO_ADC_PIN4_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN5_PORT
-	stm_moder_set(&AO_ADC_PIN5_PORT, AO_ADC_PIN5_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN5_PORT, AO_ADC_PIN5_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN6_PORT
-	stm_moder_set(&AO_ADC_PIN6_PORT, AO_ADC_PIN6_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN6_PORT, AO_ADC_PIN6_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN7_PORT
-	stm_moder_set(&AO_ADC_PIN7_PORT, AO_ADC_PIN7_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN7_PORT, AO_ADC_PIN7_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN8_PORT
-	stm_moder_set(&AO_ADC_PIN8_PORT, AO_ADC_PIN8_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN8_PORT, AO_ADC_PIN8_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN9_PORT
-	stm_moder_set(&AO_ADC_PIN9_PORT, AO_ADC_PIN9_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN9_PORT, AO_ADC_PIN9_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN10_PORT
-	stm_moder_set(&AO_ADC_PIN10_PORT, AO_ADC_PIN10_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN10_PORT, AO_ADC_PIN10_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN11_PORT
-	stm_moder_set(&AO_ADC_PIN11_PORT, AO_ADC_PIN11_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN11_PORT, AO_ADC_PIN11_PIN, STM_MODER_ANALOG);
 #endif
 #ifdef AO_ADC_PIN12_PORT
-	stm_moder_set(&AO_ADC_PIN12_PORT, AO_ADC_PIN12_PIN, STM_MODER_ANALOG);
+	stm_moder_set(AO_ADC_PIN12_PORT, AO_ADC_PIN12_PIN, STM_MODER_ANALOG);
 #endif
 
 	stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_ADC1EN);
@@ -281,8 +281,10 @@ ao_adc_init(void)
 #endif
 	/* Clear any stale status bits */
 	stm_adc.sr = 0;
-	ao_adc_ready = 1;
 
 	ao_dma_alloc(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC1));
+
 	ao_cmd_register(&ao_adc_cmds[0]);
+
+	ao_adc_ready = 1;
 }