Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	debian/control

4 files changed, 75 insertions, 7 deletions

diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 4a4c983a..a93f6f17 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -19,6 +19,7 @@ INC = \
 	ao_ms5607.h \
 	ao_hmc5883.h \
 	ao_mpu6000.h \
+	ao_mma655x.h \
 	ao_cc1120_CC1120.h \
 	ao_profile.h \
 	ao_whiten.h \
@@ -55,7 +56,10 @@ ALTOS_SRC = \
 	ao_cc1120.c \
 	ao_fec_tx.c \
 	ao_fec_rx.c \
+	ao_data.c \
 	ao_ms5607.c \
+	ao_mma655x.c \
+	ao_hmc5883.c \
 	ao_adc_stm.c \
 	ao_beep_stm.c \
 	ao_storage.c \
diff --git a/src/megametrum-v0.1/ao_megametrum.c b/src/megametrum-v0.1/ao_megametrum.c
index 55324514..d3ae4690 100644
--- a/src/megametrum-v0.1/ao_megametrum.c
+++ b/src/megametrum-v0.1/ao_megametrum.c
@@ -18,6 +18,7 @@
 #include <ao.h>
 #include <ao_hmc5883.h>
 #include <ao_mpu6000.h>
+#include <ao_mma655x.h>
 #include <ao_log.h>
 #include <ao_exti.h>
 #include <ao_packet.h>
@@ -53,6 +54,9 @@ main(void)
 #if HAS_MPU6000
 	ao_mpu6000_init();
 #endif
+#if HAS_MMA655X
+	ao_mma655x_init();
+#endif
 
 	ao_storage_init();
 	
diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index 6b0f9832..8b631ae9 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -69,13 +69,14 @@
 #define HAS_TELEMETRY		1
 
 #define HAS_SPI_1		1
-#define SPI_1_PA5_PA6_PA7	1
+#define SPI_1_PA5_PA6_PA7	1	/* Barometer */
 #define SPI_1_PB3_PB4_PB5	0
-#define SPI_1_PE13_PE14_PE15	0
+#define SPI_1_PE13_PE14_PE15	1	/* Accelerometer */
 
 #define HAS_SPI_2		1
-#define SPI_2_PB13_PB14_PB15	1
+#define SPI_2_PB13_PB14_PB15	1	/* Flash, Companion */
 #define SPI_2_PD1_PD3_PD4	0
+
 #define SPI_2_GPIO		(&stm_gpiob)
 #define SPI_2_SCK		13
 #define SPI_2_MISO		14
@@ -247,13 +248,14 @@ struct ao_adc {
  * Pressure sensor settings
  */
 #define HAS_MS5607		1
+#define AO_MS5607_PRIVATE_PINS	1
 #define AO_MS5607_CS_GPIO	(&stm_gpioc)
 #define AO_MS5607_CS		4
 #define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS)
 #define AO_MS5607_MISO_GPIO	(&stm_gpioa)
 #define AO_MS5607_MISO		6
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO)
-#define AO_MS5607_SPI_INDEX	(STM_SPI_INDEX(1))
+#define AO_MS5607_SPI_INDEX	AO_SPI_1_PA5_PA6_PA7
 
 /*
  * SPI Flash memory
@@ -262,7 +264,7 @@ struct ao_adc {
 #define M25_MAX_CHIPS		1
 #define AO_M25_SPI_CS_PORT	(&stm_gpiod)
 #define AO_M25_SPI_CS_MASK	(1 << 3)
-#define AO_M25_SPI_BUS		STM_SPI_INDEX(2)
+#define AO_M25_SPI_BUS		AO_SPI_2_PB13_PB14_PB15
 
 /*
  * Radio (cc1120)
@@ -275,7 +277,7 @@ struct ao_adc {
 #define AO_FEC_DEBUG		0
 #define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
 #define AO_CC1120_SPI_CS_PIN	5
-#define AO_CC1120_SPI_BUS	STM_SPI_INDEX(2)
+#define AO_CC1120_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
 
 #define AO_CC1120_INT_PORT	(&stm_gpioc)
 #define AO_CC1120_INT_PIN	14
@@ -303,6 +305,15 @@ struct ao_adc {
 
 #define HAS_HIGHG_ACCEL		0
 
+/*
+ * mma655x
+ */
+
+#define HAS_MMA655X		0
+#define AO_MMA655X_SPI_INDEX	AO_SPI_1_PA5_PA6_PA7
+#define AO_MMA655X_CS_GPIO	(&stm_gpiod)
+#define AO_MMA655X_CS		4
+
 #define NUM_CMDS		16
 
 /*
@@ -311,7 +322,7 @@ struct ao_adc {
 
 #define AO_COMPANION_CS_PORT	(&stm_gpiod)
 #define AO_COMPANION_CS_PIN	(0)
-#define AO_COMPANION_SPI_BUS	STM_SPI_INDEX(2)
+#define AO_COMPANION_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
 
 /*
  * Monitor
diff --git a/src/megametrum-v0.1/stlink-pins b/src/megametrum-v0.1/stlink-pins
new file mode 100644
index 00000000..e6094372
--- /dev/null
+++ b/src/megametrum-v0.1/stlink-pins
@@ -0,0 +1,49 @@
+	ST discovery card pins
+
+1	AIN-1
+2	JTCK
+3	GND
+4	JTMS
+5	NRST
+6	SWO
+
+MM misc connector
+
+1	GND
+2	reset_n
+3	boot0
+4	tx1
+5	rx1
+6	+3.3V
+7	GND
+8	jtms
+9	jtck
+10	jtdi
+11	jtdo
+12	jntrst
+13	sda2
+14	scl2
+15	pe1
+16	pe0
+
+For debugging:
+
+	ST	MM
+JTCK	2	9
+GND	3	7
+JTMS	4	8
+NRST	5	2
+
+TL debug connector:
+
+	TL	ST
+GND	1	3
+NRST	2	5
+SWDIO	3	4
+SWCLK	4	2
+
+MegaAccel:
+
+Jumpers
+PC0 (pin15) (blue)	PE0 (pin97)	accel_ref	(debug 16)
+PC1 (pin16) (green)	PE1 (pin98)	accel		(debug 15)