Merge branch 'master' into src-cleanup

variants/t-echo/platformio.ini

@@ -3,7 +3,7 @@
 extends = nrf52840_base
 board = t-echo
 debug_tool = jlink
-upload_protocol = nrfutil
+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