altos/stm-demo: Set up for dumping eeprom

[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 879f7f75bb4fbdb1cb3c71c67fddb43aa645439d..f6c8e3df83f0dafa48b40ed03be9b528ac9e6bc9 100644 (file)
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,6 +17,11 @@
  */
 
 #include "ao.h"
+#include <ao_exti.h>
+#include <ao_event.h>
+#include <ao_quadrature.h>
+#include <ao_button.h>
+#include <ao_boot.h>
 
 struct ao_task demo_task;
 
@@ -83,7 +89,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);
@@ -100,7 +106,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);
@@ -119,7 +125,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,25 +141,70 @@ 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);
 }
 
+#if 0
+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;
+       }
+
+}
+#endif
+
+static uint8_t ao_blinking = 0;
+
+static void
+ao_blink(void)
+{
+       for (;;) {
+               while (!ao_blinking)
+                       ao_sleep(&ao_blinking);
+               while (ao_blinking) {
+                       ao_led_toggle(AO_LED_BLUE|AO_LED_GREEN);
+                       ao_delay(AO_MS_TO_TICKS(500));
+               }
+       }
+}
+
+static struct ao_task ao_blink_task;
+
+static void
+ao_blink_toggle(void)
+{
+       ao_blinking = !ao_blinking;
+       ao_wakeup(&ao_blinking);
+}
+
+
 __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_blink_toggle, "b\0Toggle LED blinking" },
+/*     { ao_event, "e\0Monitor event queue" }, */
        { 0, NULL }
 };
 
@@ -162,19 +213,29 @@ main(void)
 {
        ao_clock_init();
        
-       ao_serial_init();
+       ao_task_init();
+
+       ao_led_init(LEDS_AVAILABLE);
+       ao_led_on(AO_LED_GREEN);
+       ao_led_off(AO_LED_BLUE);
        ao_timer_init();
        ao_dma_init();
        ao_cmd_init();
 //     ao_lcd_stm_init();
 //     ao_lcd_font_init();
        ao_spi_init();
-       ao_i2c_init();
+//     ao_i2c_init();
+//     ao_exti_init();
+//     ao_quadrature_init();
+//     ao_button_init();
+       ao_storage_init();
 
-       ao_timer_set_adc_interval(100);
+//     ao_timer_set_adc_interval(100);
 
-       ao_adc_init();
+//     ao_adc_init();
+       ao_usb_init();
 
+       ao_add_task(&ao_blink_task, ao_blink, "blink");
        ao_cmd_register(&ao_demo_cmds[0]);
        
        ao_start_scheduler();