diff --git a/boards/heltec_t114.json b/boards/heltec_t114.json index 6df7266d..86f72e73 100644 --- a/boards/heltec_t114.json +++ b/boards/heltec_t114.json @@ -34,7 +34,8 @@ ], "debug": { "jlink_device": "nRF52840_xxAA", - "svd_path": "nrf52840.svd" + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" }, "frameworks": [ "arduino" diff --git a/boards/promicro_nrf52840.json b/boards/promicro_nrf52840.json index 346f0f26..a428ffde 100644 --- a/boards/promicro_nrf52840.json +++ b/boards/promicro_nrf52840.json @@ -8,7 +8,7 @@ "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA", "f_cpu": "64000000L", "hwids": [ - [ + [ "0x239A", "0x00B3" ], @@ -51,7 +51,8 @@ ], "debug": { "jlink_device": "nRF52840_xxAA", - "svd_path": "nrf52840.svd" + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" }, "frameworks": [ "arduino", diff --git a/boards/t-echo.json b/boards/t-echo.json index 5c2703a3..8deea1bc 100644 --- a/boards/t-echo.json +++ b/boards/t-echo.json @@ -37,7 +37,8 @@ "onboard_tools": [ "jlink" ], - "svd_path": "nrf52840.svd" + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" }, "frameworks": [ "arduino" diff --git a/boards/thinknode_m1.json b/boards/thinknode_m1.json index 0f313063..9f486285 100644 --- a/boards/thinknode_m1.json +++ b/boards/thinknode_m1.json @@ -45,7 +45,8 @@ "onboard_tools": [ "jlink" ], - "svd_path": "nrf52840.svd" + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" }, "frameworks": [ "arduino" diff --git a/boards/tracker-t1000-e.json b/boards/tracker-t1000-e.json index 2be716e2..fc740ac5 100644 --- a/boards/tracker-t1000-e.json +++ b/boards/tracker-t1000-e.json @@ -32,7 +32,8 @@ "connectivity": ["bluetooth"], "debug": { "jlink_device": "nRF52840_xxAA", - "svd_path": "nrf52840.svd" + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" }, "frameworks": ["arduino"], "name": "Seeed T1000-E", diff --git a/src/helpers/ui/GxEPDDisplay.cpp b/src/helpers/ui/GxEPDDisplay.cpp index 57a96074..7faaf2c3 100644 --- a/src/helpers/ui/GxEPDDisplay.cpp +++ b/src/helpers/ui/GxEPDDisplay.cpp @@ -7,10 +7,10 @@ #ifdef TECHO_ZOOM #define SCALE_X (1.5625f * 1.5f) // 200 / 128 (with 1.5 scale) - #define SCALE_Y (2.9687f * 1.5f) // 190 / 64 (with 1.5 scale) + #define SCALE_Y (1.5625f * 1.5f) // 200 / 128 (with 1.5 scale) #else #define SCALE_X 1.5625f // 200 / 128 - #define SCALE_Y 2.9687f // 190 / 64 + #define SCALE_Y 1.5625f // 200 / 128 #endif bool GxEPDDisplay::begin() { diff --git a/src/helpers/ui/GxEPDDisplay.h b/src/helpers/ui/GxEPDDisplay.h index 88aecaae..01c900ac 100644 --- a/src/helpers/ui/GxEPDDisplay.h +++ b/src/helpers/ui/GxEPDDisplay.h @@ -14,11 +14,11 @@ #define GxEPD2_DISPLAY_CLASS GxEPD2_BW #define GxEPD2_DRIVER_CLASS GxEPD2_150_BN // DEPG0150BN 200x200, SSD1681, (FPC8101), TTGO T5 V2.4.1 -#include // 1.54" b/w +#include // 1.54" b/w #include "DisplayDriver.h" -//GxEPD2_BW display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)); // DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1 +//GxEPD2_BW display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)); // DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1 class GxEPDDisplay : public DisplayDriver { @@ -29,12 +29,12 @@ class GxEPDDisplay : public DisplayDriver { public: // there is a margin in y... - GxEPDDisplay() : DisplayDriver(128, 64), display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)) { + GxEPDDisplay() : DisplayDriver(128, 128), display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)) { } bool begin(); - bool isOn() override {return _isOn;}; + bool isOn() override {return _isOn;}; void turnOn() override; void turnOff() override; void clear() override;