X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymega-v1.0%2Fao_pins.h;h=b80164786ba1f88b61f8d6df17b1f2e7da03bde6;hb=master;hp=773e58d9709cdff034b5e7632bbbe2bec8afd4fb;hpb=b540f6f5b034f33b8e1d1c3b91e2403a56479caa;p=fw%2Faltos

diff --git a/src/easymega-v1.0/ao_pins.h b/src/easymega-v1.0/ao_pins.h
index 773e58d9..da010207 100644
--- a/src/easymega-v1.0/ao_pins.h
+++ b/src/easymega-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
@@ -18,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
@@ -68,12 +68,18 @@
 #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
 #define USE_EEPROM_CONFIG	1
 #define USE_STORAGE_CONFIG	0
 #define HAS_USB			1
 #define HAS_BEEP		1
+#define BEEPER_TIMER		3
+#define BEEPER_CHANNEL		1
+#define BEEPER_PORT		(&stm_gpioc)
+#define BEEPER_PIN		6
 #define HAS_BATTERY_REPORT	1
 #define HAS_RADIO		0
 #define HAS_TELEMETRY		0
@@ -83,7 +89,7 @@
 #define HAS_SPI_1		1
 #define SPI_1_PA5_PA6_PA7	1	/* Barometer */
 #define SPI_1_PB3_PB4_PB5	1	/* Accelerometer, Gyro */
-#define SPI_1_PE13_PE14_PE15	0	
+#define SPI_1_PE13_PE14_PE15	0
 #define SPI_1_OSPEEDR		STM_OSPEEDR_10MHz
 
 #define HAS_SPI_2		1
@@ -162,9 +168,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
  */
@@ -179,7 +182,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-	printf("tick: %5u A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+	printf("tick: %5lu A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
 	       (p)->tick, \
 	       (p)->adc.sense[0], (p)->adc.sense[1], (p)->adc.sense[2], \
 	       (p)->adc.sense[3], (p)->adc.sense[4], (p)->adc.sense[5], \
@@ -260,6 +263,12 @@ struct ao_adc {
 #define AO_BATTERY_DIV_PLUS	56	/* 5.6k */
 #define AO_BATTERY_DIV_MINUS	100	/* 10k */
 
+/*
+ * Voltage divider on ADC pyro battery sampler
+ */
+#define AO_PYRO_BATTERY_DIV_PLUS	100	/* 100k */
+#define AO_PYRO_BATTERY_DIV_MINUS	27	/* 27k */
+
 /*
  * Voltage divider on ADC igniter samplers
  */