altos: Baro-only (but record accel) for TM v1.2

[fw/altos] / src / cc1111 / ao_pins.h

diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index 5eef0de4fa33732a7546602ade7745199f3dbfa0..c502b5ed72256a52f6220415a2929bf7ceabf067 100644 (file)
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -41,8 +41,9 @@
 
        #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_COMPANION_CS_PORT    P1
+       #define AO_COMPANION_CS_PIN     2
+       #define AO_COMPANION_CS         P1_2
 
        #define AO_LED_RED              1
        #define LEDS_AVAILABLE          (AO_LED_RED)
@@ -72,9 +73,9 @@
        #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_COMPANION_CS_PORT    P1
+       #define AO_COMPANION_CS_PIN     2
+       #define AO_COMPANION_CS         P1_2
 
        #define AO_LED_RED              1
        #define LEDS_AVAILABLE          (AO_LED_RED)
@@ -90,6 +91,7 @@
 #endif
 
 #if defined(TELEMETRUM_V_1_2)
+       #define RADIO_DELAY_AFTER_BOOST 40
        #define HAS_FLIGHT              1
        #define HAS_USB                 1
        #define HAS_BEEP                1
@@ -108,9 +110,9 @@
        #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_COMPANION_CS_PORT    P1
+       #define AO_COMPANION_CS_PIN     2
+       #define AO_COMPANION_CS         P1_2
 
        #define AO_LED_RED              1
        #define LEDS_AVAILABLE          (AO_LED_RED)
@@ -120,7 +122,7 @@
        #define SPI_CS_ON_P0            0
        #define AO_M25_SPI_CS_MASK      0x02    /* CS0 is P1_1 */
        #define M25_MAX_CHIPS           1
-       #define HAS_ACCEL               1
+       #define HAS_ACCEL               0
        #define HAS_IGNITE              1
        #define HAS_MONITOR             0
 #endif
@@ -150,7 +152,7 @@
        #define HAS_MONITOR             1
        #define LEGACY_MONITOR          1
        #define HAS_RSSI                1
-       #define HAS_AES                 1
+       #define HAS_AES                 0
 #endif
 
 #if defined(TELEMINI_V_1_0)
@@ -162,6 +164,7 @@
        #define HAS_ADC                 1
        #define HAS_EEPROM              1
        #define HAS_LOG                 1
+       #define HAS_FORCE_FREQ          1
        #define USE_INTERNAL_FLASH      1
        #define HAS_DBG                 0
        #define IGNITE_ON_P2            0
@@ -259,7 +262,7 @@
        #define HAS_MONITOR             1
        #define LEGACY_MONITOR          1
        #define HAS_RSSI                1
-       #define HAS_AES                 1
+       #define HAS_AES                 0
 #endif
 
 #if defined(TIDONGLE)
@@ -286,7 +289,7 @@
        #define HAS_MONITOR             1
        #define LEGACY_MONITOR          1
        #define HAS_RSSI                1
-       #define HAS_AES                 1
+       #define HAS_AES                 0
 #endif
 
 #if defined(TELEBT_V_0_0)
@@ -322,7 +325,7 @@
        #define HAS_MONITOR             1
        #define LEGACY_MONITOR          1
        #define HAS_RSSI                0
-       #define HAS_AES                 1
+       #define HAS_AES                 0
 #endif
 
 #if defined(TELEBT_V_0_1)
@@ -365,7 +368,7 @@
        #define HAS_MONITOR             1
        #define LEGACY_MONITOR          1
        #define HAS_RSSI                0
-       #define HAS_AES                 1
+       #define HAS_AES                 0
 #endif
 
 #if defined(TELELAUNCH_V_0_1)
@@ -521,27 +524,39 @@
 #error Please define HAS_ACCEL_REF
 #endif
 #else
+#ifndef HAS_ACCEL_REF
 #define HAS_ACCEL_REF 0
 #endif
+#endif
 
 #endif /* HAS_ADC */
 
 #if IGNITE_ON_P2
+#define AO_IGNITER_PORT                P2
+#define AO_IGNITER_DROGUE_PORT AO_IGNITER_PORT
 #define AO_IGNITER_DROGUE      P2_3
 #define AO_IGNITER_MAIN                P2_4
 #define AO_IGNITER_DIR         P2DIR
 #define AO_IGNITER_DROGUE_BIT  (1 << 3)
 #define AO_IGNITER_MAIN_BIT    (1 << 4)
+#define AO_IGNITER_DROGUE_PIN  3
+#define AO_IGNITER_MAIN_PIN    4
 #endif
 
 #if IGNITE_ON_P0
+#define AO_IGNITER_PORT                P0
 #define AO_IGNITER_DROGUE      P0_5
 #define AO_IGNITER_MAIN                P0_4
 #define AO_IGNITER_DIR         P0DIR
 #define AO_IGNITER_DROGUE_BIT  (1 << 5)
 #define AO_IGNITER_MAIN_BIT    (1 << 4)
+#define AO_IGNITER_DROGUE_PIN  5
+#define AO_IGNITER_MAIN_PIN    4
 #endif
 
+#define AO_IGNITER_DROGUE_PORT AO_IGNITER_PORT
+#define AO_IGNITER_MAIN_PORT   AO_IGNITER_PORT
+
 /* test these values with real igniters */
 #define AO_IGNITER_OPEN                1000
 #define AO_IGNITER_CLOSED      7000