diff --git a/CYD-Klipper/boards/esp32-2432S022C-smartdisplay.json b/CYD-Klipper/boards/esp32-2432S022C-smartdisplay.json new file mode 100644 index 0000000..6359d76 --- /dev/null +++ b/CYD-Klipper/boards/esp32-2432S022C-smartdisplay.json @@ -0,0 +1,126 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "'-D ARDUINO_ESP32_DEV'", + "'-D ESP32_2432S022C'", + "'-D LCD_WIDTH=240'", + "'-D LCD_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/8)'", + "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", + "'-D BCKL=0'", + "'-D LCD_ST7789_I80'", + "'-D ST7789_I80_BUS_CONFIG_CLK_SRC=LCD_CLK_SRC_PLL160M'", + "'-D ST7789_I80_BUS_CONFIG_DC=16'", + "'-D ST7789_I80_BUS_CONFIG_WR=4'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D8=15'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D9=13'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D10=12'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D11=14'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D12=27'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D13=25'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D14=33'", + "'-D ST7789_I80_BUS_CONFIG_DATA_GPIO_D15=32'", + "'-D ST7789_I80_BUS_CONFIG_BUS_WIDTH=8'", + "'-D ST7789_I80_BUS_CONFIG_MAX_TRANSFER_BYTES=(LVGL_BUFFER_PIXELS * sizeof(lv_color_t))'", + "'-D ST7789_I80_BUS_CONFIG_PSRAM_TRANS_ALIGN=64'", + "'-D ST7789_I80_BUS_CONFIG_SRAM_TRANS_ALIGN=4'", + "'-D ST7789_IO_I80_CONFIG_CS_GPIO_NUM=17'", + "'-D ST7789_IO_I80_CONFIG_PCLK_HZ=55000000'", + "'-D ST7789_IO_I80_CONFIG_TRANS_QUEUE_DEPTH=10'", + "'-D ST7789_IO_I80_CONFIG_LCD_CMD_BITS=8'", + "'-D ST7789_IO_I80_CONFIG_LCD_PARAM_BITS=8'", + "'-D ST7789_IO_I80_CONFIG_DC_LEVELS_DC_IDLE_LEVEL=0'", + "'-D ST7789_IO_I80_CONFIG_DC_LEVELS_DC_CMD_LEVEL=0'", + "'-D ST7789_IO_I80_CONFIG_DC_LEVELS_DC_DUMMY_LEVEL=0'", + "'-D ST7789_IO_I80_CONFIG_DC_LEVELS_DC_DATA_LEVEL=1'", + "'-D ST7789_IO_I80_CONFIG_FLAGS_CS_ACTIVE_HIGH=0'", + "'-D ST7789_IO_I80_CONFIG_FLAGS_REVERSE_COLOR_BITS=0'", + "'-D ST7789_IO_I80_CONFIG_FLAGS_SWAP_COLOR_BYTES=0'", + "'-D ST7789_IO_I80_CONFIG_FLAGS_PCLK_ACTIVE_NEG=0'", + "'-D ST7789_IO_I80_CONFIG_FLAGS_PCLK_IDLE_LOW=0'", + "'-D ST7789_DEV_CONFIG_RESET_GPIO_NUM=GPIO_NUM_NC'", + "'-D ST7789_DEV_CONFIG_COLOR_SPACE=ESP_LCD_COLOR_SPACE_BGR'", + "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", + "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", + "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", + "'-D ST7789_RD_GPIO=2'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", + "'-D BOARD_HAS_TOUCH'", + "'-D TOUCH_CST816S_I2C'", + "'-D CST816S_I2C_HOST=0'", + "'-D CST816S_I2C_CONFIG_SDA_IO_NUM=21'", + "'-D CST816S_I2C_CONFIG_SCL_IO_NUM=22'", + "'-D CST816S_I2C_CONFIG_SDA_PULLUP_EN=GPIO_PULLUP_ENABLE'", + "'-D CST816S_I2C_CONFIG_SCL_PULLUP_EN=GPIO_PULLUP_ENABLE'", + "'-D CST816S_I2C_CONFIG_MASTER_CLK_SPEED=400000'", + "'-D CST816S_I2C_CONFIG_CLK_FLAGS=0'", + "'-D CST816S_IO_I2C_CONFIG_DEV_ADDR=ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS'", + "'-D CST816S_IO_I2C_CONFIG_CONTROL_PHASE_BYTES=1'", + "'-D CST816S_IO_I2C_CONFIG_DC_BIT_OFFSET=0'", + "'-D CST816S_IO_I2C_CONFIG_LCD_CMD_BITS=8'", + "'-D CST816S_IO_I2C_CONFIG_LCD_PARAM_BITS=0'", + "'-D CST816S_IO_I2C_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", + "'-D CST816S_IO_I2C_CONFIG_FLAGS_DISABLE_CONTROL_PHASE=true'", + "'-D CST816S_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", + "'-D CST816S_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D CST816S_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", + "'-D CST816S_TOUCH_CONFIG_INT_GPIO_NUM=GPIO_NUM_NC'", + "'-D CST816S_TOUCH_CONFIG_LEVELS_RESET=0'", + "'-D CST816S_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", + "'-D TOUCH_SWAP_XY=false'", + "'-D TOUCH_SWAP_X=false'", + "'-D TOUCH_SWAP_Y=false'", + "'-D BOARD_HAS_TF'", + "'-D TF_CS=5'", + "'-D TF_SPI_MOSI=23'", + "'-D TF_SPI_SCLK=18'", + "'-D TF_SPI_MISO=19'", + "'-D BOARD_HAS_SPEAK'", + "'-D SPEAK=26'", + + "-DCYD_SCREEN_GAP_PX=8", + "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=35", + "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=35", + "-DCYD_SCREEN_FONT=lv_font_montserrat_14", + "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_10", + "-DCYD_SCREEN_SIDEBAR_SIZE_PX=40", + "-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1", + "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1", + "-DCYD_SCREEN_DISABLE_INVERT_COLORS=1" + ], + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "esp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "esp32-2432S022C", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.aliexpress.com/item/1005006284154750.html", + "vendor": "Sunton" + } \ No newline at end of file diff --git a/CYD-Klipper/boards/esp32-2432S028R-smartdisplay.json b/CYD-Klipper/boards/esp32-2432S028R-smartdisplay.json new file mode 100644 index 0000000..4a8324a --- /dev/null +++ b/CYD-Klipper/boards/esp32-2432S028R-smartdisplay.json @@ -0,0 +1,127 @@ +{ + "build": { + "arduino": { + "ldscript": "esp32_out.ld" + }, + "core": "esp32", + "extra_flags": [ + "'-D ARDUINO_ESP32_DEV'", + "'-D ESP32_2432S028Rv3'", + "'-D LCD_WIDTH=240'", + "'-D LCD_HEIGHT=320'", + "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'", + "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'", + "'-D BCKL=21'", + "'-D LCD_ST7789_SPI'", + "'-D ST7789_SPI_HOST=SPI2_HOST'", + "'-D ST7789_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", + "'-D ST7789_SPI_BUS_MOSI_IO_NUM=13'", + "'-D ST7789_SPI_BUS_MISO_IO_NUM=GPIO_NUM_NC'", + "'-D ST7789_SPI_BUS_SCLK_IO_NUM=14'", + "'-D ST7789_SPI_BUS_QUADWP_IO_NUM=GPIO_NUM_NC'", + "'-D ST7789_SPI_BUS_QUADHD_IO_NUM=GPIO_NUM_NC'", + "'-D ST7789_SPI_BUS_MAX_TRANSFER_SZ=0'", + "'-D ST7789_SPI_BUS_FLAGS=0'", + "'-D ST7789_SPI_BUS_INTR_FLAGS=0'", + "'-D ST7789_SPI_CONFIG_CS_GPIO_NUM=15'", + "'-D ST7789_SPI_CONFIG_DC_GPIO_NUM=2'", + "'-D ST7789_SPI_CONFIG_SPI_MODE=SPI_MODE3'", + "'-D ST7789_SPI_CONFIG_PCLK_HZ=55000000'", + "'-D ST7789_SPI_CONFIG_TRANS_QUEUE_DEPTH=10'", + "'-D ST7789_SPI_CONFIG_LCD_CMD_BITS=8'", + "'-D ST7789_SPI_CONFIG_LCD_PARAM_BITS=8'", + "'-D ST7789_SPI_CONFIG_FLAGS_DC_AS_CMD_PHASE=false'", + "'-D ST7789_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", + "'-D ST7789_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", + "'-D ST7789_SPI_CONFIG_FLAGS_LSB_FIRST=false'", + "'-D ST7789_DEV_CONFIG_RESET_GPIO_NUM=GPIO_NUM_NC'", + "'-D ST7789_DEV_CONFIG_COLOR_SPACE=ESP_LCD_COLOR_SPACE_RGB'", + "'-D ST7789_DEV_CONFIG_BITS_PER_PIXEL=16'", + "'-D ST7789_DEV_CONFIG_FLAGS_RESET_ACTIVE_HIGH=false'", + "'-D ST7789_DEV_CONFIG_VENDOR_CONFIG=NULL'", + "'-D LCD_SWAP_XY=false'", + "'-D LCD_MIRROR_X=false'", + "'-D LCD_MIRROR_Y=false'", + "'-D BOARD_HAS_TOUCH'", + "'-D TOUCH_XPT2046_SPI'", + "'-D XPT2046_SPI_HOST=SPI3_HOST'", + "'-D XPT2046_SPI_DMA_CHANNEL=SPI_DMA_CH_AUTO'", + "'-D XPT2046_SPI_BUS_MOSI_IO_NUM=32'", + "'-D XPT2046_SPI_BUS_MISO_IO_NUM=39'", + "'-D XPT2046_SPI_BUS_SCLK_IO_NUM=25'", + "'-D XPT2046_SPI_BUS_QUADWP_IO_NUM=GPIO_NUM_NC'", + "'-D XPT2046_SPI_BUS_QUADHD_IO_NUM=GPIO_NUM_NC'", + "'-D XPT2046_SPI_CONFIG_CS_GPIO_NUM=33'", + "'-D XPT2046_SPI_CONFIG_DC_GPIO_NUM=GPIO_NUM_NC'", + "'-D XPT2046_SPI_CONFIG_SPI_MODE=SPI_MODE0'", + "'-D XPT2046_SPI_CONFIG_PCLK_HZ=2000000'", + "'-D XPT2046_SPI_CONFIG_TRANS_QUEUE_DEPTH=3'", + "'-D XPT2046_SPI_CONFIG_LCD_CMD_BITS=8'", + "'-D XPT2046_SPI_CONFIG_LCD_PARAM_BITS=8'", + "'-D XPT2046_SPI_CONFIG_FLAGS_DC_AS_CMD_PHASE=false'", + "'-D XPT2046_SPI_CONFIG_FLAGS_DC_LOW_ON_DATA=false'", + "'-D XPT2046_SPI_CONFIG_FLAGS_OCTAL_MODE=false'", + "'-D XPT2046_SPI_CONFIG_FLAGS_LSB_FIRST=false'", + "'-D XPT2046_TOUCH_CONFIG_X_MAX=LCD_WIDTH'", + "'-D XPT2046_TOUCH_CONFIG_Y_MAX=LCD_HEIGHT'", + "'-D XPT2046_TOUCH_CONFIG_RST_GPIO_NUM=GPIO_NUM_NC'", + "'-D XPT2046_TOUCH_CONFIG_INT_GPIO_NUM=36'", + "'-D XPT2046_TOUCH_CONFIG_LEVELS_RESET=0'", + "'-D XPT2046_TOUCH_CONFIG_LEVELS_INTERRUPT=0'", + "'-D TOUCH_SWAP_XY=true'", + "'-D TOUCH_SWAP_X=true'", + "'-D TOUCH_SWAP_Y=false'", + "'-D BOARD_HAS_TF'", + "'-D TF_CS=5'", + "'-D TF_SPI_MOSI=23'", + "'-D TF_SPI_SCLK=18'", + "'-D TF_SPI_MISO=19'", + "'-D BOARD_HAS_RGB_LED'", + "'-D RGB_LED_R=4'", + "'-D RGB_LED_G=16'", + "'-D RGB_LED_B=17'", + "'-D BOARD_HAS_CDS'", + "'-D CDS=34'", + "'-D BOARD_HAS_SPEAK'", + "'-D SPEAK=26'", + + "-DCYD_SCREEN_GAP_PX=8", + "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=35", + "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=35", + "-DCYD_SCREEN_FONT=lv_font_montserrat_14", + "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_10", + "-DCYD_SCREEN_SIDEBAR_SIZE_PX=40", + "-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1", + "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1", + "-DCYD_SCREEN_DISABLE_INVERT_COLORS=1" + ], + "f_cpu": "240000000L", + "f_flash": "40000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "esp32" + }, + "connectivity": [ + "wifi", + "bluetooth", + "ethernet", + "can" + ], + "debug": { + "openocd_board": "esp-wroom-32.cfg" + }, + "frameworks": [ + "arduino", + "espidf" + ], + "name": "esp32-2432S028Rv3", + "upload": { + "flash_size": "4MB", + "maximum_ram_size": 327680, + "maximum_size": 4194304, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://www.aliexpress.com/item/1005004502250619.html", + "vendor": "Sunton" + } \ No newline at end of file diff --git a/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json b/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json index 07da97e..25e1f76 100644 --- a/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json +++ b/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json @@ -21,7 +21,7 @@ "'-D ST7796_SPI_CONFIG_CS_GPIO_NUM=15'", "'-D ST7796_SPI_CONFIG_DC_GPIO_NUM=2'", "'-D ST7796_SPI_CONFIG_SPI_MODE=SPI_MODE0'", - "'-D ST7796_SPI_CONFIG_PCLK_HZ=24000000'", + "'-D ST7796_SPI_CONFIG_PCLK_HZ=80000000'", "'-D ST7796_SPI_CONFIG_TRANS_QUEUE_DEPTH=10'", "'-D ST7796_SPI_CONFIG_LCD_CMD_BITS=8'", "'-D ST7796_SPI_CONFIG_LCD_PARAM_BITS=8'", @@ -74,7 +74,17 @@ "'-D BOARD_HAS_CDS'", "'-D CDS=34'", "'-D BOARD_HAS_SPEAK'", - "'-D SPEAK=26'" + "'-D SPEAK=26'", + + "-DCYD_SCREEN_GAP_PX=10", + "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40", + "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40", + "-DCYD_SCREEN_FONT=lv_font_montserrat_16", + "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12", + "-DCYD_SCREEN_SIDEBAR_SIZE_PX=50", + "-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1", + "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1", + "-DCYD_SCREEN_DISABLE_INVERT_COLORS=1" ], "f_cpu": "240000000L", "f_flash": "40000000L", diff --git a/CYD-Klipper/platformio.ini b/CYD-Klipper/platformio.ini index 5a6c0ed..65c6a6e 100644 --- a/CYD-Klipper/platformio.ini +++ b/CYD-Klipper/platformio.ini @@ -44,16 +44,11 @@ lib_deps = plageoj/UrlEncode@^1.0.1 # Terribly slow. Only use for development -# [env:esp32-3248S035C-smartdisplay] -# board = esp32-3248S035C-smartdisplay -# build_flags = -# -DLV_CONF_PATH="../../../../src/conf/lv_conf.h" -# -DCYD_SCREEN_HEIGHT_PX=320 -# -DCYD_SCREEN_WIDTH_PX=480 -# -DCYD_SCREEN_GAP_PX=10 -# -DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40 -# -DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40 -# -DCYD_SCREEN_FONT=lv_font_montserrat_16 -# -DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12 -# -DCYD_SCREEN_SIDEBAR_SIZE_PX=50 -# -DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1 \ No newline at end of file +[env:esp32-3248S035C-smartdisplay] +board = esp32-3248S035C-smartdisplay + +[env:esp32-2432S028R-smartdisplay] +board = esp32-2432S028R-smartdisplay + +[env:esp32-2432S022C] +board = esp32-2432S022C-smartdisplay \ No newline at end of file diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp index de4c0ec..ab5a41b 100644 --- a/CYD-Klipper/src/ui/panels/settings_panel.cpp +++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp @@ -122,13 +122,18 @@ void create_settings_widget(const char* label_text, lv_obj_t* object, lv_obj_t* } void settings_panel_init(lv_obj_t* panel){ + lv_obj_t * toggle = NULL; + lv_obj_t * btn = NULL; + lv_obj_t * label = NULL; + lv_obj_t * dropdown = NULL; + lv_obj_set_style_pad_all(panel, CYD_SCREEN_GAP_PX, 0); lv_layout_flex_column(panel); - lv_obj_t * btn = lv_btn_create(panel); + btn = lv_btn_create(panel); lv_obj_add_event_cb(btn, reset_wifi_click, LV_EVENT_CLICKED, NULL); - lv_obj_t * label = lv_label_create(btn); + label = lv_label_create(btn); lv_label_set_text(label, "Restart"); lv_obj_center(label); @@ -145,7 +150,8 @@ void settings_panel_init(lv_obj_t* panel){ create_settings_widget("Calibrate Touch", btn, panel); #endif // CYD_SCREEN_DISABLE_TOUCH_CALIBRATION - lv_obj_t * toggle = lv_switch_create(panel); +#ifndef CYD_SCREEN_DISABLE_INVERT_COLORS + toggle = lv_switch_create(panel); lv_obj_set_width(toggle, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2); lv_obj_add_event_cb(toggle, invert_color_switch, LV_EVENT_VALUE_CHANGED, NULL); @@ -153,7 +159,7 @@ void settings_panel_init(lv_obj_t* panel){ lv_obj_add_state(toggle, LV_STATE_CHECKED); create_settings_widget("Invert Colors", toggle, panel); - +#endif // CYD_SCREEN_DISABLE_INVERT_COLORS toggle = lv_switch_create(panel); lv_obj_set_width(toggle, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2); @@ -164,7 +170,7 @@ void settings_panel_init(lv_obj_t* panel){ create_settings_widget("Light Mode", toggle, panel); - lv_obj_t * dropdown = lv_dropdown_create(panel); + dropdown = lv_dropdown_create(panel); lv_dropdown_set_options(dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple"); lv_dropdown_set_selected(dropdown, global_config.color_scheme); lv_obj_add_event_cb(dropdown, theme_dropdown, LV_EVENT_VALUE_CHANGED, NULL); diff --git a/ci.py b/ci.py index f22f181..fb650e0 100644 --- a/ci.py +++ b/ci.py @@ -1,6 +1,6 @@ import subprocess, os, shutil, json -CYD_PORTS = ["esp32-3248S035C", "esp32-2432S028R"] +CYD_PORTS = ["esp32-3248S035C", "esp32-2432S028R", "esp32-2432S022C"] BASE_DIR = os.getcwd() def get_manifest(base_path : str, device_name : str):