re-brand current telefiretwo product as telefireone
authorBdale Garbee <bdale@gag.com>
Mon, 15 May 2017 16:16:33 +0000 (10:16 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 15 May 2017 16:17:35 +0000 (10:17 -0600)
12 files changed:
src/telefireone-v1.0/Makefile [new file with mode: 0644]
src/telefireone-v1.0/ao_pins.h [new file with mode: 0644]
src/telefireone-v1.0/ao_telefiretwo.c [new file with mode: 0644]
src/telefireone-v1.0/flash-loader/.gitignore [new file with mode: 0644]
src/telefireone-v1.0/flash-loader/Makefile [new file with mode: 0644]
src/telefireone-v1.0/flash-loader/ao_pins.h [new file with mode: 0644]
src/telefiretwo-v1.0/Makefile [deleted file]
src/telefiretwo-v1.0/ao_pins.h [deleted file]
src/telefiretwo-v1.0/ao_telefiretwo.c [deleted file]
src/telefiretwo-v1.0/flash-loader/.gitignore [deleted file]
src/telefiretwo-v1.0/flash-loader/Makefile [deleted file]
src/telefiretwo-v1.0/flash-loader/ao_pins.h [deleted file]

diff --git a/src/telefireone-v1.0/Makefile b/src/telefireone-v1.0/Makefile
new file mode 100644 (file)
index 0000000..87d5d47
--- /dev/null
@@ -0,0 +1,95 @@
+#
+# TeleFire build file
+#
+
+include ../stm/Makefile.defs
+
+INC = \
+       ao.h \
+       ao_pins.h \
+       ao_log.h \
+       ao_arch.h \
+       ao_arch_funcs.h \
+       ao_pad.h \
+       ao_product.h \
+       ao_radio_spi.h \
+       ao_radio_cmac.h \
+       ao_cc1200_CC1200.h \
+       ao_cc1200.h \
+       stm32l.h
+#
+# Common AltOS sources
+#
+
+#PROFILE=ao_profile.c
+#PROFILE_DEF=-DAO_PROFILE=1
+
+ALTOS_SRC = \
+       ao_boot_chain.c \
+       ao_interrupt.c \
+       ao_product.c \
+       ao_romconfig.c \
+       ao_cmd.c \
+       ao_adc_stm.c \
+       ao_data.c \
+       ao_config.c \
+       ao_task.c \
+       ao_led.c \
+       ao_stdio.c \
+       ao_panic.c \
+       ao_timer.c \
+       ao_mutex.c \
+       ao_freq.c \
+       ao_dma_stm.c \
+       ao_spi_stm.c \
+       ao_beep_stm.c \
+       ao_eeprom_stm.c \
+       ao_storage.c \
+       ao_m25.c \
+       ao_usb_stm.c \
+       ao_exti_stm.c \
+       ao_cc1200.c \
+       ao_radio_cmac.c \
+       ao_aes.c \
+       ao_aes_tables.c \
+       ao_pad.c \
+       ao_radio_cmac_cmd.c \
+       ao_log.c \
+       ao_log_firetwo.c
+
+PRODUCT_SRC = \
+       ao_telefiretwo.c
+
+PRODUCT=TeleFireTwo-v1.0
+PRODUCT_DEF=-DTELEFIRETWO_V_1_0
+IDPRODUCT=0x000f
+
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g
+
+PROGNAME = telefiretwo-v1.0
+PROG = $(PROGNAME)-$(VERSION).elf
+HEX = $(PROGNAME)-$(VERSION).ihx
+
+SRC = $(ALTOS_SRC) $(PRODUCT_SRC)
+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) > $@
+
+distclean:     clean
+
+clean:
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+       rm -f ao_product.h
+
+install:
+
+uninstall:
+
diff --git a/src/telefireone-v1.0/ao_pins.h b/src/telefireone-v1.0/ao_pins.h
new file mode 100644 (file)
index 0000000..b2f5a5a
--- /dev/null
@@ -0,0 +1,233 @@
+/*
+ * Copyright © 2010 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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_
+
+#define HAS_RADIO              1
+#define HAS_RADIO_RATE         1
+#define HAS_TELEMETRY          0
+
+#define HAS_FLIGHT             0
+#define HAS_USB                        1
+#define HAS_BEEP               1
+#define BEEPER_CHANNEL         4
+#define HAS_GPS                        0
+#define HAS_SERIAL_1           0
+#define HAS_ADC                        1
+#define HAS_DBG                        0
+#define HAS_EEPROM             1
+#define HAS_LOG                        1
+#define HAS_PAD                        1
+#define USE_INTERNAL_FLASH     0
+#define IGNITE_ON_P0           0
+#define PACKET_HAS_MASTER      0
+#define PACKET_HAS_SLAVE       0
+#define AO_DATA_RING           32
+#define HAS_FIXED_PAD_BOX      1
+
+#define LOG_ERASE_MARK         0x55
+
+/* 8MHz High speed external crystal */
+#define AO_HSE                 8000000
+
+/* PLLVCO = 96MHz (so that USB will work) */
+#define AO_PLLMUL              12
+#define AO_RCC_CFGR_PLLMUL     (STM_RCC_CFGR_PLLMUL_12)
+
+#define AO_CC1200_FOSC         40000000
+
+/* SYSCLK = 32MHz (no need to go faster than CPU) */
+#define AO_PLLDIV              3
+#define AO_RCC_CFGR_PLLDIV     (STM_RCC_CFGR_PLLDIV_3)
+
+/* HCLK = 32MHz (CPU clock) */
+#define AO_AHB_PRESCALER       1
+#define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
+
+/* Run APB1 at 16MHz (HCLK/2) */
+#define AO_APB1_PRESCALER      2
+#define AO_RCC_CFGR_PPRE1_DIV  STM_RCC_CFGR_PPRE2_DIV_2
+
+/* Run APB2 at 16MHz (HCLK/2) */
+#define AO_APB2_PRESCALER      2
+#define AO_RCC_CFGR_PPRE2_DIV  STM_RCC_CFGR_PPRE2_DIV_2
+
+#define HAS_EEPROM             1
+#define USE_EEPROM_CONFIG      1
+#define USE_STORAGE_CONFIG     0
+#define HAS_USB                        1
+#define HAS_RADIO              1
+#define HAS_RADIO_RATE         1
+#define HAS_TELEMETRY          0
+#define HAS_AES                        1
+
+#define HAS_SPI_1              0
+#define SPI_1_PA5_PA6_PA7      0
+#define SPI_1_PB3_PB4_PB5      0
+#define SPI_1_PE13_PE14_PE15   0
+
+#define HAS_SPI_2              1       /* CC1200 */
+#define SPI_2_PB13_PB14_PB15   1
+#define SPI_2_PD1_PD3_PD4      0
+#define SPI_2_GPIO             (&stm_gpiob)
+#define SPI_2_SCK              13
+#define SPI_2_MISO             14
+#define SPI_2_MOSI             15
+#define SPI_2_OSPEEDR          STM_OSPEEDR_10MHz
+
+#define HAS_I2C_1              0
+
+#define HAS_I2C_2              0
+
+#define PACKET_HAS_SLAVE       0
+#define PACKET_HAS_MASTER      0
+
+#define FAST_TIMER_FREQ                10000   /* .1ms for debouncing */
+
+/*
+ * SPI Flash memory
+ */
+
+#define M25_MAX_CHIPS           1
+#define AO_M25_SPI_CS_PORT      (&stm_gpioa)
+#define AO_M25_SPI_CS_MASK      (1 << 15)
+#define AO_M25_SPI_BUS          AO_SPI_2_PB13_PB14_PB15
+
+/*
+ * Radio is a cc1200 connected via SPI
+ */
+
+#define AO_RADIO_CAL_DEFAULT   5695733
+
+#define AO_FEC_DEBUG           0
+#define AO_CC1200_SPI_CS_PORT  (&stm_gpioa)
+#define AO_CC1200_SPI_CS_PIN   7
+#define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
+#define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
+
+#define AO_CC1200_INT_PORT             (&stm_gpiob)
+#define AO_CC1200_INT_PIN              (11)
+
+#define AO_CC1200_INT_GPIO     2
+#define AO_CC1200_INT_GPIO_IOCFG       CC1200_IOCFG2
+
+#define LED_PORT_0             (&stm_gpioa)
+#define LED_PORT_1             (&stm_gpiob)
+
+#define LED_PORT_0_ENABLE      STM_RCC_AHBENR_GPIOAEN
+#define LED_PORT_1_ENABLE      STM_RCC_AHBENR_GPIOBEN
+
+/* Port A, pins 4-6 */
+#define LED_PORT_0_SHIFT       4
+#define LED_PORT_0_MASK                0x7
+#define LED_PIN_GREEN          0
+#define LED_PIN_AMBER          1
+#define LED_PIN_RED            2
+#define AO_LED_RED             (1 << LED_PIN_RED)
+#define AO_LED_AMBER           (1 << LED_PIN_AMBER)
+#define AO_LED_GREEN           (1 << LED_PIN_GREEN)
+
+/* Port B, pins 4-5 */
+#define LED_PORT_1_SHIFT       0
+#define LED_PORT_1_MASK                (0x3 << 4)
+#define LED_PIN_CONT_0         4
+#define LED_PIN_ARMED          5
+
+#define AO_LED_ARMED           (1 << LED_PIN_ARMED)
+#define AO_LED_CONTINUITY(c)   (1 << (4 - (c)))
+#define AO_LED_CONTINUITY_MASK (0x1 << 4)
+
+#define LEDS_AVAILABLE         (LED_PORT_0_MASK|LED_PORT_1_MASK)
+
+/* Alarm A */
+#define AO_SIREN
+#define AO_SIREN_PORT          (&stm_gpiob)
+#define AO_SIREN_PIN           8
+
+/* Alarm B */
+#define AO_STROBE
+#define AO_STROBE_PORT         (&stm_gpiob)
+#define AO_STROBE_PIN          9
+
+#define SPI_CONST      0x00
+
+#define AO_PAD_NUM             1
+#define        AO_PAD_PORT             (&stm_gpioa)
+
+#define AO_PAD_PIN_0           1
+#define AO_PAD_ADC_0           0
+
+#define AO_PAD_ALL_PINS                ((1 << AO_PAD_PIN_0))
+#define AO_PAD_ALL_CHANNELS    ((1 << 0))
+
+/* test these values with real igniters */
+#define AO_PAD_RELAY_CLOSED    3524
+#define AO_PAD_NO_IGNITER      16904
+#define AO_PAD_GOOD_IGNITER    22514
+
+#define AO_PAD_ADC_PYRO                2
+#define AO_PAD_ADC_BATT                8
+
+#define AO_PAD_ADC_THRUST      3
+#define AO_PAD_ADC_PRESSURE    18
+
+#define AO_ADC_FIRST_PIN       0
+
+#define AO_NUM_ADC             5
+
+#define AO_ADC_SQ1             AO_PAD_ADC_0
+#define AO_ADC_SQ2             AO_PAD_ADC_PYRO
+#define AO_ADC_SQ3             AO_PAD_ADC_BATT
+#define AO_ADC_SQ4             AO_PAD_ADC_THRUST
+#define AO_ADC_SQ5             AO_PAD_ADC_PRESSURE
+
+#define AO_PYRO_R_PYRO_SENSE   200
+#define AO_PYRO_R_SENSE_GND    22
+
+#define AO_FIRE_R_POWER_FET    0
+#define AO_FIRE_R_FET_SENSE    200
+#define AO_FIRE_R_SENSE_GND    22
+
+#define HAS_ADC_TEMP           0
+
+struct ao_adc {
+       int16_t         sense[AO_PAD_NUM];
+       int16_t         pyro;
+       int16_t         batt;
+       int16_t         thrust;
+       int16_t         pressure;
+};
+
+#define AO_ADC_DUMP(p)                                                 \
+       printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
+               (p)->tick,                                              \
+               (p)->adc.sense[0],                                      \
+               (p)->adc.pyro,                                          \
+               (p)->adc.batt,                                          \
+               (p)->adc.thrust,                                        \
+               (p)->adc.pressure)
+
+#define AO_ADC_PINS    ((1 << AO_PAD_ADC_0) | \
+                        (1 << AO_PAD_ADC_PYRO) | \
+                        (1 << AO_PAD_ADC_BATT) | \
+                        (1 << AO_PAD_ADC_THRUST) | \
+                        (1 << AO_PAD_ADC_PRESSURE))
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telefireone-v1.0/ao_telefiretwo.c b/src/telefireone-v1.0/ao_telefiretwo.c
new file mode 100644 (file)
index 0000000..115b3e9
--- /dev/null
@@ -0,0 +1,73 @@
+/*
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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_log.h>
+#include <ao_pad.h>
+#include <ao_exti.h>
+#include <ao_radio_cmac_cmd.h>
+#include <ao_eeprom.h>
+
+static void
+set_logging(void)
+{
+       ao_cmd_hex();
+       ao_log_running = ao_cmd_lex_i;
+       ao_wakeup(&ao_log_running);
+}
+
+__code struct ao_cmds ao_firetwo_cmds[] = {
+        { set_logging,  "L <0 off, 1 on>\0Log sensors to flash" },
+        { 0,    NULL },
+};
+
+void
+main(void)
+{
+       ao_clock_init();
+
+       ao_led_init(LEDS_AVAILABLE);
+
+       ao_task_init();
+
+       ao_timer_init();
+       ao_spi_init();
+       ao_dma_init();
+       ao_exti_init();
+
+       ao_cmd_register(&ao_firetwo_cmds[0]);
+       ao_cmd_init();
+
+       ao_adc_init();
+
+       ao_eeprom_init();
+       ao_storage_init();
+       ao_log_init();
+
+       ao_radio_init();
+
+       ao_usb_init();
+
+       ao_config_init();
+
+       ao_pad_init();
+
+//     ao_radio_cmac_cmd_init();
+
+       ao_start_scheduler();
+}
diff --git a/src/telefireone-v1.0/flash-loader/.gitignore b/src/telefireone-v1.0/flash-loader/.gitignore
new file mode 100644 (file)
index 0000000..65fe7ea
--- /dev/null
@@ -0,0 +1,2 @@
+*.elf
+*.ihx
diff --git a/src/telefireone-v1.0/flash-loader/Makefile b/src/telefireone-v1.0/flash-loader/Makefile
new file mode 100644 (file)
index 0000000..d429dcc
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# AltOS flash loader build
+#
+#
+
+TOPDIR=../..
+HARDWARE=telefiretwo-v1.0
+include $(TOPDIR)/stm/Makefile-flash.defs
diff --git a/src/telefireone-v1.0/flash-loader/ao_pins.h b/src/telefireone-v1.0/flash-loader/ao_pins.h
new file mode 100644 (file)
index 0000000..ded45a4
--- /dev/null
@@ -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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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_
+
+/* External crystal at 8MHz */
+#define AO_HSE         8000000
+
+#include <ao_flash_stm_pins.h>
+
+#define AO_BOOT_PIN                    1
+#define AO_BOOT_APPLICATION_GPIO       stm_gpiob
+#define AO_BOOT_APPLICATION_PIN                6
+#define AO_BOOT_APPLICATION_VALUE      1
+#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telefiretwo-v1.0/Makefile b/src/telefiretwo-v1.0/Makefile
deleted file mode 100644 (file)
index 87d5d47..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# TeleFire build file
-#
-
-include ../stm/Makefile.defs
-
-INC = \
-       ao.h \
-       ao_pins.h \
-       ao_log.h \
-       ao_arch.h \
-       ao_arch_funcs.h \
-       ao_pad.h \
-       ao_product.h \
-       ao_radio_spi.h \
-       ao_radio_cmac.h \
-       ao_cc1200_CC1200.h \
-       ao_cc1200.h \
-       stm32l.h
-#
-# Common AltOS sources
-#
-
-#PROFILE=ao_profile.c
-#PROFILE_DEF=-DAO_PROFILE=1
-
-ALTOS_SRC = \
-       ao_boot_chain.c \
-       ao_interrupt.c \
-       ao_product.c \
-       ao_romconfig.c \
-       ao_cmd.c \
-       ao_adc_stm.c \
-       ao_data.c \
-       ao_config.c \
-       ao_task.c \
-       ao_led.c \
-       ao_stdio.c \
-       ao_panic.c \
-       ao_timer.c \
-       ao_mutex.c \
-       ao_freq.c \
-       ao_dma_stm.c \
-       ao_spi_stm.c \
-       ao_beep_stm.c \
-       ao_eeprom_stm.c \
-       ao_storage.c \
-       ao_m25.c \
-       ao_usb_stm.c \
-       ao_exti_stm.c \
-       ao_cc1200.c \
-       ao_radio_cmac.c \
-       ao_aes.c \
-       ao_aes_tables.c \
-       ao_pad.c \
-       ao_radio_cmac_cmd.c \
-       ao_log.c \
-       ao_log_firetwo.c
-
-PRODUCT_SRC = \
-       ao_telefiretwo.c
-
-PRODUCT=TeleFireTwo-v1.0
-PRODUCT_DEF=-DTELEFIRETWO_V_1_0
-IDPRODUCT=0x000f
-
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g
-
-PROGNAME = telefiretwo-v1.0
-PROG = $(PROGNAME)-$(VERSION).elf
-HEX = $(PROGNAME)-$(VERSION).ihx
-
-SRC = $(ALTOS_SRC) $(PRODUCT_SRC)
-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) > $@
-
-distclean:     clean
-
-clean:
-       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
-       rm -f ao_product.h
-
-install:
-
-uninstall:
-
diff --git a/src/telefiretwo-v1.0/ao_pins.h b/src/telefiretwo-v1.0/ao_pins.h
deleted file mode 100644 (file)
index b2f5a5a..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright © 2010 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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_
-
-#define HAS_RADIO              1
-#define HAS_RADIO_RATE         1
-#define HAS_TELEMETRY          0
-
-#define HAS_FLIGHT             0
-#define HAS_USB                        1
-#define HAS_BEEP               1
-#define BEEPER_CHANNEL         4
-#define HAS_GPS                        0
-#define HAS_SERIAL_1           0
-#define HAS_ADC                        1
-#define HAS_DBG                        0
-#define HAS_EEPROM             1
-#define HAS_LOG                        1
-#define HAS_PAD                        1
-#define USE_INTERNAL_FLASH     0
-#define IGNITE_ON_P0           0
-#define PACKET_HAS_MASTER      0
-#define PACKET_HAS_SLAVE       0
-#define AO_DATA_RING           32
-#define HAS_FIXED_PAD_BOX      1
-
-#define LOG_ERASE_MARK         0x55
-
-/* 8MHz High speed external crystal */
-#define AO_HSE                 8000000
-
-/* PLLVCO = 96MHz (so that USB will work) */
-#define AO_PLLMUL              12
-#define AO_RCC_CFGR_PLLMUL     (STM_RCC_CFGR_PLLMUL_12)
-
-#define AO_CC1200_FOSC         40000000
-
-/* SYSCLK = 32MHz (no need to go faster than CPU) */
-#define AO_PLLDIV              3
-#define AO_RCC_CFGR_PLLDIV     (STM_RCC_CFGR_PLLDIV_3)
-
-/* HCLK = 32MHz (CPU clock) */
-#define AO_AHB_PRESCALER       1
-#define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
-
-/* Run APB1 at 16MHz (HCLK/2) */
-#define AO_APB1_PRESCALER      2
-#define AO_RCC_CFGR_PPRE1_DIV  STM_RCC_CFGR_PPRE2_DIV_2
-
-/* Run APB2 at 16MHz (HCLK/2) */
-#define AO_APB2_PRESCALER      2
-#define AO_RCC_CFGR_PPRE2_DIV  STM_RCC_CFGR_PPRE2_DIV_2
-
-#define HAS_EEPROM             1
-#define USE_EEPROM_CONFIG      1
-#define USE_STORAGE_CONFIG     0
-#define HAS_USB                        1
-#define HAS_RADIO              1
-#define HAS_RADIO_RATE         1
-#define HAS_TELEMETRY          0
-#define HAS_AES                        1
-
-#define HAS_SPI_1              0
-#define SPI_1_PA5_PA6_PA7      0
-#define SPI_1_PB3_PB4_PB5      0
-#define SPI_1_PE13_PE14_PE15   0
-
-#define HAS_SPI_2              1       /* CC1200 */
-#define SPI_2_PB13_PB14_PB15   1
-#define SPI_2_PD1_PD3_PD4      0
-#define SPI_2_GPIO             (&stm_gpiob)
-#define SPI_2_SCK              13
-#define SPI_2_MISO             14
-#define SPI_2_MOSI             15
-#define SPI_2_OSPEEDR          STM_OSPEEDR_10MHz
-
-#define HAS_I2C_1              0
-
-#define HAS_I2C_2              0
-
-#define PACKET_HAS_SLAVE       0
-#define PACKET_HAS_MASTER      0
-
-#define FAST_TIMER_FREQ                10000   /* .1ms for debouncing */
-
-/*
- * SPI Flash memory
- */
-
-#define M25_MAX_CHIPS           1
-#define AO_M25_SPI_CS_PORT      (&stm_gpioa)
-#define AO_M25_SPI_CS_MASK      (1 << 15)
-#define AO_M25_SPI_BUS          AO_SPI_2_PB13_PB14_PB15
-
-/*
- * Radio is a cc1200 connected via SPI
- */
-
-#define AO_RADIO_CAL_DEFAULT   5695733
-
-#define AO_FEC_DEBUG           0
-#define AO_CC1200_SPI_CS_PORT  (&stm_gpioa)
-#define AO_CC1200_SPI_CS_PIN   7
-#define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
-#define AO_CC1200_SPI          stm_spi2
-#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
-
-#define AO_CC1200_INT_PORT             (&stm_gpiob)
-#define AO_CC1200_INT_PIN              (11)
-
-#define AO_CC1200_INT_GPIO     2
-#define AO_CC1200_INT_GPIO_IOCFG       CC1200_IOCFG2
-
-#define LED_PORT_0             (&stm_gpioa)
-#define LED_PORT_1             (&stm_gpiob)
-
-#define LED_PORT_0_ENABLE      STM_RCC_AHBENR_GPIOAEN
-#define LED_PORT_1_ENABLE      STM_RCC_AHBENR_GPIOBEN
-
-/* Port A, pins 4-6 */
-#define LED_PORT_0_SHIFT       4
-#define LED_PORT_0_MASK                0x7
-#define LED_PIN_GREEN          0
-#define LED_PIN_AMBER          1
-#define LED_PIN_RED            2
-#define AO_LED_RED             (1 << LED_PIN_RED)
-#define AO_LED_AMBER           (1 << LED_PIN_AMBER)
-#define AO_LED_GREEN           (1 << LED_PIN_GREEN)
-
-/* Port B, pins 4-5 */
-#define LED_PORT_1_SHIFT       0
-#define LED_PORT_1_MASK                (0x3 << 4)
-#define LED_PIN_CONT_0         4
-#define LED_PIN_ARMED          5
-
-#define AO_LED_ARMED           (1 << LED_PIN_ARMED)
-#define AO_LED_CONTINUITY(c)   (1 << (4 - (c)))
-#define AO_LED_CONTINUITY_MASK (0x1 << 4)
-
-#define LEDS_AVAILABLE         (LED_PORT_0_MASK|LED_PORT_1_MASK)
-
-/* Alarm A */
-#define AO_SIREN
-#define AO_SIREN_PORT          (&stm_gpiob)
-#define AO_SIREN_PIN           8
-
-/* Alarm B */
-#define AO_STROBE
-#define AO_STROBE_PORT         (&stm_gpiob)
-#define AO_STROBE_PIN          9
-
-#define SPI_CONST      0x00
-
-#define AO_PAD_NUM             1
-#define        AO_PAD_PORT             (&stm_gpioa)
-
-#define AO_PAD_PIN_0           1
-#define AO_PAD_ADC_0           0
-
-#define AO_PAD_ALL_PINS                ((1 << AO_PAD_PIN_0))
-#define AO_PAD_ALL_CHANNELS    ((1 << 0))
-
-/* test these values with real igniters */
-#define AO_PAD_RELAY_CLOSED    3524
-#define AO_PAD_NO_IGNITER      16904
-#define AO_PAD_GOOD_IGNITER    22514
-
-#define AO_PAD_ADC_PYRO                2
-#define AO_PAD_ADC_BATT                8
-
-#define AO_PAD_ADC_THRUST      3
-#define AO_PAD_ADC_PRESSURE    18
-
-#define AO_ADC_FIRST_PIN       0
-
-#define AO_NUM_ADC             5
-
-#define AO_ADC_SQ1             AO_PAD_ADC_0
-#define AO_ADC_SQ2             AO_PAD_ADC_PYRO
-#define AO_ADC_SQ3             AO_PAD_ADC_BATT
-#define AO_ADC_SQ4             AO_PAD_ADC_THRUST
-#define AO_ADC_SQ5             AO_PAD_ADC_PRESSURE
-
-#define AO_PYRO_R_PYRO_SENSE   200
-#define AO_PYRO_R_SENSE_GND    22
-
-#define AO_FIRE_R_POWER_FET    0
-#define AO_FIRE_R_FET_SENSE    200
-#define AO_FIRE_R_SENSE_GND    22
-
-#define HAS_ADC_TEMP           0
-
-struct ao_adc {
-       int16_t         sense[AO_PAD_NUM];
-       int16_t         pyro;
-       int16_t         batt;
-       int16_t         thrust;
-       int16_t         pressure;
-};
-
-#define AO_ADC_DUMP(p)                                                 \
-       printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
-               (p)->tick,                                              \
-               (p)->adc.sense[0],                                      \
-               (p)->adc.pyro,                                          \
-               (p)->adc.batt,                                          \
-               (p)->adc.thrust,                                        \
-               (p)->adc.pressure)
-
-#define AO_ADC_PINS    ((1 << AO_PAD_ADC_0) | \
-                        (1 << AO_PAD_ADC_PYRO) | \
-                        (1 << AO_PAD_ADC_BATT) | \
-                        (1 << AO_PAD_ADC_THRUST) | \
-                        (1 << AO_PAD_ADC_PRESSURE))
-
-#endif /* _AO_PINS_H_ */
diff --git a/src/telefiretwo-v1.0/ao_telefiretwo.c b/src/telefiretwo-v1.0/ao_telefiretwo.c
deleted file mode 100644 (file)
index 115b3e9..0000000
+++ /dev/null
@@ -1,73 +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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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_log.h>
-#include <ao_pad.h>
-#include <ao_exti.h>
-#include <ao_radio_cmac_cmd.h>
-#include <ao_eeprom.h>
-
-static void
-set_logging(void)
-{
-       ao_cmd_hex();
-       ao_log_running = ao_cmd_lex_i;
-       ao_wakeup(&ao_log_running);
-}
-
-__code struct ao_cmds ao_firetwo_cmds[] = {
-        { set_logging,  "L <0 off, 1 on>\0Log sensors to flash" },
-        { 0,    NULL },
-};
-
-void
-main(void)
-{
-       ao_clock_init();
-
-       ao_led_init(LEDS_AVAILABLE);
-
-       ao_task_init();
-
-       ao_timer_init();
-       ao_spi_init();
-       ao_dma_init();
-       ao_exti_init();
-
-       ao_cmd_register(&ao_firetwo_cmds[0]);
-       ao_cmd_init();
-
-       ao_adc_init();
-
-       ao_eeprom_init();
-       ao_storage_init();
-       ao_log_init();
-
-       ao_radio_init();
-
-       ao_usb_init();
-
-       ao_config_init();
-
-       ao_pad_init();
-
-//     ao_radio_cmac_cmd_init();
-
-       ao_start_scheduler();
-}
diff --git a/src/telefiretwo-v1.0/flash-loader/.gitignore b/src/telefiretwo-v1.0/flash-loader/.gitignore
deleted file mode 100644 (file)
index 65fe7ea..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-*.elf
-*.ihx
diff --git a/src/telefiretwo-v1.0/flash-loader/Makefile b/src/telefiretwo-v1.0/flash-loader/Makefile
deleted file mode 100644 (file)
index d429dcc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# AltOS flash loader build
-#
-#
-
-TOPDIR=../..
-HARDWARE=telefiretwo-v1.0
-include $(TOPDIR)/stm/Makefile-flash.defs
diff --git a/src/telefiretwo-v1.0/flash-loader/ao_pins.h b/src/telefiretwo-v1.0/flash-loader/ao_pins.h
deleted file mode 100644 (file)
index ded45a4..0000000
+++ /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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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_
-
-/* External crystal at 8MHz */
-#define AO_HSE         8000000
-
-#include <ao_flash_stm_pins.h>
-
-#define AO_BOOT_PIN                    1
-#define AO_BOOT_APPLICATION_GPIO       stm_gpiob
-#define AO_BOOT_APPLICATION_PIN                6
-#define AO_BOOT_APPLICATION_VALUE      1
-#define AO_BOOT_APPLICATION_MODE       AO_EXTI_MODE_PULL_UP
-
-#endif /* _AO_PINS_H_ */