altos: Clean up usage of port parameters

[fw/altos] / src / stm-demo / ao_demo.c

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index ea4dadfa89d438513c1414308569367d525bb947..73ace558dae5141015b78a66cb659b9c5276990e 100644 (file)
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -111,21 +111,40 @@ ao_spi_read(void) {
        }
 }
 
+static void
+ao_i2c_write(void) {
+       unsigned char   data[] = { 0x55, 0xaa, 0xff, 0x00 };
+       int i;
 
+       for (i = 0; i < 10; i++) {
+               ao_i2c_get(0);
+               if (ao_i2c_start(0, 0x55))
+                       ao_i2c_send(data, 4, 0, TRUE);
+               else {
+                       printf ("i2c start failed\n");
+                       ao_i2c_put(0);
+                       break;
+               }
+               ao_i2c_put(0);
+               printf(".");
+               flush();
+               ao_delay(100);
+       }
+}
 
 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);
 }
 
@@ -133,6 +152,7 @@ __code struct ao_cmds ao_demo_cmds[] = {
        { ao_dma_test,  "D\0DMA test" },
        { ao_spi_write, "W\0SPI write" },
        { ao_spi_read, "R\0SPI read" },
+       { ao_i2c_write, "i\0I2C write" },
        { ao_temp, "t\0Show temp" },
        { 0, NULL }
 };
@@ -146,13 +166,15 @@ main(void)
        ao_timer_init();
        ao_dma_init();
        ao_cmd_init();
-//     ao_lcd_stm_init();
+       ao_lcd_stm_init();
 //     ao_lcd_font_init();
        ao_spi_init();
+       ao_i2c_init();
 
        ao_timer_set_adc_interval(100);
 
        ao_adc_init();
+       ao_usb_init();
 
        ao_cmd_register(&ao_demo_cmds[0]);