X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefiretwo-v0.1%2Fao_pins.h;h=baf051a45d0a4f6fa72ed2d72e31031ac32835c9;hb=2733436da522650d4e918b7bc7d65f966f149792;hp=fd840f476378ea3dee4e68b079e7b4f8a4fe2b3c;hpb=e6bad553009704af69b08b4a22fb5eb8ac6921f8;p=fw%2Faltos diff --git a/src/telefiretwo-v0.1/ao_pins.h b/src/telefiretwo-v0.1/ao_pins.h index fd840f47..baf051a4 100644 --- a/src/telefiretwo-v0.1/ao_pins.h +++ b/src/telefiretwo-v0.1/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 @@ -140,7 +141,7 @@ #define LED_PIN_ARMED 5 #define AO_LED_ARMED (1 << LED_PIN_ARMED) -#define AO_LED_CONTINUITY(c) (1 << (4 - (c))) +#define AO_LED_CONTINUITY(c) ((AO_LED_TYPE) (1 << (4 - (c)))) #define AO_LED_CONTINUITY_MASK (0x3 << 3) #define LEDS_AVAILABLE (LED_PORT_0_MASK|LED_PORT_1_MASK) @@ -189,6 +190,19 @@ #define HAS_ADC_TEMP 0 +#define AO_ADC_REFERENCE_DV 33 + +#define AO_PAD_R_V_BATT_BATT_SENSE 200 +#define AO_PAD_R_BATT_SENSE_GND 22 + +#define AO_PAD_R_V_BATT_V_PYRO 200 +#define AO_PAD_R_V_PYRO_PYRO_SENSE 200 +#define AO_PAD_R_PYRO_SENSE_GND 22 + +#undef AO_PAD_R_V_PYRO_IGNITER +#define AO_PAD_R_IGNITER_IGNITER_SENSE 200 +#define AO_PAD_R_IGNITER_SENSE_GND 22 + struct ao_adc { int16_t sense[AO_PAD_NUM]; int16_t pyro; @@ -196,7 +210,7 @@ struct ao_adc { }; #define AO_ADC_DUMP(p) \ - printf ("tick: %5u 0: %5d 1: %5d pyro: %5d batt %5d\n", \ + printf ("tick: %5lu 0: %5d 1: %5d pyro: %5d batt %5d\n", \ (p)->tick, \ (p)->adc.sense[0], \ (p)->adc.sense[1], \