From: Bdale Garbee Date: Mon, 28 Jan 2019 20:46:59 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos X-Git-Tag: 1.9.1~1^2~146 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=145e5a1ac557c4990e74fb64b005fc68d6941bdc;hp=e2c9ef801abacd2533d9b4321c24a490d4556134 Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos --- diff --git a/src/telefireeight-v2.0/Makefile b/src/telefireeight-v2.0/Makefile index b83a1d5c..7cc3720f 100644 --- a/src/telefireeight-v2.0/Makefile +++ b/src/telefireeight-v2.0/Makefile @@ -41,7 +41,6 @@ ALTOS_SRC = \ ao_freq.c \ ao_dma_stm.c \ ao_spi_stm.c \ - ao_beep_stm.c \ ao_eeprom_stm.c \ ao_usb_stm.c \ ao_exti_stm.c \ 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 diff --git a/src/telefireeight-v2.0/flash-loader/ao_pins.h b/src/telefireeight-v2.0/flash-loader/ao_pins.h index 889feef6..f3ae76fa 100644 --- a/src/telefireeight-v2.0/flash-loader/ao_pins.h +++ b/src/telefireeight-v2.0/flash-loader/ao_pins.h @@ -1,5 +1,5 @@ /* - * Copyright © 2013 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