Skip to content

Commit d85d364

Browse files
ripplebizripplebiz
authored
Merge pull request #808 from fdlamotte/wio-l1-eink
wio-l1-eink initial support
2 parents 52d5cc6 + 59ea6cd commit d85d364

File tree

6 files changed

+101
-6
lines changed

6 files changed

+101
-6
lines changed

‎boards/seeed-wio-tracker-l1.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"speed": 115200,
4747
"protocols": [
4848
"jlink",
49+
"stlink",
4950
"nrfjprog",
5051
"nrfutil",
5152
"cmsis-dap",

‎src/helpers/ui/GxEPDDisplay.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
class GxEPDDisplay : public DisplayDriver {
2626

27-
#if defined(HELTEC_MESH_POCKET)
27+
#if defined(EINK_DISPLAY_MODEL)
2828
GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT> display;
2929
const float scale_x = EINK_SCALE_X;
3030
const float scale_y = EINK_SCALE_Y;
@@ -45,7 +45,7 @@ class GxEPDDisplay : public DisplayDriver {
4545

4646
public:
4747
// there is a margin in y...
48-
#if defined(HELTEC_MESH_POCKET)
48+
#if defined(EINK_DISPLAY_MODEL)
4949
GxEPDDisplay() : DisplayDriver(128, 128), display(EINK_DISPLAY_MODEL(PIN_DISPLAY_CS, PIN_DISPLAY_DC, PIN_DISPLAY_RST, PIN_DISPLAY_BUSY)) {}
5050
#else
5151
GxEPDDisplay() : DisplayDriver(128, 128), display(GxEPD2_150_BN(DISP_CS, DISP_DC, DISP_RST, DISP_BUSY)) {}

‎variants/wio-tracker-l1-eink/platformio.ini‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
[WioTrackerL1Eink]
2+
extends = nrf52_base
3+
board = seeed-wio-tracker-l1
4+
board_build.ldscript = boards/nrf52840_s140_v7.ld
5+
build_flags = ${nrf52_base.build_flags}
6+
-I lib/nrf52/s140_nrf52_7.3.0_API/include
7+
-I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
8+
-I variants/wio-tracker-l1
9+
-D WIO_TRACKER_L1
10+
-D WIO_TRACKER_L1_EINK
11+
-D RADIO_CLASS=CustomSX1262
12+
-D WRAPPER_CLASS=CustomSX1262Wrapper
13+
-D LORA_TX_POWER=22
14+
-D SX126X_CURRENT_LIMIT=140
15+
-D SX126X_RX_BOOSTED_GAIN=1
16+
-D PIN_OLED_RESET=-1
17+
-D EINK_DISPLAY_MODEL=GxEPD2_213_B74
18+
-D EINK_SCALE_X=1.953125f
19+
-D EINK_SCALE_Y=1.28f
20+
-D EINK_X_OFFSET=0
21+
-D EINK_Y_OFFSET=10
22+
-D DISPLAY_ROTATION=1
23+
-D DISABLE_DIAGNOSTIC_OUTPUT
24+
-D AUTO_OFF_MILLIS=0
25+
build_src_filter = ${nrf52_base.build_src_filter}
26+
+<WioTrackerL1Board.cpp>
27+
+<../variants/wio-tracker-l1>
28+
+<helpers/ui/GxEPDDisplay.cpp>
29+
+<helpers/sensors>
30+
lib_deps= ${nrf52_base.lib_deps}
31+
adafruit/Adafruit SH110X @ ^2.1.13
32+
adafruit/Adafruit GFX Library @ ^1.12.1
33+
stevemarple/MicroNMEA @ ^2.0.6
34+
zinggjm/GxEPD2 @ 1.6.2
35+
bakercp/CRC32 @ ^2.0.0
36+
adafruit/Adafruit BME280 Library @ ^2.3.0
37+
38+
[env:WioTrackerL1Eink_companion_radio_ble]
39+
extends = WioTrackerL1Eink
40+
board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
41+
board_upload.maximum_size = 708608
42+
build_flags = ${WioTrackerL1Eink.build_flags}
43+
-I examples/companion_radio/ui-new
44+
-D MAX_CONTACTS=350
45+
-D MAX_GROUP_CHANNELS=40
46+
-D BLE_PIN_CODE=123456
47+
-D BLE_DEBUG_LOGGING=1
48+
-D OFFLINE_QUEUE_SIZE=256
49+
-D DISPLAY_CLASS=GxEPDDisplay
50+
-D PIN_BUZZER=12
51+
-D QSPIFLASH=1
52+
; -D MESH_PACKET_LOGGING=1
53+
; -D MESH_DEBUG=1
54+
-D UI_RECENT_LIST_SIZE=9
55+
-D UI_SENSORS_PAGE=1
56+
build_src_filter = ${WioTrackerL1Eink.build_src_filter}
57+
+<helpers/nrf52/SerialBLEInterface.cpp>
58+
+<helpers/ui/MomentaryButton.cpp>
59+
+<helpers/ui/buzzer.cpp>
60+
+<../examples/companion_radio/*.cpp>
61+
+<../examples/companion_radio/ui-new/*.cpp>
62+
lib_deps = ${WioTrackerL1Eink.lib_deps}
63+
adafruit/RTClib @ ^2.1.3
64+
densaugeo/base64 @ ~1.4.0
65+
end2endzone/NonBlockingRTTTL@^1.3.0
66+
debug_tool=stlink

‎variants/wio-tracker-l1/target.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
#include <helpers/AutoDiscoverRTCClock.h>
99
#include <helpers/ArduinoHelpers.h>
1010
#ifdef DISPLAY_CLASS
11-
#include <helpers/ui/SH1106Display.h>
11+
#if defined(WIO_TRACKER_L1_EINK)
12+
#include <helpers/ui/GxEPDDisplay.h>
13+
#else
14+
#include <helpers/ui/SH1106Display.h>
15+
#endif
1216
#include <helpers/ui/MomentaryButton.h>
1317
#endif
1418
#include <helpers/sensors/EnvironmentSensorManager.h>

‎variants/wio-tracker-l1/variant.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ const uint32_t g_ADigitalPinMap[] = {
5252

5353
// VBAT ENABLE
5454
4, // D30 BAT_CTL
55+
56+
// EINK
57+
13, // 31 SCK
58+
14, // 32 RST
59+
15, // 33 MOSI
60+
16, // 34 DC
61+
17, // 35 BUSY
62+
19, // 36 CS
63+
0xFF, // 37 MISO
5564
};
5665

5766
void initVariant() {

‎variants/wio-tracker-l1/variant.h‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "WVariant.h"
1414

15-
#define PINS_COUNT (33)
16-
#define NUM_DIGITAL_PINS (33)
15+
#define PINS_COUNT (38)
16+
#define NUM_DIGITAL_PINS (38)
1717
#define NUM_ANALOG_INPUTS (8)
1818
#define NUM_ANALOG_OUTPUTS (0)
1919

@@ -54,7 +54,7 @@
5454
#define PIN_SERIAL1_TX (6)
5555

5656
// SPI Interfaces
57-
#define SPI_INTERFACES_COUNT (1)
57+
#define SPI_INTERFACES_COUNT (2)
5858

5959
#define PIN_SPI_MISO (9)
6060
#define PIN_SPI_MOSI (10)
@@ -101,4 +101,19 @@
101101
#define EXTERNAL_FLASH_DEVICES P25Q16H
102102
#define EXTERNAL_FLASH_USE_QSPI
103103

104+
// EInk on SPI1
105+
#define PIN_DISPLAY_CS (36)
106+
#define PIN_DISPLAY_BUSY (35)
107+
#define PIN_DISPLAY_DC (34)
108+
#define PIN_DISPLAY_RST (32)
109+
110+
#define PIN_SPI1_MISO (37)
111+
#define PIN_SPI1_MOSI (33)
112+
#define PIN_SPI1_SCK (31)
113+
114+
// GxEPD2 needs that for a panel that is not even used !
115+
extern const int MISO;
116+
extern const int MOSI;
117+
extern const int SCK;
118+
104119
#endif

0 commit comments

Comments
 (0)