X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm-demo%2Fao_demo.c;h=edc67f5e6672ec7e63e9d999dc1f55d159177bc4;hb=6dad9ca543fbed3f849b01300224b1b21ef2eb08;hp=232c2313ed80af371b289f0dd50fad80dcf537ee;hpb=627b904b36e129ff2ead436a626699abfc3b3211;p=fw%2Faltos

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index 232c2313..edc67f5e 100644
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -16,6 +16,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 +88,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 +105,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);
@@ -148,12 +153,31 @@ ao_temp (void)
 	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
+
 __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 }
 };
 
@@ -162,14 +186,19 @@ main(void)
 {
 	ao_clock_init();
 	
+	ao_task_init();
+
 	ao_serial_init();
 	ao_timer_init();
 	ao_dma_init();
 	ao_cmd_init();
-//	ao_lcd_stm_init();
-//	ao_lcd_font_init();
+	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);