From: Keith Packard <keithp@keithp.com>
Date: Sun, 10 Mar 2013 18:43:06 +0000 (-0700)
Subject: Merge remote-tracking branch 'mjb/altosdroid'
X-Git-Tag: altosdroid_v1.2-1~89
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=90ee11542b111befa0e96e27292dc548e5c37396;hp=d7973de32adff5402844cc1e1da3eced05265074

Merge remote-tracking branch 'mjb/altosdroid'
---

diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index 09c9c3ca..3b1b671b 100644
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -44,7 +44,7 @@ PRODUCT=StmDemo-v0.0
 PRODUCT_DEF=-DSTM_DEMO
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -O0
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
 
 PROG=stm-demo
 
diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index fe7c69f2..b82cb735 100644
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -187,13 +187,13 @@ 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_exti_init();
-	ao_quadrature_init();
-	ao_button_init();
+//	ao_quadrature_init();
+//	ao_button_init();
 
 	ao_timer_set_adc_interval(100);