X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstmf0%2Fao_adc_stm.c;h=d48726a1c66ad13761ce8b32ff8f1fadbb87f7a0;hp=571830bbe93dfe52fe3d3072d1eb94b4f6b75868;hb=80affca535c5c43a5d9963dfafc74f9675c9b155;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830

diff --git a/src/stmf0/ao_adc_stm.c b/src/stmf0/ao_adc_stm.c
index 571830bb..d48726a1 100644
--- a/src/stmf0/ao_adc_stm.c
+++ b/src/stmf0/ao_adc_stm.c
@@ -38,23 +38,7 @@ static void ao_adc_done(int index)
 
 	AO_DATA_PRESENT(AO_DATA_ADC);
 	ao_dma_done_transfer(STM_DMA_INDEX(STM_DMA_CHANNEL_ADC_1));
-	if (ao_data_present == AO_DATA_ALL) {
-#if HAS_MS5607
-		ao_data_ring[ao_data_head].ms5607_raw = ao_ms5607_current;
-#endif
-#if HAS_MMA655X
-		ao_data_ring[ao_data_head].mma655x = ao_mma655x_current;
-#endif
-#if HAS_HMC5883
-		ao_data_ring[ao_data_head].hmc5883 = ao_hmc5883_current;
-#endif
-#if HAS_MPU6000
-		ao_data_ring[ao_data_head].mpu6000 = ao_mpu6000_current;
-#endif
-		ao_data_ring[ao_data_head].tick = ao_tick_count;
-		ao_data_head = ao_data_ring_next(ao_data_head);
-		ao_wakeup((void *) &ao_data_head);
-	}
+	ao_data_fill(ao_data_head);
 	ao_adc_ready = 1;
 }
 
@@ -103,10 +87,9 @@ ao_adc_one(void)
 	int		ch;
 	uint16_t	value;
 
-	ao_cmd_decimal();
+	ch = ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	ch = ao_cmd_lex_i;
 	if (ch < 0 || AO_NUM_ADC <= ch) {
 		ao_cmd_status = ao_cmd_syntax_error;
 		return;