kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fix gps pin defs for various NRF variants. (#9034)

Browse Source 
* fix on nrf52_promicro

* try fix for GPS issue

* fix GPS pin assignment in variant.h

* cleared up some comments and confirmed pinouts from schematics

---------

Co-authored-by: macvenez <macvenez@gmail.com>
This commit is contained in:
Tom
2025-12-24 12:04:28 -06:00
committed by GitHub
co-authored by GitHub macvenez
parent 3b968c1d58
commit e5c3eda2a2
6 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h
+4 -4
View File
@@ -90,16 +90,16 @@ NRF52 PRO MICRO PIN ASSIGNMENT
#define BUTTON_PIN (32 + 0) // P1.00 #define BUTTON_PIN (32 + 0) // P1.00
// GPS // GPS
#define PIN_GPS_TX (0 + 20) // P0.20 - This is data from the MCU #define GPS_TX_PIN (0 + 20) // P0.20 - This is data from the MCU
#define PIN_GPS_RX (0 + 22) // P0.22 - This is data from the GNSS #define GPS_RX_PIN (0 + 22) // P0.22 - This is data from the GNSS
#define PIN_GPS_EN (0 + 24) // P0.24 #define PIN_GPS_EN (0 + 24) // P0.24
#define GPS_UBLOX #define GPS_UBLOX
// define GPS_DEBUG // define GPS_DEBUG
// UART interfaces // UART interfaces
#define PIN_SERIAL1_TX PIN_GPS_TX #define PIN_SERIAL1_TX GPS_TX_PIN
#define PIN_SERIAL1_RX PIN_GPS_RX #define PIN_SERIAL1_RX GPS_RX_PIN
#define PIN_SERIAL2_RX (0 + 6) // P0.06 #define PIN_SERIAL2_RX (0 + 6) // P0.06
#define PIN_SERIAL2_TX (0 + 8) // P0.08 #define PIN_SERIAL2_TX (0 + 8) // P0.08
variants/nrf52840/nano-g2-ultra/variant.h
+4 -4
View File
@@ -130,13 +130,13 @@ External serial flash W25Q16JV_IQ
#define GPS_L76K #define GPS_L76K
#define PIN_GPS_STANDBY (0 + 13) // An output to wake GPS, low means allow sleep, high means force wake STANDBY #define PIN_GPS_STANDBY (0 + 13) // An output to wake GPS, low means allow sleep, high means force wake STANDBY
#define PIN_GPS_TX (0 + 10) // This is for bits going TOWARDS the CPU #define GPS_TX_PIN (0 + 10) // This is for bits going FROM the CPU
#define PIN_GPS_RX (0 + 9) // This is for bits going TOWARDS the GPS #define GPS_RX_PIN (0 + 9) // This is for bits going FROM the GPS
// #define GPS_THREAD_INTERVAL 50 // #define GPS_THREAD_INTERVAL 50
#define PIN_SERIAL1_TX PIN_GPS_TX #define PIN_SERIAL1_TX GPS_TX_PIN
#define PIN_SERIAL1_RX PIN_GPS_RX #define PIN_SERIAL1_RX GPS_RX_PIN
// PCF8563 RTC Module // PCF8563 RTC Module
#define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC #define PIN_RTC_INT (0 + 14) // Interrupt from the PCF8563 RTC
variants/nrf52840/seeed_solar_node/variant.h
+4 -4
View File
@@ -116,13 +116,13 @@ static const uint8_t SCL = PIN_WIRE_SCL;
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
#define GPS_L76K #define GPS_L76K
#ifdef GPS_L76K #ifdef GPS_L76K
#define PIN_GPS_TX D6 // 44 #define GPS_TX_PIN D6 // 44
#define PIN_GPS_RX D7 // 43 #define GPS_RX_PIN D7 // 43
#define HAS_GPS 1 #define HAS_GPS 1
#define GPS_BAUDRATE 9600 #define GPS_BAUDRATE 9600
#define GPS_THREAD_INTERVAL 50 #define GPS_THREAD_INTERVAL 50
#define PIN_SERIAL1_TX PIN_GPS_TX #define PIN_SERIAL1_TX GPS_TX_PIN
#define PIN_SERIAL1_RX PIN_GPS_RX #define PIN_SERIAL1_RX GPS_RX_PIN
#define PIN_GPS_STANDBY D0 #define PIN_GPS_STANDBY D0
#define GPS_EN D18 // P1.05 #define GPS_EN D18 // P1.05
#endif #endif
variants/nrf52840/seeed_wio_tracker_L1/variant.h
+4 -6
View File
@@ -119,16 +119,14 @@ static const uint8_t SCL = PIN_WIRE_SCL;
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
#define GPS_L76K #define GPS_L76K
#ifdef GPS_L76K #ifdef GPS_L76K
#define PIN_GPS_RX D6 // P0.26 #define GPS_TX_PIN D6 // P0.26 - This is data from the MCU
#define PIN_GPS_TX D7 #define GPS_RX_PIN D7 // P0.27 - This is data from the GNSS
#define HAS_GPS 1 #define HAS_GPS 1
#define GPS_BAUDRATE 9600 #define GPS_BAUDRATE 9600
#define GPS_THREAD_INTERVAL 50 #define GPS_THREAD_INTERVAL 50
#define PIN_SERIAL1_RX PIN_GPS_TX #define PIN_SERIAL1_RX GPS_RX_PIN
#define PIN_SERIAL1_TX PIN_GPS_RX #define PIN_SERIAL1_TX GPS_TX_PIN
#define GPS_RX_PIN PIN_GPS_TX
#define GPS_TX_PIN PIN_GPS_RX
#define PIN_GPS_STANDBY D0 #define PIN_GPS_STANDBY D0
// #define GPS_DEBUG // #define GPS_DEBUG
variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+4 -6
View File
@@ -129,16 +129,14 @@ static const uint8_t SCL = PIN_WIRE_SCL;
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
#define GPS_L76K #define GPS_L76K
#ifdef GPS_L76K #ifdef GPS_L76K
#define PIN_GPS_RX D6 // P0.26 #define GPS_TX_PIN D6 // P0.26 - This is data from the MCU
#define PIN_GPS_TX D7 #define GPS_RX_PIN D7 // P0.27 - This is data from the GNSS
#define HAS_GPS 1 #define HAS_GPS 1
#define GPS_BAUDRATE 9600 #define GPS_BAUDRATE 9600
#define GPS_THREAD_INTERVAL 50 #define GPS_THREAD_INTERVAL 50
#define PIN_SERIAL1_RX PIN_GPS_TX #define PIN_SERIAL1_RX GPS_RX_PIN
#define PIN_SERIAL1_TX PIN_GPS_RX #define PIN_SERIAL1_TX GPS_TX_PIN
#define GPS_RX_PIN PIN_GPS_TX
#define GPS_TX_PIN PIN_GPS_RX
#define PIN_GPS_STANDBY D0 #define PIN_GPS_STANDBY D0
// #define GPS_DEBUG // #define GPS_DEBUG
variants/nrf52840/seeed_xiao_nrf52840_kit/variant.h
+4 -4
View File
@@ -147,12 +147,12 @@ static const uint8_t SCK = PIN_SPI_SCK;
*/ */
// GPS L76K // GPS L76K
#ifdef GPS_L76K #ifdef GPS_L76K
#define PIN_GPS_TX D6 #define GPS_TX_PIN D6 // This is data from the MCU
#define PIN_GPS_RX D7 #define GPS_RX_PIN D7 // This is data from the GNSS module
#define HAS_GPS 1 #define HAS_GPS 1
#define GPS_THREAD_INTERVAL 50 #define GPS_THREAD_INTERVAL 50
#define PIN_SERIAL1_TX PIN_GPS_TX #define PIN_SERIAL1_TX GPS_TX_PIN
#define PIN_SERIAL1_RX PIN_GPS_RX #define PIN_SERIAL1_RX GPS_RX_PIN
#define PIN_GPS_STANDBY D0 #define PIN_GPS_STANDBY D0
#else #else
#define PIN_SERIAL1_RX (-1) #define PIN_SERIAL1_RX (-1)