Merge branch 'master' into ESPIDF-Rollup

2022-09-17 08:22:44 -05:00
parent 7c202b6069 0f87adad7b
commit e0d3ac01b0
10 changed files with 340 additions and 54 deletions
@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = t-echo
 debug_tool = jlink
-upload_protocol = jlink
+
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
 # -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
@@ -35,4 +35,5 @@
 // Leave undefined to disable our PMU IRQ handler.  DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
 // and waking from light sleep
 // #define PMU_IRQ 35
-#define HAS_AXP192
+#define HAS_AXP192
+#define GPS_UBLOX