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

This commit is contained in:
Thomas Göttgens 2022-11-05 14:11:19 +01:00
commit 657ae44b6f
2 changed files with 3 additions and 1 deletions

View File

@ -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

View File

@ -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