projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lpc'
[fw/altos]
/
src
/
easymini-v0.1
/
ao_pins.h
diff --git
a/src/easymini-v0.1/ao_pins.h
b/src/easymini-v0.1/ao_pins.h
index 5bcd4673c9d5c0f1954473c099a2fa6d08026c3e..d4fbe7a1e176e4e018e19f9c3b6d1b4f9a58bf12 100644
(file)
--- a/
src/easymini-v0.1/ao_pins.h
+++ b/
src/easymini-v0.1/ao_pins.h
@@
-36,8
+36,8
@@
#define HAS_USB 1
#define HAS_USB 1
-#define HAS_USB_CONNECT
1
-#define HAS_USB_VBUS
1
+#define HAS_USB_CONNECT
0
+#define HAS_USB_VBUS
0
#define PACKET_HAS_SLAVE 0
#define PACKET_HAS_SLAVE 0
@@
-53,6
+53,7
@@
/* SPI */
#define HAS_SPI_0 1
/* SPI */
#define HAS_SPI_0 1
+#define SPI_SCK0_P0_6 1
#define HAS_SPI_1 1
#define SPI_SCK1_P1_15 1
#define SPI_MISO1_P0_22 1
#define HAS_SPI_1 1
#define SPI_SCK1_P1_15 1
#define SPI_MISO1_P0_22 1
@@
-72,10
+73,10
@@
#define AO_MS5607_PRIVATE_PINS 0
#define AO_MS5607_CS_PORT 0
#define AO_MS5607_CS_PIN 7
#define AO_MS5607_PRIVATE_PINS 0
#define AO_MS5607_CS_PORT 0
#define AO_MS5607_CS_PIN 7
-#define AO_MS5607_CS_MASK (1 << AO_MS5607_CS)
+#define AO_MS5607_CS_MASK (1 << AO_MS5607_CS
_PIN
)
#define AO_MS5607_MISO_PORT 0
#define AO_MS5607_MISO_PIN 8
#define AO_MS5607_MISO_PORT 0
#define AO_MS5607_MISO_PIN 8
-#define AO_MS5607_MISO_MASK (1 << AO_MS5607_MISO)
+#define AO_MS5607_MISO_MASK (1 << AO_MS5607_MISO
_PIN
)
#define AO_MS5607_SPI_INDEX 0
#define HAS_ACCEL 0
#define AO_MS5607_SPI_INDEX 0
#define HAS_ACCEL 0
@@
-87,6
+88,8
@@
#define HAS_APRS 0
#define HAS_LOG 1
#define USE_INTERNAL_FLASH 0
#define HAS_APRS 0
#define HAS_LOG 1
#define USE_INTERNAL_FLASH 0
+#define HAS_IGNITE 1
+#define HAS_IGNITE_REPORT 1
#define AO_DATA_RING 16
#define AO_DATA_RING 16
@@
-103,7
+106,7
@@
#define AO_ADC_2 1
struct ao_adc {
#define AO_ADC_2 1
struct ao_adc {
- int16_t sense_
d
;
+ int16_t sense_
a
;
int16_t sense_m;
int16_t v_batt;
};
int16_t sense_m;
int16_t v_batt;
};
@@
-116,13
+119,16
@@
struct ao_adc {
#define AO_IGNITER_OPEN 60
#define AO_IGNITER_DROGUE_PORT 0
#define AO_IGNITER_OPEN 60
#define AO_IGNITER_DROGUE_PORT 0
-#define AO_IGNITER_DROGUE_PIN
4
+#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_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
5
+#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_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)
+
#define AO_ADC_DUMP(p) \
#define AO_ADC_DUMP(p) \
- printf("tick: %5u
drogu
e: %5d main: %5d batt: %5d\n", \
- (p)->tick, (p)->adc.sense_
d
, (p)->adc.sense_m, (p)->adc.v_batt)
+ printf("tick: %5u
apoge
e: %5d main: %5d batt: %5d\n", \
+ (p)->tick, (p)->adc.sense_
a
, (p)->adc.sense_m, (p)->adc.v_batt)