diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-04 17:59:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-04 17:59:48 -0700 |
| commit | ebf6e54d59dc06d974d3928691246e3213534d7e (patch) | |
| tree | 322080e3d29b3ecaf177af4c9097b39c3b531eef /src | |
| parent | e0ebdb4468db84a8e7f83043103e4b3bac928b74 (diff) | |
src-avr: Add LCD driver for NHD-C0216CU-FN-GWB-3V display
Initializes the Newhaven display and has a few simple commands to show
some text.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.proto | 28 | ||||
| -rw-r--r-- | src/ao_flight.c | 2 | ||||
| -rw-r--r-- | src/ao_pins.h | 36 |
4 files changed, 66 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 3eec3980..74c986d8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ CC=sdcc include Version -SUBDIRS=\ +SUBDIRS=teletest-v1.1 \ telemetrum-v1.1 telemetrum-v1.0 \ teledongle-v0.2 teledongle-v0.1 \ telemini-v0.1 telenano-v0.1 \ diff --git a/src/Makefile.proto b/src/Makefile.proto index c86de823..a49a9206 100644 --- a/src/Makefile.proto +++ b/src/Makefile.proto @@ -237,6 +237,34 @@ TNANO_BASE_SRC = \ $(TNANO_TASK_SRC) \ $(TNANO_MAIN_SRC) + +# +# Sources for TeleTest +# + +# +# Drivers only on TeleTest +# +TTEST_DRIVER_SRC = \ + ao_adc_usb.c \ + ao_gps_report.c \ + ao_ignite.c \ + $(BEEP_DRIVER_SRC) \ + $(USB_DRIVER_SRC) + +TTEST_MAIN_SRC = \ + ao_telemetrum.c + +TTEST_BASE_SRC = \ + $(ALTOS_SRC) \ + $(ALTOS_DRIVER_SRC) \ + $(TELE_DRIVER_SRC) \ + $(SERIAL_DRIVER_SRC) \ + $(TELE_COMMON_SRC) \ + $(TTEST_DRIVER_SRC) \ + $(TM_TASK_SRC) \ + $(TM_MAIN_SRC) + # # Sources for TeleBluetooth # diff --git a/src/ao_flight.c b/src/ao_flight.c index 822a20b8..234e7255 100644 --- a/src/ao_flight.c +++ b/src/ao_flight.c @@ -102,7 +102,7 @@ ao_flight(void) { /* Set pad mode - we can fly! */ ao_flight_state = ao_flight_pad; -#if HAS_USB +#if HAS_USB && !HAS_USB_TEST /* Disable the USB controller in flight mode * to save power */ diff --git a/src/ao_pins.h b/src/ao_pins.h index 86389c17..8f637832 100644 --- a/src/ao_pins.h +++ b/src/ao_pins.h @@ -79,6 +79,42 @@ #define ASCENT_SIGNAL_PIN 2 #endif +#if defined(TELETEST_V_1_1) + #define HAS_FLIGHT 1 + #define HAS_USB 1 + #define HAS_USB_TEST 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 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 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 ASCENT_SIGNAL P1_2 /* Use CS1 to signal ascent */ + #define ASCENT_SIGNAL_DIR P1DIR + #define ASCENT_SIGNAL_SEL P1SEL + #define ASCENT_SIGNAL_PIN 2 +#endif + #if defined(TELEDONGLE_V_0_2) #define HAS_FLIGHT 0 #define HAS_USB 1 |