altos: Make stm-demo compile with new ao_data structure
authorKeith Packard <keithp@keithp.com>
Sun, 27 May 2012 23:29:27 +0000 (17:29 -0600)
committerKeith Packard <keithp@keithp.com>
Sun, 27 May 2012 23:29:27 +0000 (17:29 -0600)
Signed-off-by: Keith Packard <keithp@keithp.com>
src/stm-demo/ao_demo.c
src/stm-demo/ao_pins.h

index 7bb53047e9310b169cc3b355090318e79924cf64..232c2313ed80af371b289f0dd50fad80dcf537ee 100644 (file)
@@ -119,7 +119,7 @@ ao_i2c_write(void) {
        for (i = 0; i < 10; i++) {
                ao_i2c_get(0);
                if (ao_i2c_start(0, 0x55))
-                       ao_i2c_send(data, 4, 0);
+                       ao_i2c_send(data, 4, 0, TRUE);
                else {
                        printf ("i2c start failed\n");
                        ao_i2c_put(0);
@@ -135,16 +135,16 @@ ao_i2c_write(void) {
 static void
 ao_temp (void)
 {
-       struct ao_adc   adc;
+       struct ao_data  packet;
        int temp;
 
-       ao_adc_get(&adc);
+       ao_data_get(&packet);
 
        /*
         * 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) * (adc.temp - stm_temp_cal.ts_cal_cold) / (stm_temp_cal.ts_cal_hot - stm_temp_cal.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);
        printf ("temp: %d\n", temp);
 }
 
index 1daab35165ba0efae56d45e167c4502abfa21cd7..d02c071c4d2f2312039eeca1227d044f6c0b6d63 100644 (file)
@@ -156,6 +156,7 @@ struct ao_adc {
 
 #define HAS_ADC_TEMP           1
 
+#define AO_DATA_RING           32
 #define AO_NUM_ADC             3
 
 #define AO_ADC_SQ1             AO_ADC_IDD