Merge remote-tracking branch 'root/master' into dev

This commit is contained in:
geeksville
2020-09-11 18:15:13 -07:00
7 changed files with 21 additions and 13 deletions

View File

@@ -258,6 +258,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
#define LED_PIN 2 // If defined we will blink this LED
#define BUTTON_PIN 0 // If defined, this will be used for user button presses
#define BUTTON_NEED_PULLUP
#define USE_RF95
#define LORA_DIO0 26 // a No connect on the SX1262 module
@@ -284,6 +285,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BUTTON_PIN \
0 // If defined, this will be used for user button presses, if your board doesn't have a physical switch, you can wire one
// between this pin and ground
#define BUTTON_NEED_PULLUP
#define USE_RF95
#define LORA_DIO0 26 // a No connect on the SX1262 module