Switch to adc single

diff --git a/src/stm-demo-adc/Makefile b/src/stm-demo-adc/Makefile
index 869fb32fd4010d71a5c63135f643b7bdc51087a4..7870792e230bab4a1c955443bfd318154a288a7a 100644 (file)
--- a/src/stm-demo-adc/Makefile
+++ b/src/stm-demo-adc/Makefile
@@ -32,7 +32,7 @@ ALTOS_SRC = \
        ao_mutex.c \
        ao_dma_stm.c \
        ao_spi_stm.c \
-       ao_adc_stm.c \
+       ao_adc_single_stm.c \
        ao_data.c \
        ao_i2c_stm.c \
        ao_usb_stm.c \

diff --git a/src/stm-demo-adc/ao_demo.c b/src/stm-demo-adc/ao_demo.c
index fba42d8d125134ccd1459513afdeb18851cb6b62..75716c1c2f6f8d19eac55bb4db95ab1ca5569f47 100644 (file)
--- a/src/stm-demo-adc/ao_demo.c
+++ b/src/stm-demo-adc/ao_demo.c
@@ -22,6 +22,7 @@
 #include <ao_quadrature.h>
 #include <ao_button.h>
 #include <ao_boot.h>
+#include <ao_adc_single.h>
 
 struct ao_task demo_task;
 
@@ -138,19 +139,27 @@ ao_i2c_write(void) {
        }
 }
 
+
 static void
 ao_temp (void)
 {
-       struct ao_data  packet;
+       struct ao_adc   adc;
        int temp;
+#if HAS_ADC
+       struct ao_data  packet;
 
        ao_data_get(&packet);
+       adc = packet.adc;
+#endif
+#if HAS_ADC_SINGLE
+       ao_adc_single_get(&adc);
+#endif
 
        /*
         * r = (110 - 25) / (ts_cal_hot - ts_cal_cold)
         * 25 + (110 - 25) * (temp - ts_cal_cold) / (ts_cal_hot - ts_cal_cold)
         */
-       temp = 25 + (110 - 25) * (packet.adc.temp - stm_temp_cal.ts_cal_cold) / (stm_temp_cal.ts_cal_hot - stm_temp_cal.ts_cal_cold);
+       temp = 25 + (110 - 25) * (adc.temp - stm_temp_cal.ts_cal_cold) / (stm_temp_cal.ts_cal_hot - stm_temp_cal.ts_cal_cold);
        printf ("temp: %d\n", temp);
 }
 
@@ -231,7 +240,7 @@ main(void)
 
 //     ao_timer_set_adc_interval(100);
 
-       ao_adc_init();
+       ao_adc_single_init();
        ao_usb_init();
 
        ao_add_task(&ao_blink_task, ao_blink, "blink");

diff --git a/src/stm-demo-adc/ao_pins.h b/src/stm-demo-adc/ao_pins.h
index eb33aa703608575a9dee48c799156e8c8758d78e..428fcde99aab90d1aee3001da0de491bfed5841b 100644 (file)
--- a/src/stm-demo-adc/ao_pins.h
+++ b/src/stm-demo-adc/ao_pins.h
@@ -140,9 +140,7 @@
 
 #define AO_LCD_DUTY    STM_LCD_CR_DUTY_STATIC
 
-#define HAS_ADC                        1
-
-#define AO_ADC_RING            32
+#define HAS_ADC_SINGLE                 1
 
 struct ao_adc {
        int16_t                 idd;
@@ -150,8 +148,8 @@ struct ao_adc {
        int16_t                 vref;
 };
 
-#define AO_ADC_DUMP(p) printf("tick: %5u idd %5d temp %5d vref %5d\n", \
-                              (p)->tick, (p)->adc.idd, (p)->adc.temp, (p)->adc.vref)
+#define AO_ADC_DUMP(p) printf("idd %5d temp %5d vref %5d\n", \
+                              (p)->idd, (p)->temp, (p)->vref)
 
 #define AO_ADC_IDD             4
 #define AO_ADC_PIN0_PORT       (&stm_gpioa)