Browse Source
Merge pull request #442 from oltaco/env-sens-manage-gps-revert
Fix: EnvironmentSensorManager.cpp: revert swapped GPS pins
pull/443/head
ripplebiz
12 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
7 additions and
7 deletions
-
src/helpers/sensors/EnvironmentSensorManager.cpp
-
variants/lilygo_tbeam_SX1262/platformio.ini
-
variants/lilygo_tbeam_SX1276/platformio.ini
-
variants/lilygo_tbeam_supreme_SX1262/platformio.ini
|
|
|
@ -183,7 +183,7 @@ bool EnvironmentSensorManager::setSettingValue(const char* name, const char* val |
|
|
|
#if ENV_INCLUDE_GPS |
|
|
|
void EnvironmentSensorManager::initBasicGPS() { |
|
|
|
|
|
|
|
Serial1.setPins(PIN_GPS_RX, PIN_GPS_TX); |
|
|
|
Serial1.setPins(PIN_GPS_TX, PIN_GPS_RX); |
|
|
|
|
|
|
|
#ifdef GPS_BAUD_RATE |
|
|
|
Serial1.begin(GPS_BAUD_RATE); |
|
|
|
|
|
|
|
@ -16,8 +16,8 @@ build_flags = |
|
|
|
-D P_LORA_TX_LED=4 |
|
|
|
-D PIN_BOARD_SDA=21 |
|
|
|
-D PIN_BOARD_SCL=22 |
|
|
|
-D PIN_GPS_RX=34 |
|
|
|
-D PIN_GPS_TX=12 |
|
|
|
-D PIN_GPS_RX=12 |
|
|
|
-D PIN_GPS_TX=34 |
|
|
|
-D PIN_USER_BTN=38 |
|
|
|
-D ENV_INCLUDE_GPS=1 |
|
|
|
build_src_filter = ${esp32_base.build_src_filter} |
|
|
|
|
|
|
|
@ -13,8 +13,8 @@ build_flags = |
|
|
|
-D P_LORA_TX_LED=4 |
|
|
|
-D PIN_BOARD_SDA=21 |
|
|
|
-D PIN_BOARD_SCL=22 |
|
|
|
-D PIN_GPS_RX=34 |
|
|
|
-D PIN_GPS_TX=12 |
|
|
|
-D PIN_GPS_RX=12 |
|
|
|
-D PIN_GPS_TX=34 |
|
|
|
-D PIN_USER_BTN=38 |
|
|
|
-D ENV_INCLUDE_GPS=1 |
|
|
|
;-D ENV_INCLUDE_BME680 |
|
|
|
|
|
|
|
@ -14,8 +14,8 @@ build_flags = |
|
|
|
-D P_LORA_TX_LED=6 |
|
|
|
-D PIN_BOARD_SDA=17 |
|
|
|
-D PIN_BOARD_SCL=18 |
|
|
|
-D PIN_GPS_RX=9 |
|
|
|
-D PIN_GPS_TX=8 |
|
|
|
-D PIN_GPS_RX=8 |
|
|
|
-D PIN_GPS_TX=9 |
|
|
|
-D PIN_GPS_EN=7 |
|
|
|
-D PIN_USER_BTN=0 |
|
|
|
-D TELEM_BME280_ADDRESS=0x77 |
|
|
|
|
