enable logging support in telefiretwo

[fw/altos] / src / telefiretwo-v1.0 / ao_pins.h

diff --git a/src/telefiretwo-v1.0/ao_pins.h b/src/telefiretwo-v1.0/ao_pins.h
index 70af5dd198976beac23b3353b3caf7d67ce4b031..b2f5a5ab827920451f30ea960150c13cd5941829 100644 (file)
--- a/src/telefiretwo-v1.0/ao_pins.h
+++ b/src/telefiretwo-v1.0/ao_pins.h
@@ -32,15 +32,17 @@
 #define HAS_ADC                        1
 #define HAS_DBG                        0
 #define HAS_EEPROM             1
-#define HAS_LOG                        0
+#define HAS_LOG                        1
 #define HAS_PAD                        1
-#define USE_INTERNAL_FLASH     1
+#define USE_INTERNAL_FLASH     0
 #define IGNITE_ON_P0           0
 #define PACKET_HAS_MASTER      0
 #define PACKET_HAS_SLAVE       0
 #define AO_DATA_RING           32
 #define HAS_FIXED_PAD_BOX      1
 
+#define LOG_ERASE_MARK         0x55
+
 /* 8MHz High speed external crystal */
 #define AO_HSE                 8000000
 
@@ -67,7 +69,6 @@
 #define AO_RCC_CFGR_PPRE2_DIV  STM_RCC_CFGR_PPRE2_DIV_2
 
 #define HAS_EEPROM             1
-#define USE_INTERNAL_FLASH     1
 #define USE_EEPROM_CONFIG      1
 #define USE_STORAGE_CONFIG     0
 #define HAS_USB                        1
@@ -99,6 +100,15 @@
 
 #define FAST_TIMER_FREQ                10000   /* .1ms for debouncing */
 
+/*
+ * SPI Flash memory
+ */
+
+#define M25_MAX_CHIPS           1
+#define AO_M25_SPI_CS_PORT      (&stm_gpioa)
+#define AO_M25_SPI_CS_MASK      (1 << 15)
+#define AO_M25_SPI_BUS          AO_SPI_2_PB13_PB14_PB15
+
 /*
  * Radio is a cc1200 connected via SPI
  */
@@ -110,6 +120,7 @@
 #define AO_CC1200_SPI_CS_PIN   7
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
+#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpiob)
 #define AO_CC1200_INT_PIN              (11)
@@ -174,13 +185,18 @@
 #define AO_PAD_ADC_PYRO                2
 #define AO_PAD_ADC_BATT                8
 
+#define AO_PAD_ADC_THRUST      3
+#define AO_PAD_ADC_PRESSURE    18
+
 #define AO_ADC_FIRST_PIN       0
 
-#define AO_NUM_ADC             3
+#define AO_NUM_ADC             5
 
 #define AO_ADC_SQ1             AO_PAD_ADC_0
 #define AO_ADC_SQ2             AO_PAD_ADC_PYRO
 #define AO_ADC_SQ3             AO_PAD_ADC_BATT
+#define AO_ADC_SQ4             AO_PAD_ADC_THRUST
+#define AO_ADC_SQ5             AO_PAD_ADC_PRESSURE
 
 #define AO_PYRO_R_PYRO_SENSE   200
 #define AO_PYRO_R_SENSE_GND    22
@@ -195,17 +211,23 @@ struct ao_adc {
        int16_t         sense[AO_PAD_NUM];
        int16_t         pyro;
        int16_t         batt;
+       int16_t         thrust;
+       int16_t         pressure;
 };
 
 #define AO_ADC_DUMP(p)                                                 \
-       printf ("tick: %5u 0: %5d pyro: %5d batt %5d\n", \
+       printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
                (p)->tick,                                              \
                (p)->adc.sense[0],                                      \
                (p)->adc.pyro,                                          \
-               (p)->adc.batt)
+               (p)->adc.batt,                                          \
+               (p)->adc.thrust,                                        \
+               (p)->adc.pressure)
 
 #define AO_ADC_PINS    ((1 << AO_PAD_ADC_0) | \
                         (1 << AO_PAD_ADC_PYRO) | \
-                        (1 << AO_PAD_ADC_BATT))
+                        (1 << AO_PAD_ADC_BATT) | \
+                        (1 << AO_PAD_ADC_THRUST) | \
+                        (1 << AO_PAD_ADC_PRESSURE))
 
 #endif /* _AO_PINS_H_ */