Commit Graph
7 Commits
Author SHA1 Message Date
BeardyWalrus f30c84012f Merge branch 'master' into master 2020-10-01 22:24:30 -04:00
BeardyWalrus 5150d15997 Merge branch 'master' into master 2020-09-29 19:57:01 -04:00
BeardyWalrus 7d6dbcfa3f Update BluetoothUtil.cpp
fix for #357
use presence of ssd1306 display to set display functionality for bluetooth security.
2020-09-29 19:51:39 -04:00
BeardyWalrus 26bafb4082 Merge pull request #3 from meshtastic/master
Update from upstream
2020-09-27 19:23:26 -04:00
BeardyWalrus 0b1a78c028 Merge pull request #2 from meshtastic/master
Pull to live
2020-06-14 16:06:06 -04:00
BeardyWalrus b8e1b28958 Merge pull request #1 from meshtastic/master
Resync with Upstream
2020-05-21 20:36:06 -04:00
BeardyWalrus 3754950a0e pinouts are swapped for TTGO-Lora32 V1 and V2 boards.
discovered by eriktheV-king in discourse
2020-04-09 20:44:15 -04:00