summaryrefslogtreecommitdiff
path: root/src/detherm
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-04-05 22:03:37 -0700
committerKeith Packard <keithp@keithp.com>2016-04-13 06:19:28 -0700
commitcfb91ec7ef6ef485d813af96a0f206bb7a2204dd (patch)
tree47656520f5e31dbab359ac980c6088402371cf9d /src/detherm
parent8da29480a2fdf890d553b30eab58fc884210c1a5 (diff)
altos/detherm: Add ms5607 to detherm
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/detherm')
-rw-r--r--src/detherm/ao_detherm.c2
-rw-r--r--src/detherm/ao_pins.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/detherm/ao_detherm.c b/src/detherm/ao_detherm.c
index cc013753..64dee586 100644
--- a/src/detherm/ao_detherm.c
+++ b/src/detherm/ao_detherm.c
@@ -35,8 +35,8 @@ void main(void)
ao_usb_init();
ao_storage_init();
+ ao_ms5607_init();
// ao_flight_init();
-// ao_ms5607_init();
ao_pwm_init();
ao_log_init();
ao_report_init();
diff --git a/src/detherm/ao_pins.h b/src/detherm/ao_pins.h
index 9b623627..8cd4a9c4 100644
--- a/src/detherm/ao_pins.h
+++ b/src/detherm/ao_pins.h
@@ -72,11 +72,13 @@
/* MS5607 */
#define HAS_MS5607 1
-#define AO_MS5607_CS_PORT (&stm_gpiob)
-#define AO_MS5607_CS_PIN 6
+#define AO_MS5607_CS_PORT (&stm_gpioa)
+#define AO_MS5607_CS_PIN 0
#define AO_MS5607_SPI_INDEX AO_SPI_1_PB3_PB4_PB5
#define AO_MS5607_MISO_PORT (&stm_gpiob)
#define AO_MS5607_MISO_PIN 4
+#define AO_MS5607_PRIVATE_PINS 1
+#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_6MHz
/* Flash */