diff options
author | Keith Packard <keithp@keithp.com> | 2011-12-17 17:05:06 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-12-24 18:52:37 -0800 |
commit | 7d37595e08a4a78d44dd48f9247a0b1eb76a8c2d (patch) | |
tree | f2f6edd21c6399c7cdb84a49fb6fcc7759893a87 /src | |
parent | ca8709f9b14a6c312be54e296904c5eb3267fcf8 (diff) |
altos: Create TeleMetrum v1.2 directorybranch-1.0
The hardware is software-compatible with v1.1, but it's nice to have
the right version number in all of the files.
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit eff8611e3eb19853b06acfcd7e978c9046cd5f78)
(this is quite different from the master version which is multi-arch)
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 2 | ||||
-rw-r--r-- | src/ao_pins.h | 37 | ||||
-rw-r--r-- | src/ao_telemetry.c | 2 | ||||
-rw-r--r-- | src/telemetrum-v1.2/.gitignore | 2 | ||||
-rw-r--r-- | src/telemetrum-v1.2/.sdcdbrc | 1 | ||||
-rw-r--r-- | src/telemetrum-v1.2/Makefile | 1 | ||||
-rw-r--r-- | src/telemetrum-v1.2/Makefile.defs | 13 |
7 files changed, 56 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 018f0c5c..689c7410 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ CC=sdcc include Version SUBDIRS=\ - telemetrum-v1.1 telemetrum-v1.0 \ + 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 \ diff --git a/src/ao_pins.h b/src/ao_pins.h index e1f5459f..98016aa0 100644 --- a/src/ao_pins.h +++ b/src/ao_pins.h @@ -86,6 +86,43 @@ #define HAS_MONITOR 0 #endif +#if defined(TELEMETRUM_V_1_2) + #define HAS_FLIGHT 1 + #define HAS_USB 1 + #define HAS_BEEP 1 + #define HAS_GPS 1 + #define HAS_SERIAL_1 1 + #define USE_SERIAL_STDIN 0 + #define HAS_ADC 1 + #define HAS_EEPROM 1 + #define HAS_LOG 1 + #define USE_INTERNAL_FLASH 0 + #define HAS_DBG 1 + #define DBG_ON_P1 1 + #define DBG_ON_P0 0 + #define IGNITE_ON_P2 1 + #define IGNITE_ON_P0 0 + #define PACKET_HAS_MASTER 0 + #define PACKET_HAS_SLAVE 1 + + #define HAS_COMPANION 1 + #define COMPANION_CS_ON_P1 1 + #define COMPANION_CS_MASK 0x4 /* CS1 is P1_2 */ + #define COMPANION_CS P1_2 + + #define AO_LED_RED 1 + #define LEDS_AVAILABLE (AO_LED_RED) + #define HAS_EXTERNAL_TEMP 0 + #define HAS_ACCEL_REF 1 + #define SPI_CS_ON_P1 1 + #define SPI_CS_ON_P0 0 + #define M25_CS_MASK 0x02 /* CS0 is P1_1 */ + #define M25_MAX_CHIPS 1 + #define HAS_ACCEL 1 + #define HAS_IGNITE 1 + #define HAS_MONITOR 0 +#endif + #if defined(TELEDONGLE_V_0_2) #define HAS_FLIGHT 0 #define HAS_USB 1 diff --git a/src/ao_telemetry.c b/src/ao_telemetry.c index c7338a58..0622cbd7 100644 --- a/src/ao_telemetry.c +++ b/src/ao_telemetry.c @@ -35,7 +35,7 @@ static __pdata uint16_t ao_rdf_time; #define AO_RDF_INTERVAL_TICKS AO_SEC_TO_TICKS(5) #define AO_RDF_LENGTH_MS 500 -#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) +#if defined(TELEMETRUM_V_0_1) || defined(TELEMETRUM_V_0_2) || defined(TELEMETRUM_V_1_0) || defined(TELEMETRUM_V_1_1) || defined(TELEMETRUM_V_1_2) #define AO_TELEMETRY_SENSOR AO_TELEMETRY_SENSOR_TELEMETRUM #endif diff --git a/src/telemetrum-v1.2/.gitignore b/src/telemetrum-v1.2/.gitignore new file mode 100644 index 00000000..c2212151 --- /dev/null +++ b/src/telemetrum-v1.2/.gitignore @@ -0,0 +1,2 @@ +telemetrum-* +ao_product.h diff --git a/src/telemetrum-v1.2/.sdcdbrc b/src/telemetrum-v1.2/.sdcdbrc new file mode 100644 index 00000000..710b4a2f --- /dev/null +++ b/src/telemetrum-v1.2/.sdcdbrc @@ -0,0 +1 @@ +--directory=.. diff --git a/src/telemetrum-v1.2/Makefile b/src/telemetrum-v1.2/Makefile new file mode 100644 index 00000000..d8867b19 --- /dev/null +++ b/src/telemetrum-v1.2/Makefile @@ -0,0 +1 @@ +include ../Makefile.proto diff --git a/src/telemetrum-v1.2/Makefile.defs b/src/telemetrum-v1.2/Makefile.defs new file mode 100644 index 00000000..4c27de49 --- /dev/null +++ b/src/telemetrum-v1.2/Makefile.defs @@ -0,0 +1,13 @@ +PROG = telemetrum-v1.2-$(VERSION).ihx + +SRC = \ + $(TM_BASE_SRC) \ + $(SPI_DRIVER_SRC) \ + $(M25_DRIVER_SRC) \ + $(SKY_DRIVER_SRC) \ + $(COMPANION_SRC) \ + $(DBG_SRC) + +PRODUCT=TeleMetrum-v1.2 +PRODUCT_DEF=-DTELEMETRUM_V_1_2 +IDPRODUCT=0x000b |