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

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

Browse Source
This commit is contained in:
mkinney
2022-01-27 10:40:01 -08:00
committed by GitHub
co-authored by GitHub
parent aea6675e64 dafc1092aa
commit d5377a0f19
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main.yml
+6 -1
View File
@@ -3,9 +3,14 @@ on:
# Triggers the workflow on push or pull request events but only for the master branch # Triggers the workflow on push or pull request events but only for the master branch
push: push:
branches: [ master ] branches: [ master ]
paths-ignore:
- '**.md'
- '**.yml'
pull_request: pull_request:
branches: [ master ] branches: [ master ]
paths-ignore:
- '**.md'
- '**.yml'
jobs: jobs:
ci-check: ci-check:
variants/diy/v1_1/variant.h
+3 -3
View File
@@ -25,9 +25,9 @@
#undef RF95_SCK #undef RF95_SCK
#define RF95_SCK 18 #define RF95_SCK 18
#undef RF95_MISO #undef RF95_MISO
#define RF95_MISO 23 #define RF95_MISO 19
#undef RF95_MOSI #undef RF95_MOSI
#define RF95_MOSI 19 #define RF95_MOSI 23
#undef RF95_NSS #undef RF95_NSS
#define RF95_NSS 5 #define RF95_NSS 5
@@ -54,4 +54,4 @@
// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
// (which is the default for the sx1262interface code) // (which is the default for the sx1262interface code)
#define SX126X_E22 #define SX126X_E22
#endif #endif