Skip to content

Commit 0de0a95

Browse files
committed
.
1 parent c7e2db6 commit 0de0a95

File tree

7 files changed

+13
-51
lines changed

7 files changed

+13
-51
lines changed

boards/m5stack-core.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"f_flash": "80000000L",
1313
"flash_mode": "qio",
1414
"mcu": "esp32",
15-
"variant": "pinouts"
15+
"variant": "m5stack-core"
1616
},
1717
"connectivity": [
1818
"wifi",

boards/m5stack-core2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"f_flash": "40000000L",
1717
"flash_mode": "dio",
1818
"mcu": "esp32",
19-
"variant": "pinouts"
19+
"variant": "m5stack-core2"
2020
},
2121
"connectivity": [
2222
"wifi",

boards/m5stack-cores3.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
]
2525
],
2626
"mcu": "esp32s3",
27-
"variant": "pinouts"
27+
"variant": "m5stack-cores3"
2828
},
2929
"connectivity": [
3030
"bluetooth",

platformio.ini

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ default_envs =
3737
extra_configs =
3838
variants/*/platformio.ini
3939

40+
build_cache_dir = .pio/buildcache
41+
cache_dir = .pio/cache
42+
4043
[env]
41-
platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.3/platform-espressif32.zip
44+
platform = espressif32
45+
platform_packages =
46+
framework-arduinoespressif32 @ https://github.com/bmorcelli/arduino-esp32/releases/download/2.0.17d/esp32-2.0.17d.zip
4247
monitor_filters = esp32_exception_decoder, send_on_enter, colorize
4348
monitor_speed = 115200
4449
framework = arduino

variants/lilygo-t-display-s3-touch/variant.cpp

-20
Original file line numberDiff line numberDiff line change
@@ -92,33 +92,13 @@ void _setBrightness(uint8_t brightval) {
9292
ledcWrite(TFT_BRIGHT_CHANNEL,dutyCycle); // Channel 0
9393
}
9494

95-
96-
bool menuPress(int bot) {
97-
//0 - prev
98-
//1 - Sel
99-
//2 - next
100-
//3 - all
101-
int terco=WIDTH/3;
102-
if (touch.read()) {
103-
auto t = touch.getPoint(0);
104-
if(rotation==3) t.x = WIDTH-t.x;
105-
else if (rotation==1) t.y = (HEIGHT+20)-t.y;
106-
107-
if(t.y>(HEIGHT) && ((t.x>terco*bot && t.x<terco*(1+bot)) || bot==3)) {
108-
t.x=WIDTH+1;
109-
t.y=HEIGHT+11;
110-
return true;
111-
} else return false;
112-
} else return false;
113-
}
11495
/*********************************************************************
11596
** Function: InputHandler
11697
** Handles the variables PrevPress, NextPress, SelPress, AnyKeyPress and EscPress
11798
**********************************************************************/
11899
void InputHandler(void) {
119100
if (touch.read()) { //touch.tirqTouched() &&
120101
auto t = touch.getPoint(0);
121-
t = touch.getPointScaled();
122102
if(rotation==3) {
123103
//t.y = (tftHeight+20)-t.y;
124104
t.x = tftWidth-t.x;

variants/lilygo-t-embed-cc1101/platformio.ini

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
#################################### EStart OF LILYGO MODELS #######################################
1212
[env:lilygo-t-embed]
13-
platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.5/platform-espressif32.zip
13+
platform_packages =
14+
framework-arduinoespressif32 @ https://github.com/bmorcelli/arduino-esp32/releases/download/2.0.17d/esp32-2.0.17d.zip
1415
board = lilygo-t-embed
1516
board_build.arduino.memory_type = qio_opi
1617
board_build.partitions = custom_16Mb.csv
@@ -93,7 +94,8 @@ lib_deps =
9394

9495

9596
[env:lilygo-t-embed-cc1101]
96-
platform = https://github.com/bmorcelli/platform-espressif32/releases/download/0.0.5/platform-espressif32.zip
97+
platform_packages =
98+
framework-arduinoespressif32 @ https://github.com/bmorcelli/arduino-esp32/releases/download/2.0.17d/esp32-2.0.17d.zip
9799
board = lilygo-t-embed-cc1101
98100
board_build.arduino.memory_type = qio_opi
99101
board_build.partitions = custom_16Mb.csv

variants/pinouts/pins_arduino.h

-25
This file was deleted.

0 commit comments

Comments
 (0)