From e40407467f28ab44b9f7c7d51a65a51f802410d5 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 28 Jan 2019 11:33:19 -0800 Subject: [PATCH] altos: Delete unused config bits for telefireeight-v2.0. Add Makefile Clean up the config and set the copyright year. Signed-off-by: Keith Packard --- src/telefireeight-v2.0/Makefile | 89 ++++++++++++++++++++++++++++++++ src/telefireeight-v2.0/ao_pins.h | 20 +------ 2 files changed, 91 insertions(+), 18 deletions(-) create mode 100644 src/telefireeight-v2.0/Makefile diff --git a/src/telefireeight-v2.0/Makefile b/src/telefireeight-v2.0/Makefile new file mode 100644 index 00000000..0762b578 --- /dev/null +++ b/src/telefireeight-v2.0/Makefile @@ -0,0 +1,89 @@ +# +# TeleFire build file +# + +include ../stm/Makefile.defs + +INC = \ + ao.h \ + ao_pins.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_eeprom_stm.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 + +PRODUCT_SRC = \ + ao_telefireeight.c + +PRODUCT=TeleFireEight-v2.0 +PRODUCT_DEF=-DTELEFIREEIGHT_V_2_0 +IDPRODUCT=0x000f + +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g + +PROGNAME = telefireeight-v2.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/telefireeight-v2.0/ao_pins.h b/src/telefireeight-v2.0/ao_pins.h index c15e06bf..046514b4 100644 --- a/src/telefireeight-v2.0/ao_pins.h +++ b/src/telefireeight-v2.0/ao_pins.h @@ -1,5 +1,5 @@ /* - * Copyright © 2010 Keith Packard + * Copyright © 2019 Keith Packard * * 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 @@ -25,10 +25,6 @@ #define HAS_FLIGHT 0 #define HAS_USB 1 #define HAS_BEEP 0 -#define BEEPER_TIMER 3 -#define BEEPER_CHANNEL 1 -#define BEEPER_PORT (&stm_gpioc) -#define BEEPER_PIN 6 #define HAS_GPS 0 #define HAS_SERIAL_1 0 #define HAS_ADC 1 @@ -37,9 +33,6 @@ #define HAS_LOG 0 #define HAS_PAD 1 #define USE_INTERNAL_FLASH 1 -#define IGNITE_ON_P0 0 -#define PACKET_HAS_MASTER 0 -#define PACKET_HAS_SLAVE 0 #define AO_DATA_RING 32 #define USE_EEPROM_CONFIG 1 #define USE_STORAGE_CONFIG 0 @@ -75,9 +68,6 @@ #define SPI_1_PB3_PB4_PB5 0 #define SPI_1_PE13_PE14_PE15 1 #define SPI_1_GPIO (&stm_gpioe) -#define SPI_1_SCK 13 -#define SPI_1_MISO 14 -#define SPI_1_MOSI 15 #define SPI_1_OSPEEDR STM_OSPEEDR_10MHz #define HAS_SPI_2 0 @@ -88,11 +78,6 @@ #define HAS_I2C_2 0 -#define PACKET_HAS_SLAVE 0 -#define PACKET_HAS_MASTER 0 - -#define FAST_TIMER_FREQ 10000 /* .1ms for debouncing */ - /* * Radio is a cc1200 connected via SPI */ @@ -139,7 +124,7 @@ #define LED_8_PORT (&stm_gpioe) #define LED_8_PIN 3 -#define LED_PIN_ARMED 8 +#define AO_LED_ARMED AO_LED_8 /* RF good/marginal/poor */ #define LED_9_PORT (&stm_gpioe) @@ -149,7 +134,6 @@ #define LED_11_PORT (&stm_gpioe) #define LED_11_PIN 6 -#define AO_LED_ARMED AO_LED_8 #define AO_LED_GREEN AO_LED_9 #define AO_LED_AMBER AO_LED_10 #define AO_LED_RED AO_LED_11 -- 2.30.2