X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm-demo%2Fao_demo.c;h=93eb92f48c238e8d2ee698bf824cca5c80ec58b3;hb=d69b6738040bf751d024b4daceace7aedee6f7c7;hp=ffc5d2d873b3f7d8e176d3edc2cf2d7428af3b8a;hpb=7e0b549b9b30d0a1290d28b2b94025a98af6a4de;p=fw%2Faltos

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index ffc5d2d8..93eb92f4 100644
--- 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
@@ -26,35 +27,6 @@ struct ao_task demo_task;
 
 static inline int min(int a, int b) { return a < b ? a : b; }
 
-void
-ao_demo(void)
-{
-	char	message[] = "Hello, Mike & Bdale --- ";
-	char	part[7];
-	int	i = 0;
-	int	len = sizeof(message) - 1;
-	int	first, second;
-
-	part[6] = '\0';
-	for (;;) {
-		ao_delay(AO_MS_TO_TICKS(150));
-		first = min(6, len - i);
-		second = 6 - first;
-		memcpy(part, message + i, first);
-		memcpy(part + first, message, second);
-		ao_lcd_font_string(part);
-		if (++i >= len)
-			i = 0;
-	}
-}
-
-void _close() { }
-void _sbrk() { }
-void _isatty() { }
-void _lseek() { }
-void _exit () { }
-void _read () { }
-void _fstat() { }
 
 #define AO_DMA_TEST_INDEX	STM_DMA_INDEX(4)
 
@@ -124,7 +96,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, TRUE);
+			ao_i2c_send(data, 4, 0, true);
 		else {
 			printf ("i2c start failed\n");
 			ao_i2c_put(0);
@@ -196,7 +168,7 @@ ao_blink_toggle(void)
 }
 
 
-__code struct ao_cmds ao_demo_cmds[] = {
+const struct ao_cmds ao_demo_cmds[] = {
 	{ ao_dma_test,	"D\0DMA test" },
 	{ ao_spi_write, "W\0SPI write" },
 	{ ao_spi_read, "R\0SPI read" },
@@ -214,7 +186,7 @@ main(void)
 	
 	ao_task_init();
 
-	ao_led_init(LEDS_AVAILABLE);
+	ao_led_init();
 	ao_led_on(AO_LED_GREEN);
 	ao_led_off(AO_LED_BLUE);
 	ao_timer_init();
@@ -222,11 +194,12 @@ main(void)
 	ao_cmd_init();
 //	ao_lcd_stm_init();
 //	ao_lcd_font_init();
-//	ao_spi_init();
+	ao_spi_init();
 //	ao_i2c_init();
 //	ao_exti_init();
 //	ao_quadrature_init();
 //	ao_button_init();
+	ao_storage_init();
 
 //	ao_timer_set_adc_interval(100);