rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-19 17:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

add locks

Browse Source
This commit is contained in:
Manuel
2025-10-31 23:30:01 +01:00
parent 356cb0fdd0
commit 4ceebf6997
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/extra_variants/t5_s3_epaper_pro/variant.cpp
View File

@@ -2,6 +2,7 @@
#ifdef T5_S3_EPAPER_PRO #ifdef T5_S3_EPAPER_PRO
#include "SPILock.h"
#include "TouchDrvGT911.hpp" #include "TouchDrvGT911.hpp"
#include "Wire.h" #include "Wire.h"
#include "input/TouchScreenImpl1.h" #include "input/TouchScreenImpl1.h"
@@ -11,6 +12,7 @@ TouchDrvGT911 touch;
bool readTouch(int16_t *x, int16_t *y) bool readTouch(int16_t *x, int16_t *y)
{ {
if (!digitalRead(GT911_PIN_INT)) { if (!digitalRead(GT911_PIN_INT)) {
concurrency::LockGuard g(spiLock);
if (touch.getPoint(x, y) && (*x >= 0) && (*y >= 0) && (*x < EPD_WIDTH) && (*y < EPD_HEIGHT)) { if (touch.getPoint(x, y) && (*x >= 0) && (*y >= 0) && (*x < EPD_WIDTH) && (*y < EPD_HEIGHT)) {
LOG_DEBUG("touched(%d/%d)", *x, *y); LOG_DEBUG("touched(%d/%d)", *x, *y);
return true; return true;
@@ -22,6 +24,7 @@ bool readTouch(int16_t *x, int16_t *y)
// T5-S3-ePaper Pro specific (late-) init // T5-S3-ePaper Pro specific (late-) init
void lateInitVariant_T5S3Pro(void) void lateInitVariant_T5S3Pro(void)
{ {
concurrency::LockGuard g(spiLock);
touch.setPins(GT911_PIN_RST, GT911_PIN_INT); touch.setPins(GT911_PIN_RST, GT911_PIN_INT);
if (touch.begin(Wire, GT911_SLAVE_ADDRESS_L, GT911_PIN_SDA, GT911_PIN_SCL)) { if (touch.begin(Wire, GT911_SLAVE_ADDRESS_L, GT911_PIN_SDA, GT911_PIN_SCL)) {
touchScreenImpl1 = new TouchScreenImpl1(EPD_WIDTH, EPD_HEIGHT, readTouch); touchScreenImpl1 = new TouchScreenImpl1(EPD_WIDTH, EPD_HEIGHT, readTouch);

4
variants/esp32s3/t5s3_epaper/platformio.ini
View File

@@ -5,7 +5,7 @@ board_build.partition = default_16MB.csv
board_check = false board_check = false
upload_protocol = esptool upload_protocol = esptool
build_type = debug build_type = debug
build_flags = -g -O0 build_flags = -g -O0 -fno-strict-aliasing
${esp32_base.build_flags} ${esp32_base.build_flags}
-I variants/esp32s3/t5s3_epaper -I variants/esp32s3/t5s3_epaper
-D T5_S3_EPAPER_PRO -D T5_S3_EPAPER_PRO
@@ -13,6 +13,8 @@ build_flags = -g -O0
-D TOUCH_THRESHOLD_X=50 -D TOUCH_THRESHOLD_X=50
-D TOUCH_THRESHOLD_Y=30 -D TOUCH_THRESHOLD_Y=30
-D TIME_LONG_PRESS=500 -D TIME_LONG_PRESS=500
-D CONFIG_DISABLE_HAL_LOCKS=1 ; we use SPILock instead
-D EINK_LIMIT_GHOSTING_PX
; -D GPS_POWER_TOGGLE ; -D GPS_POWER_TOGGLE
build_src_filter = build_src_filter =