diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-08-14 18:16:14 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-08-14 18:16:14 -0600 |
| commit | 59976c44d1b6ee6505cfa4efd9a26ec4302f6c33 (patch) | |
| tree | 68a68998dfb5992abe5cde8ea66d45117d93dce9 /src | |
| parent | 4828be0ca5252ac9cd6061209385dcd6c4c57965 (diff) | |
change easymega from v0.1 to v1.0, tweak to build on master, add to Makefile
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/easymega-v1.0/.gitignore (renamed from src/easymega-v0.1/.gitignore) | 0 | ||||
| -rw-r--r-- | src/easymega-v1.0/Makefile (renamed from src/easymega-v0.1/Makefile) | 4 | ||||
| -rw-r--r-- | src/easymega-v1.0/ao_easymega.c (renamed from src/easymega-v0.1/ao_easymega.c) | 0 | ||||
| -rw-r--r-- | src/easymega-v1.0/ao_pins.h (renamed from src/easymega-v0.1/ao_pins.h) | 3 | ||||
| -rw-r--r-- | src/easymega-v1.0/flash-loader/Makefile (renamed from src/easymega-v0.1/flash-loader/Makefile) | 2 | ||||
| -rw-r--r-- | src/easymega-v1.0/flash-loader/ao_pins.h (renamed from src/easymega-v0.1/flash-loader/ao_pins.h) | 0 |
7 files changed, 7 insertions, 3 deletions
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 |