projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Merge info into one screen
[fw/altos]
/
src
/
telemetrum-v3.0
/
ao_pins.h
diff --git
a/src/telemetrum-v3.0/ao_pins.h
b/src/telemetrum-v3.0/ao_pins.h
index f4ccc9f3a93b7abf342586eefa2a3c79fe30219f..e42e4150eaf70973094c96a9dd2f06d9d686c561 100644
(file)
--- 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_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
-#define HAS_TASK_QUEUE 1
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
@@
-158,7
+157,7
@@
struct ao_adc {
};
#define AO_ADC_DUMP(p) \
};
#define AO_ADC_DUMP(p) \
- printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
+ printf("tick: %5
l
u drogue: %5d main: %5d batt: %5d\n", \
(p)->tick, \
(p)->adc.sense_a, (p)->adc.sense_m, \
(p)->adc.v_batt);
(p)->tick, \
(p)->adc.sense_a, (p)->adc.sense_m, \
(p)->adc.v_batt);
@@
-260,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_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)
#define AO_CC1200_INT_PORT (&stm_gpioa)
#define AO_CC1200_INT_PIN (3)
@@
-277,15
+275,15
@@
struct ao_adc {
#define HAS_HIGHG_ACCEL 1
#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
#define NUM_CMDS 16