From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Apr 2013 22:20:51 +0000 (-0500)
Subject: Merge branch 'master' into stm-flash
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86;p=fw%2Faltos

Merge branch 'master' into stm-flash

Conflicts:
	ao-tools/ao-stmload/ao-stmload.c
---

33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86
diff --cc src/stm/Makefile.defs
index 3ce6eead,1480f0b3..c8bb7d70
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@@ -7,14 -7,9 +7,14 @@@ vpath load_csv.5c ../kalma
  vpath matrix.5c ../kalman
  vpath ao-make-product.5c ../util
  
 +.SUFFIXES: .elf .ihx
 +
 +.elf.ihx:
 +	objcopy -O ihex $*.elf $@
 +
  CC=arm-none-eabi-gcc
- SAT=/home/keithp/sat
- SAT_CLIB=$(SAT)/lib/pdclib.a
+ SAT=/opt/cortex
+ SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
  SAT_CFLAGS=-I$(SAT)/include
  
  ifndef VERSION
diff --cc src/telebt-v1.0/ao_telebt.c
index 00000000,4a50a9d4..935cde7d
mode 000000,100644..100644
--- a/src/telebt-v1.0/ao_telebt.c
+++ b/src/telebt-v1.0/ao_telebt.c
@@@ -1,0 -1,41 +1,44 @@@
+ /*
+  * Copyright © 2011 Keith Packard <keithp@keithp.com>
+  *
+  * 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.
+  *
+  * This program is distributed in the hope that it will be useful, but
+  * WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License along
+  * with this program; if not, write to the Free Software Foundation, Inc.,
+  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+  */
+ 
+ #include "ao.h"
+ 
+ void
+ main(void)
+ {
+ 	ao_clock_init();
+ 
+ 	/* Turn on the LED until the system is stable */
+ 	ao_led_init(LEDS_AVAILABLE);
+ 	ao_led_on(AO_LED_RED);
++
++	ao_task_init();
++
+ 	ao_timer_init();
+ 	ao_cmd_init();
+ 	ao_usb_init();
+ 	ao_monitor_init();
+ 	ao_radio_init();
+ 	ao_packet_master_init();
+ 	ao_adc_init();
+ 	ao_btm_init();
+ #if HAS_DBG
+ 	ao_dbg_init();
+ #endif
+ 	ao_config_init();
+ 	ao_start_scheduler();
+ }