X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelemega-v1.0%2Fao_pins.h;h=354da6a46210c07cfbb9eb28bea68858961977e5;hp=664546c2fc02d4ba3aa5b0462b6b0bae747f24dd;hb=cdaa0d7b272505c49017f409b7c0b8e3240608f0;hpb=7064bc685aebeef07711e525dea4d5fbe33d235b

diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h
index 664546c2..354da6a4 100644
--- a/src/telemega-v1.0/ao_pins.h
+++ b/src/telemega-v1.0/ao_pins.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -68,6 +69,7 @@
 #define AO_CONFIG_MAX_SIZE			1024
 #define LOG_ERASE_MARK				0x55
 #define LOG_MAX_ERASE				128
+#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA
 
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
@@ -163,9 +165,6 @@
 /* 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)
-
 /*
  * ADC
  */
@@ -307,7 +306,6 @@ struct ao_adc {
 #define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
 #define AO_CC1120_SPI_CS_PIN	5
 #define AO_CC1120_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
-#define AO_CC1120_SPI		stm_spi2
 
 #define AO_CC1120_INT_PORT		(&stm_gpioe)
 #define AO_CC1120_INT_PIN		1
@@ -348,6 +346,7 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X		1
+#define AO_MMA655X_INVERT	0
 #define AO_MMA655X_SPI_INDEX	AO_SPI_1_PE13_PE14_PE15
 #define AO_MMA655X_CS_PORT	(&stm_gpiod)
 #define AO_MMA655X_CS_PIN	4