change easymega from v0.1 to v1.0, tweak to build on master, add to Makefile

8 files changed, 64 insertions, 3 deletions

diff --git a/ao-bringup/turnon_easymega b/ao-bringup/turnon_easymega
new file mode 100755
index 00000000..7d23f5f7
--- /dev/null
+++ b/ao-bringup/turnon_easymega
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ -x /usr/bin/ao-flash-stm ]; then
+	STMLOAD=/usr/bin/ao-flash-stm
+else
+	echo "Can't find ao-flash-stm!  Aborting."
+	exit 1
+fi
+
+if [ -x /usr/bin/ao-usbload ]; then
+	USBLOAD=/usr/bin/ao-usbload
+else
+	echo "Can't find ao-usbload!  Aborting."
+	exit 1
+fi
+
+VERSION=1.0
+REPO=~/altusmetrumllc/Binaries
+
+echo "EasyMega v$VERSION Turn-On and Calibration Program"
+echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
+echo
+echo "Expectations:"
+echo "\tEasyMega v$VERSION"
+echo "\t\twith USB cable attached"
+echo "\t\twith ST-Link-V2 cabled to debug header"
+echo
+echo -n "EasyMega-$VERSION serial number: "
+read SERIAL
+
+echo $STMLOAD
+
+$STMLOAD $REPO/loaders/easymega-v$VERSION*.elf || exit 1
+
+sleep 2
+
+$USBLOAD --serial=$SERIAL $REPO/easymega-v$VERSION*.elf || exit 1
+
+sleep 2
+
+dev=`ao-list | awk '/EasyMega-v'"$VERSION"'/ { print $3; exit(0); }'`
+
+case "$dev" in
+/dev/tty*)
+	echo "EasyMega found on $dev"
+	;;
+*)
+	echo 'No EasyMega-v'"$VERSION"' found'
+	exit 1
+	;;
+esac
+
+echo 'E 0' > $dev
+
+./cal-accel $dev
+
+echo 'E 1' > $dev
diff --git a/src/Makefile b/src/Makefile
index 3494ba62..7f09db02 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,6 +25,7 @@ SDCCDIRS=\
 	telefire-v0.1 telefire-v0.2
 
 ARMM3DIRS=\
+	easymega-v1.0 easymega-v1.0/flash-loader \
 	telemega-v0.1 telemega-v0.1/flash-loader \
 	telemega-v1.0 telemega-v1.0/flash-loader \
 	telemetrum-v2.0 telemetrum-v2.0/flash-loader \
diff --git a/src/easymega-v0.1/.gitignore b/src/easymega-v1.0/.gitignore
index 410943d5..410943d5 100644
--- a/src/easymega-v0.1/.gitignore
+++ b/src/easymega-v1.0/.gitignore
diff --git a/src/easymega-v0.1/Makefile b/src/easymega-v1.0/Makefile
index 66619852..708ce1c6 100644
--- a/src/easymega-v0.1/Makefile
+++ b/src/easymega-v1.0/Makefile
@@ -107,13 +107,13 @@ ALTOS_SRC = \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
 
-PRODUCT=EasyMega-v0.1
+PRODUCT=EasyMega-v1.0
 PRODUCT_DEF=-DEASYMEGA
 IDPRODUCT=0x0023
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g
 
-PROGNAME=easymega-v0.1
+PROGNAME=easymega-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
 
diff --git a/src/easymega-v0.1/ao_easymega.c b/src/easymega-v1.0/ao_easymega.c
index e217c33c..e217c33c 100644
--- a/src/easymega-v0.1/ao_easymega.c
+++ b/src/easymega-v1.0/ao_easymega.c
diff --git a/src/easymega-v0.1/ao_pins.h b/src/easymega-v1.0/ao_pins.h
index cb6e3980..d6490ba5 100644
--- a/src/easymega-v0.1/ao_pins.h
+++ b/src/easymega-v1.0/ao_pins.h
@@ -65,6 +65,9 @@
 #define ao_gps_fifo		(ao_stm_usart1.rx_fifo)
 
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	(1024 * 1024)
+#define AO_CONFIG_MAX_SIZE                     1024
+#define LOG_ERASE_MARK                         0x55
+#define LOG_MAX_ERASE                          128
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
 #define USE_EEPROM_CONFIG	1
diff --git a/src/easymega-v0.1/flash-loader/Makefile b/src/easymega-v1.0/flash-loader/Makefile
index 35312fd6..d83cb70a 100644
--- a/src/easymega-v0.1/flash-loader/Makefile
+++ b/src/easymega-v1.0/flash-loader/Makefile
@@ -4,5 +4,5 @@
 #
 
 TOPDIR=../..
-HARDWARE=easymega-v0.1
+HARDWARE=easymega-v1.0
 include $(TOPDIR)/stm/Makefile-flash.defs
diff --git a/src/easymega-v0.1/flash-loader/ao_pins.h b/src/easymega-v1.0/flash-loader/ao_pins.h
index 445289bf..445289bf 100644
--- a/src/easymega-v0.1/flash-loader/ao_pins.h
+++ b/src/easymega-v1.0/flash-loader/ao_pins.h