altos: Rename easymini-v0.1 to easymini-v1.0

The production boards are the same as the modified v0.1 boards

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/Makefile b/src/Makefile
index 9a8cb83726aede213cc4d6070a7440dc11d8c5e3..23cd2920d6e9a8b66c70258c1cf61ee2f6b53f10 100644 (file)
--- 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 \
        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=\
 
 ARMM0DIRS=\

-       easymini-v0.1
+       easymini-v1.0 easymini-v1.0/flash-loader

 
 ifneq ($(shell which sdcc),)
        SUBDIRS += $(SDCCDIRS)
 
 ifneq ($(shell which sdcc),)
        SUBDIRS += $(SDCCDIRS)

diff --git a/src/easymini-v0.1/.gitignore b/src/easymini-v0.1/.gitignore
deleted file mode 100644 (file)
index e5f7d58..0000000
--- a/src/easymini-v0.1/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-ao_product.h
-*.elf

diff --git a/src/easymini-v0.1/Makefile b/src/easymini-v0.1/Makefile
deleted file mode 100644 (file)
index 9847656..0000000
--- a/src/easymini-v0.1/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# AltOS build
-#
-#
-
-include ../lpc/Makefile.defs
-
-INC = \
-       ao.h \
-       ao_arch.h \
-       ao_arch_funcs.h \
-       ao_pins.h \
-       ao_product.h \
-       lpc.h
-
-#
-# Common AltOS sources
-#
-ALTOS_SRC = \
-       ao_interrupt.c \
-       ao_boot_chain.c \
-       ao_romconfig.c \
-       ao_product.c \
-       ao_mutex.c \
-       ao_panic.c \
-       ao_stdio.c \
-       ao_storage.c \
-       ao_report.c \
-       ao_ignite.c \
-       ao_flight.c \
-       ao_kalman.c \
-       ao_sample.c \
-       ao_data.c \
-       ao_convert_pa.c \
-       ao_led_lpc.c \
-       ao_task.c \
-       ao_log.c \
-       ao_log_mini.c \
-       ao_cmd.c \
-       ao_config.c \
-       ao_timer_lpc.c \
-       ao_exti_lpc.c \
-       ao_usb_lpc.c \
-       ao_spi_lpc.c \
-       ao_adc_lpc.c \
-       ao_beep_lpc.c \
-       ao_m25.c \
-       ao_ms5607.c
-
-PRODUCT=EasyMini-v0.1
-PRODUCT_DEF=-DEASYMINI_V_0_1
-IDPRODUCT=0x0026
-
-CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os
-
-PROGNAME=easymini-v0.1
-PROG=$(PROGNAME)-$(VERSION).elf
-
-SRC=$(ALTOS_SRC) ao_easymini.c
-OBJ=$(SRC:.c=.o)
-
-all: $(PROG)
-
-LDFLAGS=-L../lpc -Wl,-Taltos.ld
-
-$(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
-
-ao_product.h: ao-make-product.5c ../Version
-       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-$(OBJ): $(INC)
-
-load: $(PROG)
-       lpc-load $(PROG)
-
-distclean:     clean
-
-clean:
-       rm -f *.o $(PROG)
-       rm -f ao_product.h
-
-install:
-
-uninstall:

diff --git a/src/easymini-v0.1/ao_easymini.c b/src/easymini-v0.1/ao_easymini.c
deleted file mode 100644 (file)
index 97230b6..0000000
--- a/src/easymini-v0.1/ao_easymini.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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>
-#include <ao_exti.h>
-
-void
-main(void)
-{
-       ao_clock_init();
-       ao_task_init();
-       ao_timer_init();
-       ao_exti_init();
-
-       ao_beep_init();
-
-       ao_adc_init();
-       ao_spi_init();
-       ao_storage_init();
-
-       ao_usb_init();
-
-       ao_cmd_init();
-       ao_flight_init();
-       ao_ms5607_init();
-       ao_log_init();
-       ao_report_init();
-       ao_igniter_init();
-       ao_config_init();
-
-       ao_start_scheduler();
-}

diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
deleted file mode 100644 (file)
index e0eb10b..0000000
--- a/src/easymini-v0.1/ao_pins.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright © 2013 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.
- */
-
-#define HAS_BEEP       1
-#define        HAS_LED         1
-
-#define AO_STACK_SIZE  384
-
-#define IS_FLASH_LOADER        0
-
-/* Crystal on the board */
-#define AO_LPC_CLKIN   12000000
-
-/* Main clock frequency. 48MHz for USB so we don't use the USB PLL */
-#define AO_LPC_CLKOUT  48000000
-
-/* 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
-#define HAS_USB_VBUS   0
-#define HAS_USB_PULLUP 1
-#define AO_USB_PULLUP_PORT     0
-#define AO_USB_PULLUP_PIN      20
-
-#define PACKET_HAS_SLAVE       0
-
-#define AO_LOG_FORMAT          AO_LOG_FORMAT_EASYMINI
-
-/* USART */
-
-#define HAS_SERIAL             0
-#define USE_SERIAL_0_STDIN     1
-#define SERIAL_0_18_19         1
-#define SERIAL_0_14_15         0
-#define SERIAL_0_17_18         0
-#define SERIAL_0_26_27         0
-
-/* SPI */
-
-#define HAS_SPI_0              1
-#define SPI_SCK0_P0_6          1
-#define HAS_SPI_1              1
-#define SPI_SCK1_P1_15         1
-#define SPI_MISO1_P0_22                1
-#define SPI_MOSI1_P0_21                1
-
-/* M25 */
-
-#define M25_MAX_CHIPS          1
-#define AO_M25_SPI_CS_PORT     0
-#define AO_M25_SPI_CS_MASK     (1 << 23)
-#define AO_M25_SPI_BUS         1
-
-/* MS5607 */
-
-#define HAS_MS5607             1
-#define HAS_MS5611             0
-#define AO_MS5607_PRIVATE_PINS 0
-#define AO_MS5607_CS_PORT      0
-#define AO_MS5607_CS_PIN       7
-#define AO_MS5607_CS_MASK      (1 << AO_MS5607_CS_PIN)
-#define AO_MS5607_MISO_PORT    0
-#define AO_MS5607_MISO_PIN     8
-#define AO_MS5607_MISO_MASK    (1 << AO_MS5607_MISO_PIN)
-#define AO_MS5607_SPI_INDEX    0
-
-#define HAS_ACCEL              0
-#define HAS_GPS                        0
-#define HAS_RADIO              0
-#define HAS_FLIGHT             1
-#define HAS_EEPROM             1
-#define HAS_TELEMETRY          0
-#define HAS_APRS               0
-#define HAS_LOG                        1
-#define USE_INTERNAL_FLASH     0
-#define HAS_IGNITE             1
-#define HAS_IGNITE_REPORT      1
-
-#define AO_DATA_RING           16
-
-/*
- * ADC
- */
-
-#define HAS_ADC                        1
-
-#define AO_NUM_ADC             3
-
-#define AO_ADC_0               1
-#define AO_ADC_1               1
-#define AO_ADC_2               1
-
-struct ao_adc {
-       int16_t         sense_a;
-       int16_t         sense_m;
-       int16_t         v_batt;
-};
-
-/*
- * Igniter
- */
-
-#define AO_IGNITER_CLOSED      400
-#define AO_IGNITER_OPEN                60
-
-#define AO_IGNITER_DROGUE_PORT 0
-#define AO_IGNITER_DROGUE_PIN  2
-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
-
-#define AO_IGNITER_MAIN_PORT   0
-#define AO_IGNITER_MAIN_PIN    3
-#define AO_IGNITER_SET_MAIN(v)         ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
-
-#define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
-#define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
-
-#define AO_ADC_DUMP(p) \
-       printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
-              (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)

diff --git a/src/easymini-v0.1/flash-loader/Makefile b/src/easymini-v0.1/flash-loader/Makefile
deleted file mode 100644 (file)
index ab828b2..0000000
--- a/src/easymini-v0.1/flash-loader/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# AltOS flash loader build
-#
-#
-
-TOPDIR=../..
-HARDWARE=easymini-v0.1
-include $(TOPDIR)/lpc/Makefile-flash.defs

diff --git a/src/easymini-v0.1/flash-loader/ao_pins.h b/src/easymini-v0.1/flash-loader/ao_pins.h
deleted file mode 100644 (file)
index 4330151..0000000
--- a/src/easymini-v0.1/flash-loader/ao_pins.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright © 2013 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.
- */
-
-#ifndef _AO_PINS_H_
-#define _AO_PINS_H_
-
-#include <ao_flash_lpc_pins.h>
-
-#define AO_BOOT_PIN            1
-#define AO_BOOT_APPLICATION_GPIO       0
-#define AO_BOOT_APPLICATION_PIN                19
-#define AO_BOOT_APPLICATION_VALUE      1
-#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
-
-#define HAS_USB_PULLUP 1
-#define AO_USB_PULLUP_PORT     0
-#define AO_USB_PULLUP_PIN      20
-
-#endif /* _AO_PINS_H_ */

diff --git a/src/easymini-v1.0/.gitignore b/src/easymini-v1.0/.gitignore
new file mode 100644 (file)
index 0000000..e5f7d58
--- /dev/null
+++ b/src/easymini-v1.0/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+*.elf

diff --git a/src/easymini-v1.0/Makefile b/src/easymini-v1.0/Makefile
new file mode 100644 (file)
index 0000000..ec305c9
--- /dev/null
+++ b/src/easymini-v1.0/Makefile
@@ -0,0 +1,84 @@
+#
+# AltOS build
+#
+#
+
+include ../lpc/Makefile.defs
+
+INC = \
+       ao.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
+       ao_pins.h \
+       ao_product.h \
+       lpc.h
+
+#
+# Common AltOS sources
+#
+ALTOS_SRC = \
+       ao_interrupt.c \
+       ao_boot_chain.c \
+       ao_romconfig.c \
+       ao_product.c \
+       ao_mutex.c \
+       ao_panic.c \
+       ao_stdio.c \
+       ao_storage.c \
+       ao_report.c \
+       ao_ignite.c \
+       ao_flight.c \
+       ao_kalman.c \
+       ao_sample.c \
+       ao_data.c \
+       ao_convert_pa.c \
+       ao_task.c \
+       ao_log.c \
+       ao_log_mini.c \
+       ao_cmd.c \
+       ao_config.c \
+       ao_timer_lpc.c \
+       ao_exti_lpc.c \
+       ao_usb_lpc.c \
+       ao_spi_lpc.c \
+       ao_adc_lpc.c \
+       ao_beep_lpc.c \
+       ao_m25.c \
+       ao_ms5607.c
+
+PRODUCT=EasyMini-v1.0
+PRODUCT_DEF=-DEASYMINI_V_1_0
+IDPRODUCT=0x0026
+
+CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os
+
+PROGNAME=easymini-v1.0
+PROG=$(PROGNAME)-$(VERSION).elf
+
+SRC=$(ALTOS_SRC) ao_easymini.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG)
+
+LDFLAGS=-L../lpc -Wl,-Taltos.ld
+
+$(PROG): Makefile $(OBJ) altos.ld
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+
+ao_product.h: ao-make-product.5c ../Version
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+$(OBJ): $(INC)
+
+load: $(PROG)
+       lpc-load $(PROG)
+
+distclean:     clean
+
+clean:
+       rm -f *.o $(PROG)
+       rm -f ao_product.h
+
+install:
+
+uninstall:

diff --git a/src/easymini-v1.0/ao_easymini.c b/src/easymini-v1.0/ao_easymini.c
new file mode 100644 (file)
index 0000000..97230b6
--- /dev/null
+++ b/src/easymini-v1.0/ao_easymini.c
@@ -0,0 +1,46 @@
+/*
+ * 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>
+#include <ao_exti.h>
+
+void
+main(void)
+{
+       ao_clock_init();
+       ao_task_init();
+       ao_timer_init();
+       ao_exti_init();
+
+       ao_beep_init();
+
+       ao_adc_init();
+       ao_spi_init();
+       ao_storage_init();
+
+       ao_usb_init();
+
+       ao_cmd_init();
+       ao_flight_init();
+       ao_ms5607_init();
+       ao_log_init();
+       ao_report_init();
+       ao_igniter_init();
+       ao_config_init();
+
+       ao_start_scheduler();
+}

diff --git a/src/easymini-v1.0/ao_pins.h b/src/easymini-v1.0/ao_pins.h
new file mode 100644 (file)
index 0000000..e721030
--- /dev/null
+++ b/src/easymini-v1.0/ao_pins.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+#define HAS_BEEP       1
+#define        HAS_LED         0
+
+#define AO_STACK_SIZE  384
+
+#define IS_FLASH_LOADER        0
+
+/* Crystal on the board */
+#define AO_LPC_CLKIN   12000000
+
+/* Main clock frequency. 48MHz for USB so we don't use the USB PLL */
+#define AO_LPC_CLKOUT  48000000
+
+/* System clock frequency */
+#define AO_LPC_SYSCLK  24000000
+
+#define HAS_USB                1
+
+#define HAS_USB_CONNECT        0
+#define HAS_USB_VBUS   0
+#define HAS_USB_PULLUP 1
+#define AO_USB_PULLUP_PORT     0
+#define AO_USB_PULLUP_PIN      20
+
+#define PACKET_HAS_SLAVE       0
+
+#define AO_LOG_FORMAT          AO_LOG_FORMAT_EASYMINI
+
+/* USART */
+
+#define HAS_SERIAL             0
+#define USE_SERIAL_0_STDIN     1
+#define SERIAL_0_18_19         1
+#define SERIAL_0_14_15         0
+#define SERIAL_0_17_18         0
+#define SERIAL_0_26_27         0
+
+/* SPI */
+
+#define HAS_SPI_0              1
+#define SPI_SCK0_P0_6          1
+#define HAS_SPI_1              1
+#define SPI_SCK1_P1_15         1
+#define SPI_MISO1_P0_22                1
+#define SPI_MOSI1_P0_21                1
+
+/* M25 */
+
+#define M25_MAX_CHIPS          1
+#define AO_M25_SPI_CS_PORT     0
+#define AO_M25_SPI_CS_MASK     (1 << 23)
+#define AO_M25_SPI_BUS         1
+
+/* MS5607 */
+
+#define HAS_MS5607             1
+#define HAS_MS5611             0
+#define AO_MS5607_PRIVATE_PINS 0
+#define AO_MS5607_CS_PORT      0
+#define AO_MS5607_CS_PIN       7
+#define AO_MS5607_CS_MASK      (1 << AO_MS5607_CS_PIN)
+#define AO_MS5607_MISO_PORT    0
+#define AO_MS5607_MISO_PIN     8
+#define AO_MS5607_MISO_MASK    (1 << AO_MS5607_MISO_PIN)
+#define AO_MS5607_SPI_INDEX    0
+
+#define HAS_ACCEL              0
+#define HAS_GPS                        0
+#define HAS_RADIO              0
+#define HAS_FLIGHT             1
+#define HAS_EEPROM             1
+#define HAS_TELEMETRY          0
+#define HAS_APRS               0
+#define HAS_LOG                        1
+#define USE_INTERNAL_FLASH     0
+#define HAS_IGNITE             1
+#define HAS_IGNITE_REPORT      1
+
+#define AO_DATA_RING           16
+
+/*
+ * ADC
+ */
+
+#define HAS_ADC                        1
+
+#define AO_NUM_ADC             3
+
+#define AO_ADC_0               1
+#define AO_ADC_1               1
+#define AO_ADC_2               1
+
+struct ao_adc {
+       int16_t         sense_a;
+       int16_t         sense_m;
+       int16_t         v_batt;
+};
+
+/*
+ * Igniter
+ */
+
+#define AO_IGNITER_CLOSED      400
+#define AO_IGNITER_OPEN                60
+
+#define AO_IGNITER_DROGUE_PORT 0
+#define AO_IGNITER_DROGUE_PIN  2
+#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
+
+#define AO_IGNITER_MAIN_PORT   0
+#define AO_IGNITER_MAIN_PIN    3
+#define AO_IGNITER_SET_MAIN(v)         ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
+
+#define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
+
+#define AO_ADC_DUMP(p) \
+       printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+              (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)

diff --git a/src/easymini-v1.0/flash-loader/Makefile b/src/easymini-v1.0/flash-loader/Makefile
new file mode 100644 (file)
index 0000000..78bb409
--- /dev/null
+++ b/src/easymini-v1.0/flash-loader/Makefile
@@ -0,0 +1,8 @@
+#
+# AltOS flash loader build
+#
+#
+
+TOPDIR=../..
+HARDWARE=easymini-v1.0
+include $(TOPDIR)/lpc/Makefile-flash.defs

diff --git a/src/easymini-v1.0/flash-loader/ao_pins.h b/src/easymini-v1.0/flash-loader/ao_pins.h
new file mode 100644 (file)
index 0000000..4330151
--- /dev/null
+++ b/src/easymini-v1.0/flash-loader/ao_pins.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2013 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.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#include <ao_flash_lpc_pins.h>
+
+#define AO_BOOT_PIN            1
+#define AO_BOOT_APPLICATION_GPIO       0
+#define AO_BOOT_APPLICATION_PIN                19
+#define AO_BOOT_APPLICATION_VALUE      1
+#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
+
+#define HAS_USB_PULLUP 1
+#define AO_USB_PULLUP_PORT     0
+#define AO_USB_PULLUP_PIN      20
+
+#endif /* _AO_PINS_H_ */

diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs
index 9e87cee1c8e207ed5a2912d08dd9dcabaa85118f..2873d5e86ef60c2c6899e8e0c8803ed9be7f9b62 100644 (file)
--- 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
 
 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
 
 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
 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)
 
 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
 
 
 NICKLE=nickle
 


@@ -34,7 +32,7 @@ endif
 quiet ?= $($1)
 
 .c.o:
 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` > $@
 
 ao_serial_lpc.h: ../lpc/baud_rate ao_pins.h
        nickle ../lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@