From c940d22a989590244b89c438743229fef08bee17 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Wed, 28 Apr 2021 15:25:54 +0800
Subject: [PATCH] t-echo: enable nrfupload

---
 boards/t-echo.json | 25 ++++++++++++++-----------
 platformio.ini     |  3 ++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/boards/t-echo.json b/boards/t-echo.json
index de86bc618..da67ef05e 100644
--- a/boards/t-echo.json
+++ b/boards/t-echo.json
@@ -44,17 +44,20 @@
     "arduino"
   ],
   "name": "TTGO eink (Adafruit BSP)",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "require_upload_port": true,
-    "speed": 115200,
-    "protocol": "jlink",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "stlink"
-    ]
+    "upload": {
+      "maximum_ram_size": 248832,
+      "maximum_size": 815104,
+      "speed": 115200,
+      "protocol": "nrfutil",
+      "protocols": [
+          "jlink",
+          "nrfjprog",
+          "nrfutil",
+          "stlink"
+      ],
+      "use_1200bps_touch": true,
+      "require_upload_port": true,
+      "wait_for_upload_port": true
   },
   "url": "FIXME",
   "vendor": "TTGO"
diff --git a/platformio.ini b/platformio.ini
index 33890730f..64d4bddfc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -211,7 +211,7 @@ lib_ignore =
 monitor_port = /dev/ttyACM1
 
 # we pass in options to jlink so it can understand freertos (note: we don't use "jlink" as the tool)
-debug_tool = jlink
+;debug_tool = jlink
 debug_port = :2331
 # Note: the ARGUMENTS MUST BE on multiple lines.  Otherwise platformio/commands/debug/helpers.py misparses everything into the "executable"
 # attribute and leaves "arguments" empty
@@ -352,6 +352,7 @@ lib_deps =
   ${nrf52840_base.lib_deps}
   https://github.com/geeksville/EPD_Libraries.git
   TFT_eSPI
+;upload_protocol = fs
 
 ; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)
 ;[env:eink0.1]