Skip to content

Commit 3e23ba9

Browse files
suchmememanyskillsuchmememanyskill
committed
Merge branch 'dev'
2 parents 07d5f95 + 19fb87d commit 3e23ba9

18 files changed

+1015
-109
lines changed

‎.github/workflows/compile.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: actions/setup-python@v5
3535
with:
36-
python-version: '3.9'
36+
python-version: '3.13'
3737

3838
- name: Install PlatformIO Core
3939
run: pip install --upgrade platformio esptool

‎CYD-Klipper/.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"stdexcept": "cpp",
4949
"streambuf": "cpp",
5050
"cinttypes": "cpp",
51-
"typeinfo": "cpp"
51+
"typeinfo": "cpp",
52+
"*.tpp": "cpp"
5253
},
5354
"cmake.configureOnOpen": false
5455
}

‎CYD-Klipper/boards/esp32-JC3248W535C.json‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"name": "ESP32-JC3248W535C",
3+
"url": "https://www.aliexpress.com/item/1005007566315926.html",
4+
"vendor": "Guition",
5+
6+
"build": {
7+
"arduino": {
8+
"ldscript": "esp32s3_out.ld",
9+
"memory_type": "qio_opi",
10+
"partitions": "default_16MB.csv"
11+
},
12+
"core": "esp32",
13+
"mcu": "esp32s3",
14+
"variant": "esp32s3",
15+
16+
"f_cpu": "240000000L",
17+
"f_flash": "80000000L",
18+
"extra_flags": [
19+
"-DLCD_WIDTH=320",
20+
"-DLCD_HEIGHT=480",
21+
"-DCYD_SCREEN_GAP_PX=8",
22+
"-DCYD_SCREEN_FONT=lv_font_montserrat_14",
23+
"-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12",
24+
"-DCYD_SCREEN_WIDTH_PX=LCD_WIDTH",
25+
"-DCYD_SCREEN_HEIGHT_PX=LCD_HEIGHT",
26+
"-DCYD_SCREEN_SIDEBAR_SIZE_PX=50",
27+
"-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=45",
28+
"-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=45",
29+
"-DLCD_CS=45",
30+
"-DLCD_CLK=47",
31+
"-DLCD_D0=21",
32+
"-DLCD_D1=48",
33+
"-DLCD_D2=40",
34+
"-DLCD_D3=39",
35+
"-DLCD_RST=-1",
36+
"-DLCD_DC=8",
37+
"-DTOUCH_SDA=4",
38+
"-DTOUCH_SCL=8",
39+
"-DTOUCH_ADDR=0x3B",
40+
"-DLCD_BL_PIN=1",
41+
"-DCYD_BOARD_JC3248W535C",
42+
"-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION",
43+
"-DUSER_SETUP_LOADED",
44+
"-DARDUINO_USB_CDC_ON_BOOT=1",
45+
"-DCYD_SCREEN_VERTICAL=1"
46+
],
47+
"flash_mode": "qio",
48+
49+
"hwids": [
50+
[
51+
"0X303A",
52+
"0x1001"
53+
]
54+
]
55+
},
56+
57+
"upload": {
58+
"flash_size": "16MB",
59+
"flash_mode": "qio",
60+
"maximum_ram_size": 327680,
61+
"maximum_size": 16777216,
62+
"require_upload_port": true,
63+
"speed": 921600
64+
},
65+
66+
"frameworks": ["arduino", "espidf"],
67+
"connectivity": ["wifi", "bluetooth"]
68+
}
69+

‎CYD-Klipper/boards/esp32-JC4827W543C.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "ESP32-JC4827W543C",
3+
"url": "https://s.click.aliexpress.com/e/_oEcVE26",
4+
"vendor": "Guition",
5+
6+
"build": {
7+
"arduino": {
8+
"ldscript": "esp32s3_out.ld",
9+
"memory_type": "qio_opi"
10+
},
11+
"core": "esp32",
12+
"mcu": "esp32s3",
13+
"variant": "esp32s3",
14+
15+
"f_cpu": "240000000L",
16+
"f_flash": "80000000L",
17+
"extra_flags": [
18+
"-DBOARD_HAS_PSRAM",
19+
"-DLCD_WIDTH=480",
20+
"-DLCD_HEIGHT=270",
21+
"-DCYD_SCREEN_GAP_PX=8",
22+
"-DCYD_SCREEN_FONT=lv_font_montserrat_14",
23+
"-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12",
24+
"-DCYD_SCREEN_WIDTH_PX=480",
25+
"-DCYD_SCREEN_HEIGHT_PX=272",
26+
"-DCYD_SCREEN_SIDEBAR_SIZE_PX=50",
27+
"-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40",
28+
"-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=45",
29+
"-DLCD_CS=45",
30+
"-DLCD_CLK=47",
31+
"-DLCD_D0=21",
32+
"-DLCD_D1=48",
33+
"-DLCD_D2=40",
34+
"-DLCD_D3=39",
35+
"-DLCD_RST=-1",
36+
"-DLCD_DC=8",
37+
"-DLCD_BL_PIN=1",
38+
"-DCYD_BOARD_JC4827W543C",
39+
"-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION",
40+
"-DUSER_SETUP_LOADED",
41+
"-DARDUINO_USB_CDC_ON_BOOT=1",
42+
"-DCYD_S3"
43+
],
44+
"flash_mode": "qio",
45+
46+
"hwids": [
47+
[
48+
"0X303A",
49+
"0x1001"
50+
]
51+
]
52+
},
53+
54+
"upload": {
55+
"flash_size": "4MB",
56+
"flash_mode": "qio",
57+
"maximum_ram_size": 327680,
58+
"maximum_size": 16777216,
59+
"require_upload_port": true,
60+
"speed": 921600
61+
},
62+
63+
"frameworks": ["arduino", "espidf"],
64+
"connectivity": ["wifi", "bluetooth"]
65+
}
66+

‎CYD-Klipper/boards/esp32-JC8048W550.json‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default_16MB.csv",
6+
"memory_type": "qio_opi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"'-D ARDUINO_ESP32S3_DEV'",
11+
"'-D BOARD_HAS_PSRAM'",
12+
"'-D ARDUINO_USB_MODE=1'",
13+
"'-D ARDUINO_RUNNING_CORE=1'",
14+
"'-D ARDUINO_EVENT_RUNNING_CORE=1'",
15+
"'-D ARDUINO_USB_CDC_ON_BOOT=0'",
16+
"'-D JC8048W550'",
17+
"'-D LCD_WIDTH=800'",
18+
"'-D LCD_HEIGHT=480'",
19+
"'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT)'",
20+
"'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT)'",
21+
"'-D GPIO_BCKL=2'",
22+
"'-D LCD_ST7262_PAR'",
23+
"'-D ST7262_PANEL_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'",
24+
"'-D ST7262_PANEL_CONFIG_TIMINGS_PCLK_HZ=(14.2*1000000)'",
25+
"'-D ST7262_PANEL_CONFIG_TIMINGS_H_RES=LCD_WIDTH'",
26+
"'-D ST7262_PANEL_CONFIG_TIMINGS_V_RES=LCD_HEIGHT'",
27+
"'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_PULSE_WIDTH=4'",
28+
"'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_BACK_PORCH=8'",
29+
"'-D ST7262_PANEL_CONFIG_TIMINGS_HSYNC_FRONT_PORCH=8'",
30+
"'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_PULSE_WIDTH=4'",
31+
"'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_BACK_PORCH=8'",
32+
"'-D ST7262_PANEL_CONFIG_TIMINGS_VSYNC_FRONT_PORCH=8'",
33+
"'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_HSYNC_IDLE_LOW=false'",
34+
"'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_VSYNC_IDLE_LOW=false'",
35+
"'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_DE_IDLE_HIGH=false'",
36+
"'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_PCLK_ACTIVE_NEG=true'",
37+
"'-D ST7262_PANEL_CONFIG_TIMINGS_FLAGS_PCLK_IDLE_HIGH=false'",
38+
"'-D ST7262_PANEL_CONFIG_DATA_WIDTH=16'",
39+
"'-D ST7262_PANEL_CONFIG_SRAM_TRANS_ALIGN=4'",
40+
"'-D ST7262_PANEL_CONFIG_PSRAM_TRANS_ALIGN=64'",
41+
"'-D ST7262_PANEL_CONFIG_HSYNC_GPIO_NUM=39'",
42+
"'-D ST7262_PANEL_CONFIG_VSYNC_GPIO_NUM=41'",
43+
"'-D ST7262_PANEL_CONFIG_DE_GPIO_NUM=40'",
44+
"'-D ST7262_PANEL_CONFIG_PCLK_GPIO_NUM=42'",
45+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_R0=8'",
46+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_R1=3'",
47+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_R2=46'",
48+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_R3=9'",
49+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_R4=1'",
50+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G0=5'",
51+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G1=6'",
52+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G2=7'",
53+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G3=15'",
54+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G4=16'",
55+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_G5=4'",
56+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_B0=45'",
57+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_B1=48'",
58+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_B2=47'",
59+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_B3=21'",
60+
"'-D ST7262_PANEL_CONFIG_DATA_GPIO_B4=14'",
61+
"'-D ST7262_PANEL_CONFIG_DISP_GPIO_NUM=GPIO_NUM_NC'",
62+
"'-D ST7262_PANEL_CONFIG_FLAGS_DISP_ACTIVE_LOW=false'",
63+
"'-D ST7262_PANEL_CONFIG_FLAGS_RELAX_ON_IDLE=false'",
64+
"'-D ST7262_PANEL_CONFIG_FLAGS_FB_IN_PSRAM=true'",
65+
"'-D BOARD_HAS_TOUCH'",
66+
"'-D TOUCH_GT911_I2C'",
67+
"'-D GT911_I2C_HOST=I2C_NUM_0'",
68+
"'-D GT911_I2C_CONFIG_SDA_IO_NUM=19'",
69+
"'-D GT911_I2C_CONFIG_SCL_IO_NUM=20'",
70+
"'-D GT911_I2C_CONFIG_SDA_PULLUP_EN=GPIO_PULLUP_DISABLE'",
71+
"'-D GT911_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_DISABLE'",
72+
"'-D GT911_I2C_CONFIG_MASTER_CLK_SPEED=400000'",
73+
"'-D GT911_I2C_CONFIG_CLK_FLAGS=I2C_SCLK_SRC_FLAG_FOR_NOMAL'",
74+
"'-D GT911_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_GT911_ADDRESS'",
75+
"'-D GT911_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'",
76+
"'-D GT911_IO_I2C_CONFIG_DC_BIT_OFFSET=0'",
77+
"'-D GT911_IO_I2C_CONFIG_LCD_CMD_BITS=16'",
78+
"'-D GT911_IO_I2C_CONFIG_LCD_PARAM_BITS=0'",
79+
"'-D GT911_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'",
80+
"'-D GT911_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'",
81+
"'-D GT911_TOUCH_CONFIG_X_MAX=LCD_WIDTH'",
82+
"'-D GT911_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'",
83+
"'-D GT911_TOUCH_CONFIG_RST_GPIO_NUM=38'",
84+
"'-D GT911_TOUCH_CONFIG_INT_GPIO_NUM=18'",
85+
"'-D GT911_TOUCH_CONFIG_LEVELS_RESET=0'",
86+
"'-D GT911_TOUCH_CONFIG_LEVELS_INTERRUPT=0'",
87+
"'-D TOUCH_SWAP_XY=false'",
88+
"'-D TOUCH_SWAP_X=false'",
89+
"'-D TOUCH_SWAP_Y=false'",
90+
"'-D BOARD_HAS_TF'",
91+
"'-D TF_CS=10'",
92+
"'-D TF_SPI_MOSI=11'",
93+
"'-D TF_SPI_SCLK=12'",
94+
"'-D TF_SPI_MISO=13'",
95+
"-DCYD_SCREEN_HEIGHT_PX=LCD_HEIGHT",
96+
"-DCYD_SCREEN_WIDTH_PX=LCD_WIDTH",
97+
"-DROTATION_INVERTED=LV_DISP_ROT_180",
98+
"-DROTATION_NORMAL=LV_DISP_ROT_NONE",
99+
"-DCYD_SCREEN_GAP_PX=15",
100+
"-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=60",
101+
"-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=60",
102+
"-DCYD_SCREEN_FONT=lv_font_montserrat_22",
103+
"-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_16",
104+
"-DCYD_SCREEN_SIDEBAR_SIZE_PX=70",
105+
"-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=0",
106+
"-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1"
107+
],
108+
"f_cpu": "240000000L",
109+
"f_flash": "80000000L",
110+
"flash_mode": "qio",
111+
"hwids": [
112+
[
113+
"0x303A",
114+
"0x1001"
115+
]
116+
],
117+
"mcu": "esp32s3",
118+
"variant": "esp32s3"
119+
},
120+
"connectivity": [
121+
"wifi"
122+
],
123+
"debug": {
124+
"openocd_target": "esp32s3.cfg"
125+
},
126+
"frameworks": [
127+
"arduino",
128+
"espidf"
129+
],
130+
"name": "esp32-JC8048W550",
131+
"upload": {
132+
"flash_size": "16MB",
133+
"maximum_ram_size": 327680,
134+
"maximum_size": 16777216,
135+
"use_1200bps_touch": true,
136+
"wait_for_upload_port": true,
137+
"require_upload_port": true,
138+
"speed": 460800
139+
},
140+
"url": "https://www.aliexpress.com/item/1005006715581887.html",
141+
"vendor": "Guition"
142+
}

‎CYD-Klipper/platformio.ini‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ board = esp32dev
1414
framework = arduino
1515
monitor_speed = 115200
1616
debug_build_flags = -Os
17-
lib_deps =
17+
lib_deps =
1818
https://github.com/suchmememanyskill/esp32-smartdisplay#9c1d737
1919
bblanchon/ArduinoJson@^7.0.0
2020
plageoj/UrlEncode@^1.0.1
2121
knolleary/PubSubClient@^2.8
2222
WiFiClientSecure
2323
monitor_filters = esp32_exception_decoder
24-
build_flags =
24+
build_flags =
2525
-DLV_CONF_PATH="../../../../src/conf/lv_conf.h"
26-
extra_scripts =
26+
extra_scripts =
2727
pre:extract_commit.py
2828

2929
[env:esp32-2432S028R]
3030
board = esp32-2432S028R
31-
lib_deps =
31+
lib_deps =
3232
SPI
3333
https://github.com/suchmememanyskill/lvgl
3434
https://github.com/Bodmer/TFT_eSPI.git
@@ -40,7 +40,7 @@ lib_deps =
4040

4141
[env:esp32-3248S035C]
4242
board = esp32-3248S035C
43-
lib_deps =
43+
lib_deps =
4444
SPI
4545
https://github.com/suchmememanyskill/lvgl
4646
https://github.com/Bodmer/TFT_eSPI.git
@@ -52,7 +52,7 @@ lib_deps =
5252

5353
[env:esp32-3248S035C-V]
5454
board = esp32-3248S035C-vertical
55-
lib_deps =
55+
lib_deps =
5656
SPI
5757
https://github.com/suchmememanyskill/lvgl
5858
https://github.com/Bodmer/TFT_eSPI.git
@@ -97,7 +97,7 @@ board = esp32-2432S022C-vertical
9797

9898
[env:esp32-CROWPANEL-28R]
9999
board = esp32-CROWPANEL-28R
100-
lib_deps =
100+
lib_deps =
101101
SPI
102102
https://github.com/suchmememanyskill/lvgl
103103
https://github.com/Bodmer/TFT_eSPI.git
@@ -108,12 +108,37 @@ lib_deps =
108108

109109
[env:esp32-CROWPANEL-35C]
110110
board = esp32-CROWPANEL-35C
111-
lib_deps =
111+
lib_deps =
112112
SPI
113113
https://github.com/suchmememanyskill/lvgl
114-
https://github.com/lovyan03/[email protected].0
114+
https://github.com/lovyan03/[email protected].7
115115
bblanchon/ArduinoJson@^7.0.0
116116
plageoj/UrlEncode@^1.0.1
117117
knolleary/PubSubClient@^2.8
118118
WiFiClientSecure
119119

120+
[env:esp32-JC8048W550]
121+
board = esp32-JC8048W550
122+
123+
[env:ESP32-JC3248W535C]
124+
board = esp32-JC3248W535C
125+
lib_deps =
126+
SPI
127+
moononournation/GFX Library for Arduino
128+
lvgl/lvgl@^8.4.0
129+
plageoj/UrlEncode
130+
bblanchon/ArduinoJson@^7.0.0
131+
knolleary/PubSubClient@^2.8
132+
WiFiClientSecure
133+
134+
[env:esp32-JC4827W543C]
135+
board = esp32-JC4827W543C
136+
lib_deps =
137+
SPI
138+
https://github.com/moononournation/Arduino_GFX#v1.4.9
139+
https://github.com/mmMicky/TouchLib#ccaedcd9155ef8a6560ae9f594ea92e32c68020f
140+
lvgl/lvgl@^8.4.0
141+
plageoj/UrlEncode
142+
bblanchon/ArduinoJson@^7.0.0
143+
knolleary/PubSubClient@^2.8
144+
WiFiClientSecure

0 commit comments

Comments
 (0)