mirror of
https://github.com/meshtastic/firmware.git
synced 2025-05-08 14:30:28 +00:00
Merge branch 'master' into CannedMessagePlugin
This commit is contained in:
commit
419349e13e
2
proto
2
proto
@ -1 +1 @@
|
||||
Subproject commit 18fc4cdb522cb3740b3b547b3eac57781ca9c1f0
|
||||
Subproject commit e992214cefbf9eb6e291eaab064333ae88610809
|
@ -428,8 +428,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
|
||||
|
||||
#define I2C_SDA 4 // I2C pins for this board
|
||||
#define I2C_SCL 15
|
||||
#define I2C_SDA 21 // I2C pins for this board
|
||||
#define I2C_SCL 22
|
||||
|
||||
#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user