Merge branch 'master' into create-pull-request/patch

This commit is contained in:
mkinney 2022-01-27 10:40:01 -08:00 committed by GitHub
commit d5377a0f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -3,9 +3,14 @@ on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master ]
paths-ignore:
- '**.md'
- '**.yml'
pull_request:
branches: [ master ]
paths-ignore:
- '**.md'
- '**.yml'
jobs:
ci-check:

View File

@ -25,9 +25,9 @@
#undef RF95_SCK
#define RF95_SCK 18
#undef RF95_MISO
#define RF95_MISO 23
#define RF95_MISO 19
#undef RF95_MOSI
#define RF95_MOSI 19
#define RF95_MOSI 23
#undef RF95_NSS
#define RF95_NSS 5
@ -54,4 +54,4 @@
// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
// (which is the default for the sx1262interface code)
#define SX126X_E22
#endif
#endif