Skip to content

Commit

Permalink
squashme: changes for internal CI
Browse files Browse the repository at this point in the history
add new builds to gitlab ci file
add result of running ${IDF_PATH}/tools/ci/check_kconfigs.py
add result of running ./tools/check_default_configs.sh
  • Loading branch information
JamieDriver committed Sep 1, 2023
1 parent 8230c50 commit 1431020
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 236 deletions.
21 changes: 21 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,27 @@ test_build_display_ttgo_tdisplay:
after_script:
- mv build build_display_ttgo_tdisplay

test_build_diycam_esp32-cam:
extends: .test_build_template
before_script:
- cp configs/sdkconfig_diycam_esp32-cam.defaults sdkconfig.defaults
after_script:
- mv build build_diycam_esp32-cam

test_build_diycam_esp32-wrover-cam:
extends: .test_build_template
before_script:
- cp configs/sdkconfig_diycam_esp32-wrover-cam.defaults sdkconfig.defaults
after_script:
- mv build build_diycam_esp32-wrover-cam

test_build_diycam_tcameraplus:
extends: .test_build_template
before_script:
- cp configs/sdkconfig_diycam_tcameraplus.defaults sdkconfig.defaults
after_script:
- mv build_diycam_tcameraplus

test_build_jade_noblobs_ci:
extends: .test_build_template
before_script:
Expand Down
1 change: 0 additions & 1 deletion configs/sdkconfig_display_m5stickcplus.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_DEBUG_MODE=y
CONFIG_BOARD_TYPE_M5_STICKC_PLUS=y
CONFIG_HAS_AXP=y
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
Expand Down
80 changes: 12 additions & 68 deletions configs/sdkconfig_diycam_esp32-cam.defaults
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
# CONFIG_BOOTLOADER_WDT_ENABLE is not set
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
# CONFIG_APP_COMPILE_TIME_DATE is not set
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_DEBUG_MODE=y
CONFIG_BOARD_TYPE_CUSTOM=y
#ESP32-Cam Settings

#
# Input Options
#
CONFIG_BUTTON_B_ACTIVE_HIGH=y
CONFIG_UI_WRAP_ALL_MENUS=y
CONFIG_INPUT_ONE_BUTTON_MODE=y

#
# Input Pin Mapping
#
CONFIG_BUTTON_B_ACTIVE_HIGH=y
CONFIG_INPUT_WHEEL_A=-1
CONFIG_INPUT_WHEEL_B=-1
CONFIG_INPUT_BTN_A=-1
CONFIG_INPUT_BTN_B=4
CONFIG_INPUT_WHEEL_SW=-1
# CONFIG_INPUT_INVERT_WHEEL is not set
CONFIG_INPUT_FRONT_SW=-1
# end of Input Pin Mapping

CONFIG_HAS_CAMERA=y

#
# Camera Rotation
#
# CONFIG_CAMERA_ROTATE_90 is not set
CONFIG_CAMERA_ROTATE_180=y
# CONFIG_CAMERA_ROTATE_270 is not set
# end of Camera Rotation

#
# Camera Pin Mapping
#
CONFIG_CAMERA_D0=5
CONFIG_CAMERA_D1=18
CONFIG_CAMERA_D2=19
Expand All @@ -42,66 +30,22 @@ CONFIG_CAMERA_D5=39
CONFIG_CAMERA_D6=34
CONFIG_CAMERA_D7=35
CONFIG_CAMERA_XCLK=0
CONFIG_CAMERA_XCLK_FREQ=20000000
CONFIG_CAMERA_PCLK=22
CONFIG_CAMERA_VSYNC=25
CONFIG_CAMERA_HREF=23
CONFIG_CAMERA_SDA=26
CONFIG_CAMERA_SCL=27
CONFIG_CAMERA_RESET=-1
CONFIG_CAMERA_PWDN=32
# end of Camera Pin Mapping

#
# Display Driver
#
# CONFIG_DISP_DRIVER_ILI9341 is not set
# CONFIG_DISP_DRIVER_ILI9488 is not set
CONFIG_DISP_DRIVER_ST7789V=y
# CONFIG_DISP_DRIVER_ST7735 is not set
# CONFIG_DISP_DRIVER_ST7735R is not set
# CONFIG_DISP_DRIVER_ST7735B is not set
# CONFIG_DISP_DRIVER_MAX is not set
CONFIG_DISP_TYPE=2
CONFIG_DISP_TFT_WIDTH=240
CONFIG_DISP_TFT_HEIGHT=320
CONFIG_DISP_COLOR_BITS_24=102
CONFIG_DISP_GAMMA_CURVE=0
CONFIG_DISP_SPI_CLOCK=32000000
CONFIG_DISP_INVERT_ROTATION=0
CONFIG_DISP_INVERT_ROTATION1=1
CONFIG_DISP_INVERT_ROTATION2=0
CONFIG_DISP_ORIENTATION_DEFAULT=1
CONFIG_DISP_RGB_BGR=0
CONFIG_GUI_DISPLAY_WINDOW_X1=40
CONFIG_GUI_DISPLAY_WINDOW_Y1=53
CONFIG_GUI_DISPLAY_WINDOW_X2=280
CONFIG_GUI_DISPLAY_WINDOW_Y2=188

#
# Display Pin mapping
#
CONFIG_DISP_PIN_NUM_MISO=-1
CONFIG_DISP_PIN_NUM_MOSI=15
CONFIG_DISP_PIN_NUM_CLK=14
CONFIG_DISP_PIN_NUM_CS=12
CONFIG_DISP_PIN_NUM_DC=2
CONFIG_DISP_PIN_NUM_TCS=-1
CONFIG_DISP_PIN_NUM_RST=13
CONFIG_DISP_PIN_NUM_BCKL=-1
# end of Display Pin mapping
# end of Display Driver

CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
# CONFIG_BOOTLOADER_WDT_ENABLE is not set
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
# CONFIG_APP_COMPILE_TIME_DATE is not set
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_DEBUG_MODE=y
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
Expand Down Expand Up @@ -199,4 +143,4 @@ CONFIG_SPIFFS_GC_MAX_RUNS=1
# CONFIG_BF3005_SUPPORT is not set
# CONFIG_BF20A6_SUPPORT is not set
# CONFIG_SC030IOT_SUPPORT is not set
CONFIG_SCCB_CLK_FREQ=200000
CONFIG_SCCB_CLK_FREQ=200000
84 changes: 11 additions & 73 deletions configs/sdkconfig_diycam_esp32-wrover-cam.defaults
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
# CONFIG_BOOTLOADER_WDT_ENABLE is not set
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
# CONFIG_APP_COMPILE_TIME_DATE is not set
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_DEBUG_MODE=y
CONFIG_BOARD_TYPE_CUSTOM=y
#Wrover-Cam Settings

#
# Input Options
#
# CONFIG_BUTTON_B_ACTIVE_HIGH is not set
# CONFIG_UI_WRAP_ALL_MENUS is not set
# CONFIG_INPUT_ONE_BUTTON_MODE is not set

#
# Input Pin Mapping
#
CONFIG_INPUT_WHEEL_A=-1
CONFIG_INPUT_WHEEL_B=-1
CONFIG_INPUT_BTN_A=32
CONFIG_INPUT_BTN_B=33
CONFIG_INPUT_WHEEL_SW=-1
# CONFIG_INPUT_INVERT_WHEEL is not set
CONFIG_INPUT_FRONT_SW=0
# end of Input Pin Mapping

CONFIG_HAS_CAMERA=y

#
# Camera Rotation
#
CONFIG_CAMERA_ROTATE_90=y
# CONFIG_CAMERA_ROTATE_180 is not set
# CONFIG_CAMERA_ROTATE_270 is not set
# end of Camera Rotation

#
# Camera Pin Mapping
#
CONFIG_CAMERA_D0=4
CONFIG_CAMERA_D1=5
CONFIG_CAMERA_D2=18
Expand All @@ -42,66 +25,21 @@ CONFIG_CAMERA_D5=39
CONFIG_CAMERA_D6=34
CONFIG_CAMERA_D7=35
CONFIG_CAMERA_XCLK=21
CONFIG_CAMERA_XCLK_FREQ=20000000
CONFIG_CAMERA_PCLK=22
CONFIG_CAMERA_VSYNC=25
CONFIG_CAMERA_HREF=23
CONFIG_CAMERA_SDA=26
CONFIG_CAMERA_SCL=27
CONFIG_CAMERA_RESET=-1
CONFIG_CAMERA_PWDN=-1
# end of Camera Pin Mapping

#
# Display Driver
#
# CONFIG_DISP_DRIVER_ILI9341 is not set
# CONFIG_DISP_DRIVER_ILI9488 is not set
CONFIG_DISP_DRIVER_ST7789V=y
# CONFIG_DISP_DRIVER_ST7735 is not set
# CONFIG_DISP_DRIVER_ST7735R is not set
# CONFIG_DISP_DRIVER_ST7735B is not set
# CONFIG_DISP_DRIVER_MAX is not set
CONFIG_DISP_TYPE=2
CONFIG_DISP_TFT_WIDTH=240
CONFIG_DISP_TFT_HEIGHT=320
CONFIG_DISP_COLOR_BITS_24=102
CONFIG_DISP_GAMMA_CURVE=0
CONFIG_DISP_SPI_CLOCK=32000000
CONFIG_DISP_INVERT_ROTATION=0
CONFIG_DISP_INVERT_ROTATION1=1
CONFIG_DISP_INVERT_ROTATION2=0
CONFIG_DISP_ORIENTATION_DEFAULT=3
CONFIG_DISP_RGB_BGR=0
CONFIG_GUI_DISPLAY_WINDOW_X1=40
CONFIG_GUI_DISPLAY_WINDOW_Y1=53
CONFIG_GUI_DISPLAY_WINDOW_X2=280
CONFIG_GUI_DISPLAY_WINDOW_Y2=188

#
# Display Pin mapping
#
CONFIG_DISP_PIN_NUM_MISO=-1
CONFIG_DISP_PIN_NUM_MOSI=12
CONFIG_DISP_PIN_NUM_CLK=2
CONFIG_DISP_PIN_NUM_CS=15
CONFIG_DISP_PIN_NUM_DC=13
CONFIG_DISP_PIN_NUM_TCS=-1
CONFIG_DISP_PIN_NUM_RST=14
CONFIG_DISP_PIN_NUM_BCKL=-1
# end of Display Pin mapping
# end of Display Driver

CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
# CONFIG_BOOTLOADER_WDT_ENABLE is not set
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y
# CONFIG_APP_COMPILE_TIME_DATE is not set
CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_OFFSET=0x9000
CONFIG_DEBUG_MODE=y
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=y
Expand Down Expand Up @@ -199,4 +137,4 @@ CONFIG_SPIFFS_GC_MAX_RUNS=1
# CONFIG_BF3005_SUPPORT is not set
# CONFIG_BF20A6_SUPPORT is not set
# CONFIG_SC030IOT_SUPPORT is not set
CONFIG_SCCB_CLK_FREQ=200000
CONFIG_SCCB_CLK_FREQ=200000
Loading

0 comments on commit 1431020

Please sign in to comment.