use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / src / ao_pins.h

diff --git a/src/ao_pins.h b/src/ao_pins.h
index 4a03ca508ae9ab628ce17d554ec37c7c502b6243..e1f5459f902e4f7446cf7e0076f673eaa9cbf386 100644 (file)
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -36,12 +36,18 @@
        #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           0
        #define HAS_ACCEL               1
        #define HAS_IGNITE              1
+       #define HAS_MONITOR             0
 #endif
 
 #if defined(TELEMETRUM_V_1_1)
@@ -62,6 +68,11 @@
        #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
@@ -72,6 +83,7 @@
        #define M25_MAX_CHIPS           1
        #define HAS_ACCEL               1
        #define HAS_IGNITE              1
+       #define HAS_MONITOR             0
 #endif
 
 #if defined(TELEDONGLE_V_0_2)
@@ -95,9 +107,10 @@
        #define SPI_CS_ON_P1            1
        #define SPI_CS_ON_P0            0
        #define HAS_IGNITE              0
+       #define HAS_MONITOR             1
 #endif
 
-#if defined(TELEMINI_V_0_1)
+#if defined(TELEMINI_V_1_0)
        #define HAS_FLIGHT              1
        #define HAS_USB                 0
        #define HAS_BEEP                0
@@ -120,6 +133,7 @@
        #define HAS_EXTERNAL_TEMP       0
        #define HAS_ACCEL               0
        #define HAS_IGNITE              1
+       #define HAS_MONITOR             0
 #endif
 
 #if defined(TELENANO_V_0_1)
@@ -144,6 +158,7 @@
        #define HAS_EXTERNAL_TEMP       0
        #define HAS_ACCEL               0
        #define HAS_IGNITE              0
+       #define HAS_MONITOR             0
 #endif
 
 #if defined(TELEMETRUM_V_0_1)
@@ -172,6 +187,7 @@
        #define SPI_CS_ON_P0            0
        #define HAS_ACCEL               1
        #define HAS_IGNITE              1
+       #define HAS_MONITOR             0
 #endif
 
 #if defined(TELEDONGLE_V_0_1)
@@ -195,6 +211,7 @@
        #define SPI_CS_ON_P1            0
        #define SPI_CS_ON_P0            1
        #define HAS_IGNITE              0
+       #define HAS_MONITOR             1
 #endif
 
 #if defined(TIDONGLE)
@@ -217,6 +234,7 @@
        #define SPI_CS_ON_P1            0
        #define SPI_CS_ON_P0            1
        #define HAS_IGNITE              0
+       #define HAS_MONITOR             1
 #endif
 
 #if defined(TELEBT_V_0_0)
@@ -245,6 +263,7 @@
        #define BT_LINK_ON_P1           0
        #define BT_LINK_PIN_INDEX       7
        #define BT_LINK_PIN             P2_1
+       #define HAS_MONITOR             1
 #endif
 
 #if defined(TELEBT_V_0_1)
@@ -280,6 +299,7 @@
        #define BT_LINK_ON_P1           1
        #define BT_LINK_PIN_INDEX       7
        #define BT_LINK_PIN             P1_7
+       #define HAS_MONITOR             1
 #endif
 
 #if DBG_ON_P1
@@ -318,6 +338,12 @@
 
 #endif /* DBG_ON_P0 */
 
+#if COMPANION_CS_ON_P1
+       #define COMPANION_CS_PORT       P1
+       #define COMPANION_CS_SEL        P1SEL
+       #define COMPANION_CS_DIR        P1DIR
+#endif
+
 #if SPI_CS_ON_P1
        #define SPI_CS_PORT     P1
        #define SPI_CS_SEL      P1SEL
@@ -376,4 +402,7 @@
 #error Please define PACKET_HAS_SLAVE
 #endif
 
+#ifndef HAS_MONITOR
+#error Please define HAS_MONITOR
+#endif
 #endif /* _AO_PINS_H_ */