rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-03 08:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ppr1

Browse Source 
# Conflicts:
#	src/gps/NMEAGPS.cpp
This commit is contained in:
Kevin Hester
2020-10-16 15:59:55 +08:00
parent 5f2f3c94b9 b32e3f1269
commit 22f23bb07d
12 changed files with 251 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
variants/eink/variant.h
View File

@@ -239,7 +239,7 @@ External serial flash WP25R1635FZUIL0
#define PIN_SPI_SCK (0 + 19)
// To debug via the segger JLINK console rather than the CDC-ACM serial device
#define USE_SEGGER
// #define USE_SEGGER
#ifdef __cplusplus
}