X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmegametrum-v0.1%2Fao_pins.h;h=6b0f9832f669696ce411c09a4a66a83f6cd56527;hb=a5d873d47b3b16ca32559b4de668bf07b25eddb0;hp=34b75255094751d2600a6b30b8491f4b2b5e7c82;hpb=31b05454ec8d90b89fa3039563ff0e86ae80b2a0;p=fw%2Faltos

diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 34b75255..6b0f9832 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -120,29 +120,26 @@
 #define AO_IGNITER_CLOSED	400
 #define AO_IGNITER_OPEN		60
 
-#define AO_IGNITER_PORT_A	(&stm_gpiod)
-#define AO_IGNITER_PIN_A	6
+#define AO_IGNITER_DROGUE_PORT	(&stm_gpiod)
+#define AO_IGNITER_DROGUE_PIN	6
 
-#define AO_IGNITER_PORT_B	(&stm_gpiod)
-#define AO_IGNITER_PIN_B	7
+#define AO_IGNITER_MAIN_PORT	(&stm_gpiod)
+#define AO_IGNITER_MAIN_PIN	7
 
-#define AO_IGNITER_PORT_C	(&stm_gpiob)
-#define AO_IGNITER_PIN_C	5
+#define AO_PYRO_PORT_0	(&stm_gpiob)
+#define AO_PYRO_PIN_0	5
 
-#define AO_IGNITER_PORT_D	(&stm_gpioe)
-#define AO_IGNITER_PIN_D	4
+#define AO_PYRO_PORT_1	(&stm_gpioe)
+#define AO_PYRO_PIN_1	4
 
-#define AO_IGNITER_PORT_E	(&stm_gpioe)
-#define AO_IGNITER_PIN_E	6
+#define AO_PYRO_PORT_2	(&stm_gpioe)
+#define AO_PYRO_PIN_2	6
 
-#define AO_IGNITER_PORT_F	(&stm_gpioe)
-#define AO_IGNITER_PIN_F	5
+#define AO_PYRO_PORT_3	(&stm_gpioe)
+#define AO_PYRO_PIN_3	5
 
-#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT_A
-#define AO_IGNITER_DROGUE_PIN	AO_IGNITER_PIN_A
-
-#define AO_IGNITER_MAIN_PORT	AO_IGNITER_PORT_B
-#define AO_IGNITER_MAIN_PIN	AO_IGNITER_PIN_B
+/* Number of general purpose pyro channels available */
+#define AO_PYRO_NUM	4
 
 #define AO_IGNITER_SET_DROGUE(v)	stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
 #define AO_IGNITER_SET_MAIN(v)		stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
@@ -271,6 +268,10 @@ struct ao_adc {
  * Radio (cc1120)
  */
 
+/* gets pretty close to 434.550 */
+
+#define AO_RADIO_CAL_DEFAULT 	0x6ca333
+
 #define AO_FEC_DEBUG		0
 #define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
 #define AO_CC1120_SPI_CS_PIN	5