From: Bdale Garbee <bdale@gag.com>
Date: Wed, 12 Feb 2020 19:55:04 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: android-26~17
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=cff5506e97314bf9b34d80a01cbdfcad22f3ce08;hp=e220b00d5c3af42dd840dbd34fba264e11046fc6

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

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 93104fb0..7a64f8a1 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -842,6 +842,8 @@ public class AltosState extends AltosDataListener {
 							gps.climb_rate * gps.climb_rate), time);
 			if (gps.course != AltosLib.MISSING)
 				gps_course.set(gps.course, time);
+		} else if (state() == AltosLib.ao_flight_pad || state() == AltosLib.ao_flight_stateless) {
+			set_npad(0);
 		}
 		if (gps.lat != 0 && gps.lon != 0 &&
 		    pad_lat != AltosLib.MISSING &&
diff --git a/src/telemega-v4.0/Makefile b/src/telemega-v4.0/Makefile
index a11aac69..373a4979 100644
--- a/src/telemega-v4.0/Makefile
+++ b/src/telemega-v4.0/Makefile
@@ -78,7 +78,6 @@ ALTOS_SRC = \
 	ao_usb_stm.c \
 	ao_exti_stm.c \
 	ao_report.c \
-	ao_i2c_stm.c \
 	ao_bmx160.c \
 	ao_convert_pa.c \
 	ao_convert_volt.c \
diff --git a/src/telemega-v4.0/ao_pins.h b/src/telemega-v4.0/ao_pins.h
index 2a62403f..47dfd015 100644
--- a/src/telemega-v4.0/ao_pins.h
+++ b/src/telemega-v4.0/ao_pins.h
@@ -47,7 +47,7 @@
 #define HAS_SERIAL_1		0
 #define USE_SERIAL_1_STDIN	0
 #define SERIAL_1_PB6_PB7	0
-#define SERIAL_1_PA9_PA10	1
+#define SERIAL_1_PA9_PA10	0
 
 #define HAS_SERIAL_2		0
 #define USE_SERIAL_2_STDIN	0
@@ -89,8 +89,8 @@
 
 #define HAS_SPI_1		1
 #define SPI_1_PA5_PA6_PA7	1	/* Barometer */
-#define SPI_1_PB3_PB4_PB5	0
-#define SPI_1_PE13_PE14_PE15	1	/* Accelerometer, Gyro */
+#define SPI_1_PB3_PB4_PB5	1	/* Accelerometer */
+#define SPI_1_PE13_PE14_PE15	1	/* IMU */
 #define SPI_1_OSPEEDR		STM_OSPEEDR_10MHz
 
 #define HAS_SPI_2		1
@@ -98,13 +98,8 @@
 #define SPI_2_PD1_PD3_PD4	0
 #define SPI_2_OSPEEDR		STM_OSPEEDR_10MHz
 
-#define SPI_2_PORT		(&stm_gpiob)
-#define SPI_2_SCK_PIN		13
-#define SPI_2_MISO_PIN		14
-#define SPI_2_MOSI_PIN		15
-
-#define HAS_I2C_1		1
-#define I2C_1_PB8_PB9		1
+#define HAS_I2C_1		0
+#define I2C_1_PB8_PB9		0
 
 #define HAS_I2C_2		0
 #define I2C_2_PB10_PB11		0
@@ -151,7 +146,7 @@
 #define AO_PYRO_PIN_1	7
 
 /* Pyro C */
-#define AO_PYRO_PORT_2	(&stm_gpiob)
+#define AO_PYRO_PORT_2	(&stm_gpiod)
 #define AO_PYRO_PIN_2	5
 
 /* Pyro D */
diff --git a/src/telemega-v4.0/ao_telemega.c b/src/telemega-v4.0/ao_telemega.c
index 4e7c8b0d..2c5ee615 100644
--- a/src/telemega-v4.0/ao_telemega.c
+++ b/src/telemega-v4.0/ao_telemega.c
@@ -49,7 +49,6 @@ main(void)
 	ao_led_on(LEDS_AVAILABLE);
 	ao_timer_init();
 
-	ao_i2c_init();
 	ao_spi_init();
 	ao_dma_init();
 	ao_exti_init();