Skip to content

Commit

Permalink
Cardputer Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Spooks4576 committed Nov 5, 2024
1 parent 0686c07 commit b7ea527
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 122 deletions.
9 changes: 7 additions & 2 deletions configs/sdkconfig.cardputer
Original file line number Diff line number Diff line change
Expand Up @@ -2217,18 +2217,23 @@ CONFIG_BLUE_RGB_PIN=0
#
CONFIG_WITH_SCREEN=y
CONFIG_TFT_WIDTH=240
CONFIG_TFT_HEIGHT=320
CONFIG_TFT_HEIGHT=135
# CONFIG_USE_TOUCHSCREEN is not set
# CONFIG_USE_JOYSTICK is not set
CONFIG_USE_CARDPUTER=y
# CONFIG_IS_GHOST_BOARD is not set
# CONFIG_USE_7_INCHER is not set
# CONFIG_Waveshare_LCD is not set
# CONFIG_Crowtech_LCD is not set
# CONFIG_Sunton_LCD is not set
# CONFIG_USE_ILI9341_2 is not set
# end of Display Options

#
# Ghost Board Config
#
# CONFIG_IS_GHOST_BOARD is not set
# end of Ghost Board Config

#
# GPS Configuration
#
Expand Down
14 changes: 7 additions & 7 deletions main/managers/views/app_gallery_screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static int current_page = 0;
static int total_pages = 0;

static lv_obj_t *back_button = NULL;
#ifdef USE_TOUCHSCREEN
#ifdef CONFIG_USE_TOUCHSCREEN
static lv_obj_t *next_button = NULL;
static lv_obj_t *prev_button = NULL;
#endif
Expand All @@ -45,7 +45,7 @@ void apps_menu_create(void) {
LV_GRID_FR(0.5), // Row 0: Back button
LV_GRID_FR(1), // Row 1: Apps row 1
LV_GRID_FR(1), // Row 2: Apps row 2
#ifdef USE_TOUCHSCREEN
#ifdef CONFIG_USE_TOUCHSCREEN
LV_GRID_FR(0.5), // Row 3: Next/Prev buttons
#endif
LV_GRID_TEMPLATE_LAST
Expand Down Expand Up @@ -90,7 +90,7 @@ void apps_menu_create(void) {

lv_obj_add_flag(back_button, LV_OBJ_FLAG_HIDDEN);

#ifdef USE_TOUCHSCREEN
#ifdef CONFIG_USE_TOUCHSCREEN
// Create Next and Previous Buttons
next_button = lv_btn_create(apps_container);
lv_obj_set_size(next_button, button_width, button_height);
Expand Down Expand Up @@ -145,7 +145,7 @@ void apps_menu_create(void) {
// Create App Items for Current Page
refresh_apps_menu();

#ifndef USE_TOUCHSCREEN
#ifndef CONFIG_USE_TOUCHSCREEN
select_app_item(current_page * apps_per_page);
#endif

Expand Down Expand Up @@ -221,7 +221,7 @@ void refresh_apps_menu(void) {
lv_obj_set_user_data(app_item, (void *)(intptr_t)i);
}

#ifdef USE_TOUCHSCREEN
#ifdef CONFIG_USE_TOUCHSCREEN
// Update navigation buttons' visibility
if (current_page <= 0) {
lv_obj_add_flag(prev_button, LV_OBJ_FLAG_HIDDEN);
Expand All @@ -236,7 +236,7 @@ void refresh_apps_menu(void) {
}
#endif

#ifndef USE_TOUCHSCREEN
#ifndef CONFIG_USE_TOUCHSCREEN
// For devices without touchscreens, ensure selected_app_index is within the current page
if (selected_app_index != -1 && (selected_app_index < start_index || selected_app_index >= end_index)) {
selected_app_index = start_index;
Expand Down Expand Up @@ -290,7 +290,7 @@ void apps_menu_event_handler(InputEvent *event) {
display_manager_switch_view(&main_menu_view);
return;
}
#ifdef USE_TOUCHSCREEN
#ifdef CONFIG_USE_TOUCHSCREEN
else if (index == -2) { // Next button
if (current_page < total_pages - 1) {
current_page++;
Expand Down
2 changes: 1 addition & 1 deletion main/managers/views/main_menu_screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void main_menu_create(void) {
lv_obj_set_user_data(menu_item, (void *)(uintptr_t)i);
}

#ifndef USE_TOUCHSCREEN
#ifndef CONFIG_USE_TOUCHSCREEN
select_menu_item(0);
#endif

Expand Down
83 changes: 22 additions & 61 deletions sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -498,13 +498,13 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y
CONFIG_ESPTOOLPY_FLASHFREQ="80m"
# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
CONFIG_ESPTOOLPY_BEFORE_RESET=y
# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
Expand Down Expand Up @@ -589,7 +589,6 @@ CONFIG_BT_CONTROLLER_ENABLED=y
# NimBLE Options
#
CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set
# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set
# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set
Expand Down Expand Up @@ -1121,8 +1120,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
#
# Sleep Config
#
# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set
CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
Expand Down Expand Up @@ -1231,37 +1230,7 @@ CONFIG_PM_RESTORE_CACHE_TAGMEM_AFTER_LIGHT_SLEEP=y
#
# ESP PSRAM
#
CONFIG_SPIRAM=y

#
# SPI RAM config
#
# CONFIG_SPIRAM_MODE_QUAD is not set
CONFIG_SPIRAM_MODE_OCT=y
CONFIG_SPIRAM_TYPE_AUTO=y
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
CONFIG_SPIRAM_CLK_IO=30
CONFIG_SPIRAM_CS_IO=26
# CONFIG_SPIRAM_XIP_FROM_PSRAM is not set
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
CONFIG_SPIRAM_RODATA=y
# CONFIG_SPIRAM_SPEED_120M is not set
CONFIG_SPIRAM_SPEED_80M=y
# CONFIG_SPIRAM_SPEED_40M is not set
CONFIG_SPIRAM_SPEED=80
# CONFIG_SPIRAM_ECC_ENABLE is not set
CONFIG_SPIRAM_BOOT_INIT=y
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
# CONFIG_SPIRAM_USE_MEMMAP is not set
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
CONFIG_SPIRAM_USE_MALLOC=y
CONFIG_SPIRAM_MEMTEST=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
# end of SPI RAM config
# CONFIG_SPIRAM is not set
# end of ESP PSRAM

#
Expand Down Expand Up @@ -1406,9 +1375,9 @@ CONFIG_ESP_WIFI_ENABLED=y
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
CONFIG_ESP_WIFI_STATIC_TX_BUFFER=y
# CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER is not set
CONFIG_ESP_WIFI_TX_BUFFER_TYPE=0
CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=16
CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=32
CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
Expand All @@ -1418,7 +1387,6 @@ CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
CONFIG_ESP_WIFI_TX_BA_WIN=6
CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
CONFIG_ESP_WIFI_RX_BA_WIN=6
# CONFIG_ESP_WIFI_AMSDU_TX_ENABLED is not set
CONFIG_ESP_WIFI_NVS_ENABLED=y
CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752
CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
Expand Down Expand Up @@ -1511,7 +1479,6 @@ CONFIG_FATFS_API_ENCODING_ANSI_OEM=y
CONFIG_FATFS_FS_LOCK=0
CONFIG_FATFS_TIMEOUT_MS=10000
CONFIG_FATFS_PER_FILE_CACHE=y
CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
# CONFIG_FATFS_USE_FASTSEEK is not set
CONFIG_FATFS_VFS_FSTAT_BLKSIZE=0
# CONFIG_FATFS_IMMEDIATE_FSYNC is not set
Expand Down Expand Up @@ -1806,7 +1773,6 @@ CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y
# mbedTLS
#
CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
# CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC is not set
# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
Expand Down Expand Up @@ -1967,8 +1933,6 @@ CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
# CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE is not set
# end of Newlib

CONFIG_STDATOMIC_S32C1I_SPIRAM_WORKAROUND=y

#
# NVS
#
Expand Down Expand Up @@ -2252,15 +2216,15 @@ CONFIG_BLUE_RGB_PIN=0
# Display Options
#
CONFIG_WITH_SCREEN=y
CONFIG_TFT_WIDTH=800
CONFIG_TFT_HEIGHT=480
CONFIG_USE_TOUCHSCREEN=y
CONFIG_TFT_WIDTH=240
CONFIG_TFT_HEIGHT=135
# CONFIG_USE_TOUCHSCREEN is not set
# CONFIG_USE_JOYSTICK is not set
# CONFIG_USE_CARDPUTER is not set
CONFIG_USE_7_INCHER=y
CONFIG_USE_CARDPUTER=y
# CONFIG_USE_7_INCHER is not set
# CONFIG_Waveshare_LCD is not set
# CONFIG_Crowtech_LCD is not set
CONFIG_Sunton_LCD=y
# CONFIG_Sunton_LCD is not set
# CONFIG_USE_ILI9341_2 is not set
# end of Display Options

Expand All @@ -2279,12 +2243,12 @@ CONFIG_Sunton_LCD=y
#
# SPI and MMC Configuration
#
# CONFIG_USING_SPI is not set
CONFIG_USING_SPI=y
# CONFIG_USING_MMC is not set
CONFIG_SD_SPI_CS_PIN=4
CONFIG_SD_SPI_CLK_PIN=18
CONFIG_SD_SPI_MISO_PIN=19
CONFIG_SD_SPI_MOSI_PIN=23
CONFIG_SD_SPI_CS_PIN=12
CONFIG_SD_SPI_CLK_PIN=40
CONFIG_SD_SPI_MISO_PIN=39
CONFIG_SD_SPI_MOSI_PIN=14
# end of SPI and MMC Configuration
# end of Ghost ESP Options

Expand Down Expand Up @@ -2717,9 +2681,9 @@ CONFIG_LV_I2C_TOUCH=y
#
# Touchpanel Configuration (GT911)
#
# CONFIG_LV_GT911_SWAPXY is not set
CONFIG_LV_GT911_SWAPXY=y
# CONFIG_LV_GT911_INVERT_X is not set
# CONFIG_LV_GT911_INVERT_Y is not set
CONFIG_LV_GT911_INVERT_Y=y
# end of Touchpanel Configuration (GT911)

CONFIG_LV_I2C_TOUCH_PORT_0=y
Expand Down Expand Up @@ -2821,7 +2785,6 @@ CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
# CONFIG_BLUEDROID_ENABLED is not set
CONFIG_NIMBLE_ENABLED=y
CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
# CONFIG_NIMBLE_MEM_ALLOC_MODE_EXTERNAL is not set
# CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
CONFIG_NIMBLE_MAX_CONNECTIONS=3
CONFIG_NIMBLE_MAX_BONDS=3
Expand Down Expand Up @@ -2869,6 +2832,7 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
CONFIG_GDBSTUB_SUPPORT_TASKS=y
CONFIG_GDBSTUB_MAX_TASKS=32
# CONFIG_OTA_ALLOW_HTTP is not set
# CONFIG_ESP_SYSTEM_PD_FLASH is not set
CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=0
CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=0
CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
Expand All @@ -2884,9 +2848,7 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
# CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set
CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y
CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
CONFIG_DEFAULT_PSRAM_CLK_IO=30
CONFIG_DEFAULT_PSRAM_CS_IO=26
# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set
# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set
# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set
CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
Expand Down Expand Up @@ -2929,17 +2891,16 @@ CONFIG_ESP32_WIFI_ENABLED=y
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
# CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER is not set
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=16
CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=32
# CONFIG_ESP32_WIFI_CSI_ENABLED is not set
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
CONFIG_ESP32_WIFI_TX_BA_WIN=6
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
CONFIG_ESP32_WIFI_RX_BA_WIN=6
CONFIG_ESP32_WIFI_RX_BA_WIN=6
# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set
CONFIG_ESP32_WIFI_NVS_ENABLED=y
CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
Expand Down
Loading

0 comments on commit b7ea527

Please sign in to comment.