X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemetrum-v3.0%2Fao_pins.h;h=e42e4150eaf70973094c96a9dd2f06d9d686c561;hb=11d6e27bfd94ce58b702bfd0889f064ce1ef5a48;hp=b937b4222f3c8f4e482910613540adf3ba9b606c;hpb=1dc31a46f1d1adfdeab444664e581a780d995bf7;p=fw%2Faltos

diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h
index b937b422..e42e4150 100644
--- a/src/telemetrum-v3.0/ao_pins.h
+++ b/src/telemetrum-v3.0/ao_pins.h
@@ -19,7 +19,6 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_TASK_QUEUE		1
 
 /* 8MHz High speed external crystal */
 #define AO_HSE			8000000
@@ -64,6 +63,7 @@
 #define AO_CONFIG_MAX_SIZE			1024
 #define LOG_ERASE_MARK				0x55
 #define LOG_MAX_ERASE				128
+#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMETRUM
 
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
@@ -73,6 +73,9 @@
 #define HAS_BEEP		1
 #define HAS_BATTERY_REPORT	1
 #define BEEPER_CHANNEL		4
+#define BEEPER_TIMER		3
+#define BEEPER_PORT		(&stm_gpiob)
+#define BEEPER_PIN		1
 #define HAS_RADIO		1
 #define HAS_TELEMETRY		1
 #define HAS_APRS		1
@@ -140,9 +143,6 @@
 #define AO_IGNITER_MAIN_PORT	(&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN	9
 
-#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
  */
@@ -157,7 +157,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-	printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
+	printf("tick: %5lu drogue: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, \
 	       (p)->adc.sense_a, (p)->adc.sense_m, \
 	       (p)->adc.v_batt);
@@ -259,7 +259,6 @@ struct ao_adc {
 #define AO_CC1200_SPI_CS_PIN	2
 #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_gpioa)
 #define AO_CC1200_INT_PIN		(3)
@@ -276,15 +275,15 @@ struct ao_adc {
 
 #define HAS_HIGHG_ACCEL		1
 
-/*
- * mma655x
- */
+/* ADXL375 */
+
+#define HAS_ADXL375		1
+#define AO_ADXL375_SPI_INDEX	(AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3)
+#define AO_ADXL375_CS_PORT	(&stm_gpiob)
+#define AO_ADXL375_CS_PIN	9
 
-#define HAS_MMA655X		1
-#define AO_MMA655X_SPI_INDEX	AO_SPI_1_PB3_PB4_PB5
-#define AO_MMA655X_CS_PORT	(&stm_gpiob)
-#define AO_MMA655X_CS_PIN	9
-#define AO_MMA655X_INVERT	1
+#define AO_ADXL375_AXIS		x
+#define AO_ADXL375_INVERT	1
 
 #define NUM_CMDS		16