altos: Rename teledongle-v1.9 as teledongle-v3.0

No hardware changes from the 1.9 prototypes to the 3.0 final version.

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

diff --git a/src/Makefile b/src/Makefile
index c8563c9d69c4a01100354ce5187029a857561209..05e99c7fbfd77405ecabb89694cff4aa2662de00 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,7 @@ ARMM3DIRS=\
        telegps-v1.0 telegps-v1.0/flash-loader \
        telelco-v0.2 telelco-v0.2/flash-loader \
        telescience-v0.2 telescience-v0.2/flash-loader \
        telegps-v1.0 telegps-v1.0/flash-loader \
        telelco-v0.2 telelco-v0.2/flash-loader \
        telescience-v0.2 telescience-v0.2/flash-loader \

-       teledongle-v1.9 teledongle-v1.9/flash-loader \
+       teledongle-v3.0 teledongle-v3.0/flash-loader \

        teleballoon-v2.0 \
        telebt-v3.0 telebt-v3.0/flash-loader
 
        teleballoon-v2.0 \
        telebt-v3.0 telebt-v3.0/flash-loader
 

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

diff --git a/src/teledongle-v1.9/Makefile b/src/teledongle-v1.9/Makefile
deleted file mode 100644 (file)
index 78deb9e..0000000
--- a/src/teledongle-v1.9/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# AltOS build
-#
-#
-
-include ../lpc/Makefile.defs
-
-INC = \
-       ao.h \
-       ao_arch.h \
-       ao_arch_funcs.h \
-       ao_boot.h \
-       ao_pins.h \
-       ao_product.h \
-       ao_task.h \
-       ao_whiten.h \
-       lpc.h \
-       ao_cc1200.h \
-       ao_cc1200_CC1200.h \
-       Makefile
-
-ALTOS_SRC = \
-       ao_boot_chain.c \
-       ao_interrupt.c \
-       ao_product.c \
-       ao_romconfig.c \
-       ao_cc1200.c \
-       ao_cmd.c \
-       ao_config.c \
-       ao_task.c \
-       ao_led_lpc.c \
-       ao_stdio.c \
-       ao_panic.c \
-       ao_timer_lpc.c \
-       ao_mutex.c \
-       ao_freq.c \
-       ao_spi_lpc.c \
-       ao_usb_lpc.c \
-       ao_exti_lpc.c \
-       ao_send_packet.c \
-       ao_monitor.c \
-       ao_packet_master.c \
-       ao_packet.c
-
-PRODUCT=TeleDongle-v1.9
-PRODUCT_DEF=-DTELEDONGLE
-IDPRODUCT=0x000c
-
-CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -Os -g
-
-PROGNAME=teledongle-v1.9
-PROG=$(PROGNAME)-$(VERSION).elf
-HEX=$(PROGNAME)-$(VERSION).ihx
-
-SRC=$(ALTOS_SRC) ao_teledongle.c
-OBJ=$(SRC:.c=.o)
-
-all: $(PROG) $(HEX)
-
-$(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
-
-$(OBJ): $(INC)
-
-ao_product.h: ao-make-product.5c ../Version
-       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-load: $(PROG)
-       lpc-load $(PROG)
-
-distclean:     clean
-
-clean:
-       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
-       rm -f ao_product.h
-
-install:
-
-uninstall:

diff --git a/src/teledongle-v1.9/ao_pins.h b/src/teledongle-v1.9/ao_pins.h
deleted file mode 100644 (file)
index f8889c4..0000000
--- a/src/teledongle-v1.9/ao_pins.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright © 2012 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.
- */
-
-/* Using TeleMetrum v1.9 board */
-
-#ifndef _AO_PINS_H_
-#define _AO_PINS_H_
-
-#define AO_STACK_SIZE  324
-
-#define HAS_TASK_QUEUE         1
-
-#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_EEPROM             0
-#define USE_INTERNAL_FLASH     0
-#define USE_STORAGE_CONFIG     0
-#define USE_EEPROM_CONFIG      0
-
-#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 HAS_BEEP               0
-#define HAS_RADIO              1
-#define HAS_TELEMETRY          0
-#define HAS_RSSI               0
-
-#define HAS_SPI_0              1
-#define SPI_SCK0_P0_6          1
-
-#define PACKET_HAS_SLAVE       0
-#define PACKET_HAS_MASTER      1
-
-#define LOW_LEVEL_DEBUG                0
-
-#define LED_PORT               0
-#define LED_PIN_RED            14
-#define LED_PIN_GREEN          7
-#define AO_LED_RED             (1 << LED_PIN_RED)
-#define AO_LED_GREEN           (1 << LED_PIN_GREEN)
-
-#define LEDS_AVAILABLE         (AO_LED_RED | AO_LED_GREEN)
-
-#define HAS_GPS                        0
-#define HAS_FLIGHT             0
-#define HAS_ADC                        0
-#define HAS_LOG                        0
-
-/*
- * Telemetry monitoring
- */
-#define HAS_MONITOR            1
-#define LEGACY_MONITOR         0
-#define HAS_MONITOR_PUT                1
-#define AO_MONITOR_LED         AO_LED_GREEN
-#define AO_MONITOR_BAD         AO_LED_RED
-
-/*
- * Radio (cc1200)
- */
-
-/* gets pretty close to 434.550 */
-
-#define AO_RADIO_CAL_DEFAULT   5695733
-
-#define AO_FEC_DEBUG           0
-#define AO_CC1200_SPI_CS_PORT  0
-#define AO_CC1200_SPI_CS_PIN   3
-#define AO_CC1200_SPI_BUS      0
-#define AO_CC1200_SPI          0
-
-#define AO_CC1200_INT_PORT     0
-#define AO_CC1200_INT_PIN      2
-
-#define AO_CC1200_INT_GPIO     2
-#define AO_CC1200_INT_GPIO_IOCFG       CC1200_IOCFG2
-
-/*
- * Profiling Viterbi decoding
- */
-
-#ifndef AO_PROFILE
-#define AO_PROFILE             0
-#endif
-
-#endif /* _AO_PINS_H_ */

diff --git a/src/teledongle-v1.9/ao_teledongle.c b/src/teledongle-v1.9/ao_teledongle.c
deleted file mode 100644 (file)
index 02b93ef..0000000
--- a/src/teledongle-v1.9/ao_teledongle.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2012 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>
-#include <ao_packet.h>
-#include <ao_send_packet.h>
-
-int
-main(void)
-{
-       ao_clock_init();
-
-#if HAS_STACK_GUARD
-       ao_mpu_init();
-#endif
-
-       ao_task_init();
-       ao_led_init(LEDS_AVAILABLE);
-       ao_led_on(AO_LED_RED);
-       ao_timer_init();
-
-       ao_spi_init();
-       ao_exti_init();
-
-       ao_cmd_init();
-
-       ao_usb_init();
-       ao_radio_init();
-       ao_monitor_init();
-       ao_packet_master_init();
-       ao_send_packet_init();
-
-       ao_config_init();
-
-       ao_led_off(AO_LED_RED);
-       ao_start_scheduler();
-       return 0;
-}

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

diff --git a/src/teledongle-v1.9/flash-loader/ao_pins.h b/src/teledongle-v1.9/flash-loader/ao_pins.h
deleted file mode 100644 (file)
index aee5be2..0000000
--- a/src/teledongle-v1.9/flash-loader/ao_pins.h
+++ /dev/null
@@ -1,35 +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>
-
-/* Debug port TXD (pin 6) */
-
-#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/teledongle-v3.0/.gitignore b/src/teledongle-v3.0/.gitignore
new file mode 100644 (file)
index 0000000..9a30cbb
--- /dev/null
+++ b/src/teledongle-v3.0/.gitignore
@@ -0,0 +1,2 @@
+ao_product.h
+teledongle-*.elf

diff --git a/src/teledongle-v3.0/Makefile b/src/teledongle-v3.0/Makefile
new file mode 100644 (file)
index 0000000..a656cde
--- /dev/null
+++ b/src/teledongle-v3.0/Makefile
@@ -0,0 +1,79 @@
+#
+# AltOS build
+#
+#
+
+include ../lpc/Makefile.defs
+
+INC = \
+       ao.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
+       ao_boot.h \
+       ao_pins.h \
+       ao_product.h \
+       ao_task.h \
+       ao_whiten.h \
+       lpc.h \
+       ao_cc1200.h \
+       ao_cc1200_CC1200.h \
+       Makefile
+
+ALTOS_SRC = \
+       ao_boot_chain.c \
+       ao_interrupt.c \
+       ao_product.c \
+       ao_romconfig.c \
+       ao_cc1200.c \
+       ao_cmd.c \
+       ao_config.c \
+       ao_task.c \
+       ao_led_lpc.c \
+       ao_stdio.c \
+       ao_panic.c \
+       ao_timer_lpc.c \
+       ao_mutex.c \
+       ao_freq.c \
+       ao_spi_lpc.c \
+       ao_usb_lpc.c \
+       ao_exti_lpc.c \
+       ao_send_packet.c \
+       ao_monitor.c \
+       ao_packet_master.c \
+       ao_packet.c
+
+PRODUCT=TeleDongle-v3.0
+PRODUCT_DEF=-DTELEDONGLE
+IDPRODUCT=0x000c
+
+CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -Os -g
+
+PROGNAME=teledongle-v3.0
+PROG=$(PROGNAME)-$(VERSION).elf
+HEX=$(PROGNAME)-$(VERSION).ihx
+
+SRC=$(ALTOS_SRC) ao_teledongle.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG) $(HEX)
+
+$(PROG): Makefile $(OBJ) altos.ld
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+
+$(OBJ): $(INC)
+
+ao_product.h: ao-make-product.5c ../Version
+       $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+load: $(PROG)
+       lpc-load $(PROG)
+
+distclean:     clean
+
+clean:
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+       rm -f ao_product.h
+
+install:
+
+uninstall:

diff --git a/src/teledongle-v3.0/ao_pins.h b/src/teledongle-v3.0/ao_pins.h
new file mode 100644 (file)
index 0000000..c023b2c
--- /dev/null
+++ b/src/teledongle-v3.0/ao_pins.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2012 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.
+ */
+
+/* Using TeleDongle v3.0 board */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define AO_STACK_SIZE  324
+
+#define HAS_TASK_QUEUE         1
+
+#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_EEPROM             0
+#define USE_INTERNAL_FLASH     0
+#define USE_STORAGE_CONFIG     0
+#define USE_EEPROM_CONFIG      0
+
+#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 HAS_BEEP               0
+#define HAS_RADIO              1
+#define HAS_TELEMETRY          0
+#define HAS_RSSI               0
+
+#define HAS_SPI_0              1
+#define SPI_SCK0_P0_6          1
+
+#define PACKET_HAS_SLAVE       0
+#define PACKET_HAS_MASTER      1
+
+#define LOW_LEVEL_DEBUG                0
+
+#define LED_PORT               0
+#define LED_PIN_RED            14
+#define LED_PIN_GREEN          7
+#define AO_LED_RED             (1 << LED_PIN_RED)
+#define AO_LED_GREEN           (1 << LED_PIN_GREEN)
+
+#define LEDS_AVAILABLE         (AO_LED_RED | AO_LED_GREEN)
+
+#define HAS_GPS                        0
+#define HAS_FLIGHT             0
+#define HAS_ADC                        0
+#define HAS_LOG                        0
+
+/*
+ * Telemetry monitoring
+ */
+#define HAS_MONITOR            1
+#define LEGACY_MONITOR         0
+#define HAS_MONITOR_PUT                1
+#define AO_MONITOR_LED         AO_LED_GREEN
+#define AO_MONITOR_BAD         AO_LED_RED
+
+/*
+ * Radio (cc1200)
+ */
+
+/* gets pretty close to 434.550 */
+
+#define AO_RADIO_CAL_DEFAULT   5695733
+
+#define AO_FEC_DEBUG           0
+#define AO_CC1200_SPI_CS_PORT  0
+#define AO_CC1200_SPI_CS_PIN   3
+#define AO_CC1200_SPI_BUS      0
+#define AO_CC1200_SPI          0
+
+#define AO_CC1200_INT_PORT     0
+#define AO_CC1200_INT_PIN      2
+
+#define AO_CC1200_INT_GPIO     2
+#define AO_CC1200_INT_GPIO_IOCFG       CC1200_IOCFG2
+
+/*
+ * Profiling Viterbi decoding
+ */
+
+#ifndef AO_PROFILE
+#define AO_PROFILE             0
+#endif
+
+#endif /* _AO_PINS_H_ */

diff --git a/src/teledongle-v3.0/ao_teledongle.c b/src/teledongle-v3.0/ao_teledongle.c
new file mode 100644 (file)
index 0000000..02b93ef
--- /dev/null
+++ b/src/teledongle-v3.0/ao_teledongle.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2012 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>
+#include <ao_packet.h>
+#include <ao_send_packet.h>
+
+int
+main(void)
+{
+       ao_clock_init();
+
+#if HAS_STACK_GUARD
+       ao_mpu_init();
+#endif
+
+       ao_task_init();
+       ao_led_init(LEDS_AVAILABLE);
+       ao_led_on(AO_LED_RED);
+       ao_timer_init();
+
+       ao_spi_init();
+       ao_exti_init();
+
+       ao_cmd_init();
+
+       ao_usb_init();
+       ao_radio_init();
+       ao_monitor_init();
+       ao_packet_master_init();
+       ao_send_packet_init();
+
+       ao_config_init();
+
+       ao_led_off(AO_LED_RED);
+       ao_start_scheduler();
+       return 0;
+}

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

diff --git a/src/teledongle-v3.0/flash-loader/ao_pins.h b/src/teledongle-v3.0/flash-loader/ao_pins.h
new file mode 100644 (file)
index 0000000..aee5be2
--- /dev/null
+++ b/src/teledongle-v3.0/flash-loader/ao_pins.h
@@ -0,0 +1,35 @@
+/*
+ * 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>
+
+/* Debug port TXD (pin 6) */
+
+#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_ */