altos: re-enable optimization for stm-demo. remove unused bits

[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 5ff2b32a94eeded531e50b6db878e4d4e6034dd0..b82cb73512711942778b36b4121c919ca033e676 100644 (file)
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -16,6 +16,10 @@
  */
 
 #include "ao.h"
+#include <ao_exti.h>
+#include <ao_event.h>
+#include <ao_quadrature.h>
+#include <ao_button.h>
 
 struct ao_task demo_task;
 
@@ -51,13 +55,15 @@ void _exit () { }
 void _read () { }
 void _fstat() { }
 
+#define AO_DMA_TEST_INDEX      STM_DMA_INDEX(4)
+
 static void
 ao_dma_test(void) {
        static char     src[20] = "hello, world";
        static char     dst[20];
        
        dst[0] = '\0';
-       ao_dma_set_transfer(STM_DMA_INDEX(1), dst, src, 13,
+       ao_dma_set_transfer(AO_DMA_TEST_INDEX, dst, src, 13,
                            (1 << STM_DMA_CCR_MEM2MEM) |
                            (STM_DMA_CCR_PL_LOW << STM_DMA_CCR_PL) |
                            (STM_DMA_CCR_MSIZE_8 << STM_DMA_CCR_MSIZE) |
@@ -66,11 +72,12 @@ ao_dma_test(void) {
                            (1 << STM_DMA_CCR_PINC) |
                            (0 << STM_DMA_CCR_CIRC) |
                            (STM_DMA_CCR_DIR_MEM_TO_PER << STM_DMA_CCR_DIR));
-       ao_dma_start(STM_DMA_INDEX(1));
-       cli();
-       while (!ao_dma_done[STM_DMA_INDEX(1)])
-               ao_sleep(&ao_dma_done[STM_DMA_INDEX(1)]);
-       sei();
+       ao_dma_start(AO_DMA_TEST_INDEX);
+       ao_arch_critical(
+               while (!ao_dma_done[AO_DMA_TEST_INDEX])
+                       ao_sleep(&ao_dma_done[AO_DMA_TEST_INDEX]);
+               );
+       ao_dma_done_transfer(AO_DMA_TEST_INDEX);
        printf ("copied %s\n", dst);
 }
 
@@ -80,7 +87,7 @@ ao_spi_write(void) {
        int i;
 
        for (i = 0; i < 10; i++) {
-               ao_spi_get(0);
+               ao_spi_get(0, AO_SPI_SPEED_FAST);
                stm_gpio_set(&stm_gpioc, 12, 0);
                ao_spi_send(data, 4, 0);
                stm_gpio_set(&stm_gpioc, 12, 1);
@@ -97,7 +104,7 @@ ao_spi_read(void) {
        int i;
 
        for (i = 0; i < 10; i++) {
-               ao_spi_get(0);
+               ao_spi_get(0, AO_SPI_SPEED_FAST);
                stm_gpio_set(&stm_gpioc, 12, 0);
                ao_spi_recv(data, 4, 0);
                stm_gpio_set(&stm_gpioc, 12, 1);
@@ -108,10 +115,66 @@ 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_data  packet;
+       int temp;
+
+       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) * (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);
+}
+
+static void
+ao_event(void)
+{
+       struct ao_event event;
+
+       for (;;) {
+               flush();
+               ao_event_get(&event);
+               printf ("type %1d unit %1d tick %5u value %ld\n",
+                       event.type, event.unit, event.tick, event.value);
+               if (event.value == 100)
+                       break;
+       }
+
+}
+
 __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" },
+       { ao_event, "e\0Monitor event queue" },
        { 0, NULL }
 };
 
@@ -127,14 +190,18 @@ main(void)
 //     ao_lcd_stm_init();
 //     ao_lcd_font_init();
        ao_spi_init();
+       ao_i2c_init();
+       ao_exti_init();
+//     ao_quadrature_init();
+//     ao_button_init();
+
+       ao_timer_set_adc_interval(100);
+
+       ao_adc_init();
+       ao_usb_init();
 
        ao_cmd_register(&ao_demo_cmds[0]);
        
-       stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN);
-       stm_gpio_set(&stm_gpioc, 12, 1);
-       stm_moder_set(&stm_gpioc, 12, STM_MODER_OUTPUT);
-       stm_otyper_set(&stm_gpioc, 12, STM_OTYPER_PUSH_PULL);
-
        ao_start_scheduler();
        return 0;
 }