a stab at turning on rudimentary logging for 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 469e9937b89d9214631e5393abde407b6bf734b1..95189cdc3beb84b3185e1cafb7454247fc0c918f 100644 (file)
--- a/src/telefiretwo-v1.0/ao_pins.h
+++ b/src/telefiretwo-v1.0/ao_pins.h
@@ -41,6 +41,8 @@
 #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
 
@@ -99,6 +101,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
  */
@@ -175,13 +186,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
@@ -196,17 +212,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_ */