From 28adf5541354715b185dbb45b28c97c7d9cf8bcd Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 8 Apr 2013 16:48:40 -0700 Subject: [PATCH] altos: Create telebt-v1.0 product. Remove old telebt products Signed-off-by: Keith Packard --- src/Makefile | 2 +- src/drivers/ao_btm.c | 2 +- src/telebt-v0.0/.sdcdbrc | 1 - src/telebt-v0.0/Makefile | 9 -- src/telebt-v0.1/.gitignore | 2 - src/telebt-v0.1/Makefile | 21 ----- src/{telebt-v0.0 => telebt-v1.0}/.gitignore | 0 src/{telebt-v0.1 => telebt-v1.0}/.sdcdbrc | 0 .../Makefile.telebt => telebt-v1.0/Makefile} | 11 ++- src/telebt-v1.0/ao_pins.h | 89 +++++++++++++++++++ src/{product => telebt-v1.0}/ao_telebt.c | 21 ----- src/teleshield-v0.1/ao_pins.h | 1 + 12 files changed, 97 insertions(+), 62 deletions(-) delete mode 100644 src/telebt-v0.0/.sdcdbrc delete mode 100644 src/telebt-v0.0/Makefile delete mode 100644 src/telebt-v0.1/.gitignore delete mode 100644 src/telebt-v0.1/Makefile rename src/{telebt-v0.0 => telebt-v1.0}/.gitignore (100%) rename src/{telebt-v0.1 => telebt-v1.0}/.sdcdbrc (100%) rename src/{product/Makefile.telebt => telebt-v1.0/Makefile} (91%) create mode 100644 src/telebt-v1.0/ao_pins.h rename src/{product => telebt-v1.0}/ao_telebt.c (76%) diff --git a/src/Makefile b/src/Makefile index 9e31e3ea..d91a235a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,7 +18,7 @@ SDCCDIRS=\ telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \ teledongle-v0.2 teledongle-v0.1 \ telemini-v1.0 telenano-v0.1 \ - telebt-v0.0 telebt-v0.1 \ + telebt-v1.0 \ telemetrum-v0.1-sky telemetrum-v0.1-sirf \ telelaunch-v0.1 tidongle test \ teleterra-v0.2 teleshield-v0.1 \ diff --git a/src/drivers/ao_btm.c b/src/drivers/ao_btm.c index de1f31a3..3b6028a0 100644 --- a/src/drivers/ao_btm.c +++ b/src/drivers/ao_btm.c @@ -302,7 +302,7 @@ ao_btm(void) while (!ao_btm_connected) ao_sleep(&ao_btm_connected); while (ao_btm_connected) { - ao_led_for(AO_LED_GREEN, AO_MS_TO_TICKS(20)); + ao_led_for(AO_BT_LED, AO_MS_TO_TICKS(20)); ao_delay(AO_SEC_TO_TICKS(3)); } } diff --git a/src/telebt-v0.0/.sdcdbrc b/src/telebt-v0.0/.sdcdbrc deleted file mode 100644 index 710b4a2f..00000000 --- a/src/telebt-v0.0/.sdcdbrc +++ /dev/null @@ -1 +0,0 @@ ---directory=.. diff --git a/src/telebt-v0.0/Makefile b/src/telebt-v0.0/Makefile deleted file mode 100644 index e89639ab..00000000 --- a/src/telebt-v0.0/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# TeleBT v0.0 build -# - -TELEBT_VER=0.0 -TELEBT_DEF=0_0 - -include ../product/Makefile.telebt - diff --git a/src/telebt-v0.1/.gitignore b/src/telebt-v0.1/.gitignore deleted file mode 100644 index 1acfbfcc..00000000 --- a/src/telebt-v0.1/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -telebt-* -ao_product.h diff --git a/src/telebt-v0.1/Makefile b/src/telebt-v0.1/Makefile deleted file mode 100644 index 90cd3cac..00000000 --- a/src/telebt-v0.1/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# TeleBT v0.1 build -# - -TELEBT_VER=0.1 -TELEBT_DEF=0_1 - -TELEBT_INC = \ - ao_25lc1024.h - -TELEBT_SRC = \ - ao_beep.c \ - ao_log_single.c \ - ao_log_telem.c \ - ao_report.c \ - ao_spi.c \ - ao_storage.c \ - ao_m25.c - -include ../product/Makefile.telebt - diff --git a/src/telebt-v0.0/.gitignore b/src/telebt-v1.0/.gitignore similarity index 100% rename from src/telebt-v0.0/.gitignore rename to src/telebt-v1.0/.gitignore diff --git a/src/telebt-v0.1/.sdcdbrc b/src/telebt-v1.0/.sdcdbrc similarity index 100% rename from src/telebt-v0.1/.sdcdbrc rename to src/telebt-v1.0/.sdcdbrc diff --git a/src/product/Makefile.telebt b/src/telebt-v1.0/Makefile similarity index 91% rename from src/product/Makefile.telebt rename to src/telebt-v1.0/Makefile index fd52cec4..1a3f1c80 100644 --- a/src/product/Makefile.telebt +++ b/src/telebt-v1.0/Makefile @@ -1,8 +1,9 @@ # # TeleBT build file # -# Define TELEBT_VER, TELEBT_DEF, TELEBT_INC and TELEBT_SRC -# and include this file + +TELEBT_VER=1.0 +TELEBT_DEF=1_0 vpath %.c ..:../core:../cc1111:../drivers:../product vpath %.h ..:../core:../cc1111:../drivers:../product @@ -18,8 +19,7 @@ INC = \ ao_arch.h \ ao_arch_funcs.h \ cc1111.h \ - ao_product.h \ - $(TELEBT_INC) + ao_product.h CORE_SRC = \ ao_cmd.c \ @@ -57,8 +57,7 @@ SRC = \ $(CORE_SRC) \ $(CC1111_SRC) \ $(DRIVER_SRC) \ - $(PRODUCT_SRC) \ - $(TELEBT_SRC) + $(PRODUCT_SRC) PROGNAME = telebt-v$(TELEBT_VER) PROG = $(PROGNAME)-$(VERSION).ihx diff --git a/src/telebt-v1.0/ao_pins.h b/src/telebt-v1.0/ao_pins.h new file mode 100644 index 00000000..b248521d --- /dev/null +++ b/src/telebt-v1.0/ao_pins.h @@ -0,0 +1,89 @@ +/* + * Copyright © 2010 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 + * 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_ + +#define HAS_RADIO 1 +#define HAS_FLIGHT 0 +#define HAS_USB 1 +#define HAS_BEEP 0 +#define HAS_SERIAL_1 1 +#define HAS_SERIAL_1_ALT_1 1 +#define HAS_SERIAL_1_ALT_2 0 +#define HAS_SERIAL_1_HW_FLOW 1 +#define USE_SERIAL_1_STDIN 1 +#define DELAY_SERIAL_1_STDIN 1 +#define HAS_ADC 0 +#define HAS_DBG 1 +#define HAS_EEPROM 0 +#define HAS_LOG 0 +#define USE_INTERNAL_FLASH 0 +#define HAS_BTM 1 +#define DBG_ON_P1 1 +#define DBG_ON_P0 0 +#define PACKET_HAS_MASTER 1 +#define PACKET_HAS_SLAVE 0 +#define AO_LED_RED 1 +#define AO_LED_BLUE 2 +#define LEDS_AVAILABLE (AO_LED_RED|AO_LED_BLUE) +#define AO_MONITOR_LED AO_LED_RED +#define AO_BT_LED AO_LED_BLUE +#define BT_LINK_ON_P2 0 +#define BT_LINK_ON_P1 1 +#define BT_LINK_PIN_INDEX 7 +#define BT_LINK_PIN P1_7 +#define HAS_MONITOR 1 +#define LEGACY_MONITOR 0 + +#if DBG_ON_P1 + + #define DBG_CLOCK (1 << 4) /* mi0 */ + #define DBG_DATA (1 << 5) /* mo0 */ + #define DBG_RESET_N (1 << 3) /* c0 */ + + #define DBG_CLOCK_PIN (P1_4) + #define DBG_DATA_PIN (P1_5) + #define DBG_RESET_N_PIN (P1_3) + + #define DBG_PORT_NUM 1 + #define DBG_PORT P1 + #define DBG_PORT_SEL P1SEL + #define DBG_PORT_INP P1INP + #define DBG_PORT_DIR P1DIR + +#endif /* DBG_ON_P1 */ + +#if DBG_ON_P0 + + #define DBG_CLOCK (1 << 3) + #define DBG_DATA (1 << 4) + #define DBG_RESET_N (1 << 5) + + #define DBG_CLOCK_PIN (P0_3) + #define DBG_DATA_PIN (P0_4) + #define DBG_RESET_N_PIN (P0_5) + + #define DBG_PORT_NUM 0 + #define DBG_PORT P0 + #define DBG_PORT_SEL P0SEL + #define DBG_PORT_INP P0INP + #define DBG_PORT_DIR P0DIR + +#endif /* DBG_ON_P0 */ + +#endif /* _AO_PINS_H_ */ diff --git a/src/product/ao_telebt.c b/src/telebt-v1.0/ao_telebt.c similarity index 76% rename from src/product/ao_telebt.c rename to src/telebt-v1.0/ao_telebt.c index 46c63418..89434e7e 100644 --- a/src/product/ao_telebt.c +++ b/src/telebt-v1.0/ao_telebt.c @@ -17,10 +17,6 @@ #include "ao.h" -#if HAS_LOG -__code uint8_t ao_log_format = AO_LOG_FORMAT_NONE; /* until we actually log stuff */ -#endif - void main(void) { @@ -30,31 +26,14 @@ main(void) ao_led_init(LEDS_AVAILABLE); ao_led_on(AO_LED_RED); ao_timer_init(); -#if HAS_BEEP - ao_beep_init(); -#endif ao_cmd_init(); -#if HAS_EEPROM - ao_spi_init(); - ao_storage_init(); -#endif ao_usb_init(); ao_monitor_init(); -#if HAS_LOG - ao_report_init(); -#endif ao_radio_init(); ao_packet_master_init(); ao_btm_init(); -#if HAS_LOG - ao_log_single_init(); -#endif #if HAS_DBG ao_dbg_init(); -#endif -#if HAS_AES - ao_aes_init(); - ao_radio_cmac_init(); #endif ao_config_init(); ao_start_scheduler(); diff --git a/src/teleshield-v0.1/ao_pins.h b/src/teleshield-v0.1/ao_pins.h index 888512b1..30239afc 100644 --- a/src/teleshield-v0.1/ao_pins.h +++ b/src/teleshield-v0.1/ao_pins.h @@ -46,6 +46,7 @@ #define AO_LED_RED 1 #define AO_LED_GREEN 2 #define AO_MONITOR_LED AO_LED_RED + #define AO_BT_LED AO_LED_GREEN #define LEDS_AVAILABLE (AO_LED_RED|AO_LED_GREEN) #define SPI_CS_ON_P1 1 #define SPI_CS_ON_P0 0 -- 2.30.2