Merge branch 'master' of github.com:meshtastic/firmware

.github/workflows/main_matrix.yml

@@ -105,7 +105,7 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
 
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

variants/tlora_v2/variant.h

@@ -1,5 +1,7 @@
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
+#define GPS_RX_PIN 36
+#define GPS_TX_PIN 13 // per @eugene
 
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage