From 2d15724c4a175a4807dbbde6d2c2f241a9c49021 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 28 Mar 2023 13:43:38 -0700 Subject: [PATCH] altos/telegps-v3.0: Fix SPI bus usage CC1200 is on SPI 0, M25 is on SPI 1 Signed-off-by: Keith Packard --- src/telegps-v3.0/ao_pins.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/telegps-v3.0/ao_pins.h b/src/telegps-v3.0/ao_pins.h index 592ec5c6..211f592c 100644 --- a/src/telegps-v3.0/ao_pins.h +++ b/src/telegps-v3.0/ao_pins.h @@ -79,7 +79,6 @@ #define SPI_SCK1_P1_20 1 #define SPI_MISO1_P0_22 1 #define SPI_MOSI1_P1_22 1 -#define SPI_1_OSPEEDR AO_SPI_OSPEED_12MHz #define HAS_GPS 1 #define HAS_FLIGHT 0 @@ -107,7 +106,7 @@ #define AO_FEC_DEBUG 0 #define AO_CC1200_SPI_CS_PORT 1 #define AO_CC1200_SPI_CS_PIN 27 -#define AO_CC1200_SPI_BUS 1 +#define AO_CC1200_SPI_BUS 0 #define AO_CC1200_SPI 1 #define AO_CC1200_INT_PORT 1 @@ -124,7 +123,7 @@ #define M25_MAX_CHIPS 1 #define AO_M25_SPI_CS_PORT 0 #define AO_M25_SPI_CS_MASK (1 << 23) -#define AO_M25_SPI_BUS 0 +#define AO_M25_SPI_BUS 1 #define PACKET_HAS_SLAVE 0 -- 2.30.2