diff options
| -rw-r--r-- | src/Makefile | 5 | ||||
| -rw-r--r-- | src/easymini-v1.0/.gitignore (renamed from src/easymini-v0.1/.gitignore) | 0 | ||||
| -rw-r--r-- | src/easymini-v1.0/Makefile (renamed from src/easymini-v0.1/Makefile) | 7 | ||||
| -rw-r--r-- | src/easymini-v1.0/ao_easymini.c (renamed from src/easymini-v0.1/ao_easymini.c) | 0 | ||||
| -rw-r--r-- | src/easymini-v1.0/ao_pins.h (renamed from src/easymini-v0.1/ao_pins.h) | 9 | ||||
| -rw-r--r-- | src/easymini-v1.0/flash-loader/Makefile (renamed from src/easymini-v0.1/flash-loader/Makefile) | 2 | ||||
| -rw-r--r-- | src/easymini-v1.0/flash-loader/ao_pins.h (renamed from src/easymini-v0.1/flash-loader/ao_pins.h) | 0 | ||||
| -rw-r--r-- | src/lpc/Makefile.defs | 8 |
8 files changed, 10 insertions, 21 deletions
diff --git a/src/Makefile b/src/Makefile index 9a8cb837..23cd2920 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,11 +33,10 @@ ARMDIRS=\ telegps-v0.3 telegps-v0.3/flash-loader \ stm-bringup stm-demo \ telelco-v0.2 telelco-v0.2/flash-loader \ - telescience-v0.2 telescience-v0.2/flash-loader \ - easymini-v0.1 easymini-v0.1/flash-loader + telescience-v0.2 telescience-v0.2/flash-loader ARMM0DIRS=\ - easymini-v0.1 + easymini-v1.0 easymini-v1.0/flash-loader ifneq ($(shell which sdcc),) SUBDIRS += $(SDCCDIRS) diff --git a/src/easymini-v0.1/.gitignore b/src/easymini-v1.0/.gitignore index e5f7d586..e5f7d586 100644 --- a/src/easymini-v0.1/.gitignore +++ b/src/easymini-v1.0/.gitignore diff --git a/src/easymini-v0.1/Makefile b/src/easymini-v1.0/Makefile index 9847656c..ec305c94 100644 --- a/src/easymini-v0.1/Makefile +++ b/src/easymini-v1.0/Makefile @@ -32,7 +32,6 @@ ALTOS_SRC = \ ao_sample.c \ ao_data.c \ ao_convert_pa.c \ - ao_led_lpc.c \ ao_task.c \ ao_log.c \ ao_log_mini.c \ @@ -47,13 +46,13 @@ ALTOS_SRC = \ ao_m25.c \ ao_ms5607.c -PRODUCT=EasyMini-v0.1 -PRODUCT_DEF=-DEASYMINI_V_0_1 +PRODUCT=EasyMini-v1.0 +PRODUCT_DEF=-DEASYMINI_V_1_0 IDPRODUCT=0x0026 CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os -PROGNAME=easymini-v0.1 +PROGNAME=easymini-v1.0 PROG=$(PROGNAME)-$(VERSION).elf SRC=$(ALTOS_SRC) ao_easymini.c diff --git a/src/easymini-v0.1/ao_easymini.c b/src/easymini-v1.0/ao_easymini.c index 97230b61..97230b61 100644 --- a/src/easymini-v0.1/ao_easymini.c +++ b/src/easymini-v1.0/ao_easymini.c diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v1.0/ao_pins.h index e0eb10bf..e721030d 100644 --- a/src/easymini-v0.1/ao_pins.h +++ b/src/easymini-v1.0/ao_pins.h @@ -16,7 +16,7 @@ */ #define HAS_BEEP 1 -#define HAS_LED 1 +#define HAS_LED 0 #define AO_STACK_SIZE 384 @@ -31,13 +31,6 @@ /* System clock frequency */ #define AO_LPC_SYSCLK 24000000 -#define LED_PORT 0 -#define LED_PIN_RED 7 - -#define AO_LED_RED (1 << LED_PIN_RED) - -#define LEDS_AVAILABLE AO_LED_RED - #define HAS_USB 1 #define HAS_USB_CONNECT 0 diff --git a/src/easymini-v0.1/flash-loader/Makefile b/src/easymini-v1.0/flash-loader/Makefile index ab828b22..78bb4092 100644 --- a/src/easymini-v0.1/flash-loader/Makefile +++ b/src/easymini-v1.0/flash-loader/Makefile @@ -4,5 +4,5 @@ # TOPDIR=../.. -HARDWARE=easymini-v0.1 +HARDWARE=easymini-v1.0 include $(TOPDIR)/lpc/Makefile-flash.defs diff --git a/src/easymini-v0.1/flash-loader/ao_pins.h b/src/easymini-v1.0/flash-loader/ao_pins.h index 4330151d..4330151d 100644 --- a/src/easymini-v0.1/flash-loader/ao_pins.h +++ b/src/easymini-v1.0/flash-loader/ao_pins.h diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs index 9e87cee1..2873d5e8 100644 --- a/src/lpc/Makefile.defs +++ b/src/lpc/Makefile.defs @@ -7,13 +7,11 @@ vpath load_csv.5c ../kalman vpath matrix.5c ../kalman vpath ao-make-product.5c ../util -CC=/usr/bin/arm-none-eabi-gcc +CC=arm-none-eabi-gcc SAT=/opt/cortex SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a SAT_CFLAGS=-I$(SAT)/include -#CC=/opt/arm-gcc-bits/bin/arm-none-eabi-gcc - ifndef VERSION include ../Version endif @@ -21,7 +19,7 @@ endif AO_CFLAGS=-I. -I../lpc -I../core -I../drivers -I.. LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS) -LDFLAGS=-L../stm -Wl,-Taltos.ld +LDFLAGS=$(LPC_CFLAGS) -L../stm -Wl,-Taltos.ld NICKLE=nickle @@ -34,7 +32,7 @@ endif quiet ?= $($1) .c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< + $(call quiet,CC) -c $(CFLAGS) $< ao_serial_lpc.h: ../lpc/baud_rate ao_pins.h nickle ../lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@ |