DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #249 from recrof/dev

Browse Source 
lilygo t-echo, elecrow thinknode m1: correct display scalling
This commit is contained in:
ripplebiz
2025-05-05 19:30:39 +10:00
committed by GitHub
parent 791da53c7b 81863a5995
commit fb5fcae614
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boards/heltec_t114.json
View File

@@ -34,7 +34,8 @@
], ],
"debug": { "debug": {
"jlink_device": "nRF52840_xxAA", "jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52840.svd" "svd_path": "nrf52840.svd",
"openocd_target": "nrf52.cfg"
}, },
"frameworks": [ "frameworks": [
"arduino" "arduino"

5
boards/promicro_nrf52840.json
View File

@@ -8,7 +8,7 @@
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA", "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [ "hwids": [
[ [
"0x239A", "0x239A",
"0x00B3" "0x00B3"
], ],
@@ -51,7 +51,8 @@
], ],
"debug": { "debug": {
"jlink_device": "nRF52840_xxAA", "jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52840.svd" "svd_path": "nrf52840.svd",
"openocd_target": "nrf52.cfg"
}, },
"frameworks": [ "frameworks": [
"arduino", "arduino",

3
boards/t-echo.json
View File

@@ -37,7 +37,8 @@
"onboard_tools": [ "onboard_tools": [
"jlink" "jlink"
], ],
"svd_path": "nrf52840.svd" "svd_path": "nrf52840.svd",
"openocd_target": "nrf52.cfg"
}, },
"frameworks": [ "frameworks": [
"arduino" "arduino"

3
boards/thinknode_m1.json
View File

@@ -45,7 +45,8 @@
"onboard_tools": [ "onboard_tools": [
"jlink" "jlink"
], ],
"svd_path": "nrf52840.svd" "svd_path": "nrf52840.svd",
"openocd_target": "nrf52.cfg"
}, },
"frameworks": [ "frameworks": [
"arduino" "arduino"

3
boards/tracker-t1000-e.json
View File

@@ -32,7 +32,8 @@
"connectivity": ["bluetooth"], "connectivity": ["bluetooth"],
"debug": { "debug": {
"jlink_device": "nRF52840_xxAA", "jlink_device": "nRF52840_xxAA",
"svd_path": "nrf52840.svd" "svd_path": "nrf52840.svd",
"openocd_target": "nrf52.cfg"
}, },
"frameworks": ["arduino"], "frameworks": ["arduino"],
"name": "Seeed T1000-E", "name": "Seeed T1000-E",

4
src/helpers/ui/GxEPDDisplay.cpp
View File

@@ -7,10 +7,10 @@
#ifdef TECHO_ZOOM #ifdef TECHO_ZOOM
#define SCALE_X (1.5625f * 1.5f) // 200 / 128 (with 1.5 scale) #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 #else
#define SCALE_X 1.5625f // 200 / 128 #define SCALE_X 1.5625f // 200 / 128
#define SCALE_Y 2.9687f // 190 / 64 #define SCALE_Y 1.5625f // 200 / 128
#endif #endif
bool GxEPDDisplay::begin() { bool GxEPDDisplay::begin() {

8
src/helpers/ui/GxEPDDisplay.h
View File

@@ -14,11 +14,11 @@
#define GxEPD2_DISPLAY_CLASS GxEPD2_BW #define GxEPD2_DISPLAY_CLASS GxEPD2_BW
#define GxEPD2_DRIVER_CLASS GxEPD2_150_BN // DEPG0150BN 200x200, SSD1681, (FPC8101), TTGO T5 V2.4.1 #define GxEPD2_DRIVER_CLASS GxEPD2_150_BN // DEPG0150BN 200x200, SSD1681, (FPC8101), TTGO T5 V2.4.1
#include <epd/GxEPD2_150_BN.h> // 1.54" b/w #include <epd/GxEPD2_150_BN.h> // 1.54" b/w
#include "DisplayDriver.h" #include "DisplayDriver.h"
//GxEPD2_BW<GxEPD2_150_BN, 200> display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)); // DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1 //GxEPD2_BW<GxEPD2_150_BN, 200> display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)); // DEPG0150BN 200x200, SSD1681, TTGO T5 V2.4.1
class GxEPDDisplay : public DisplayDriver { class GxEPDDisplay : public DisplayDriver {
@@ -29,12 +29,12 @@ class GxEPDDisplay : public DisplayDriver {
public: public:
// there is a margin in y... // 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 begin();
bool isOn() override {return _isOn;}; bool isOn() override {return _isOn;};
void turnOn() override; void turnOn() override;
void turnOff() override; void turnOff() override;
void clear() override; void clear() override;