X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v1.0%2Fao_pins.h;h=201b913edd1e981532b7513d0f8eb72ec24e26c8;hb=cdaa0d7b272505c49017f409b7c0b8e3240608f0;hp=e721030d84201311706cdee0a99364bdf1f661c4;hpb=258d225df1f4afe1cfdc9c43208bcd75d18cdf2d;p=fw%2Faltos

diff --git a/src/easymini-v1.0/ao_pins.h b/src/easymini-v1.0/ao_pins.h
index e721030d..201b913e 100644
--- a/src/easymini-v1.0/ao_pins.h
+++ b/src/easymini-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
@@ -15,10 +16,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#define HAS_BEEP	1
-#define	HAS_LED		0
+#define HAS_BEEP		1
+#define HAS_BATTERY_REPORT	1
 
-#define AO_STACK_SIZE	384
+#define AO_STACK_SIZE	376
 
 #define IS_FLASH_LOADER	0
 
@@ -41,7 +42,7 @@
 
 #define PACKET_HAS_SLAVE	0
 
-#define AO_LOG_FORMAT		AO_LOG_FORMAT_EASYMINI
+#define AO_LOG_FORMAT		AO_LOG_FORMAT_EASYMINI1
 
 /* USART */
 
@@ -122,11 +123,9 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT	0
 #define AO_IGNITER_DROGUE_PIN	2
-#define AO_IGNITER_SET_DROGUE(v)	ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
 
 #define AO_IGNITER_MAIN_PORT	0
 #define AO_IGNITER_MAIN_PIN	3
-#define AO_IGNITER_SET_MAIN(v)		ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
 
 #define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
@@ -134,3 +133,20 @@ struct ao_adc {
 #define AO_ADC_DUMP(p) \
 	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
+
+/*
+ * Voltage divider on ADC battery sampler
+ */
+#define AO_BATTERY_DIV_PLUS	100	/* 100k */
+#define AO_BATTERY_DIV_MINUS	27	/* 27k */
+
+/*
+ * Voltage divider on ADC igniter samplers
+ */
+#define AO_IGNITE_DIV_PLUS	100	/* 100k */
+#define AO_IGNITE_DIV_MINUS	27	/* 27k */
+
+/*
+ * ADC reference in decivolts
+ */
+#define AO_ADC_REFERENCE_DV	33