pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-08 06:28:51 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into CannedMessagePlugin

Browse Source
This commit is contained in:
Jm Casler 2022-01-13 17:31:12 -08:00 committed by GitHub
commit 419349e13e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto

@ -1 +1 @@
Subproject commit 18fc4cdb522cb3740b3b547b3eac57781ca9c1f0 Subproject commit e992214cefbf9eb6e291eaab064333ae88610809

4
src/configuration.h
View File

@ -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 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_SDA 21 // I2C pins for this board
#define I2C_SCL 15 #define I2C_SCL 22
#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller #define RESET_OLED 16 // If defined, this pin will be used to reset the display controller