# HG changeset patch # User Michiel Broek # Date 1574712106 -3600 # Node ID cba50f7529d060dbe54a4cbd6754165efadd00ba # Parent ff7f7b47d699cad9c2100521d14931475dc9d23c Version 0.3.8. Switched build system to idf.py diff -r ff7f7b47d699 -r cba50f7529d0 CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,9 @@ +# The following lines of boilerplate have to be in your project's CMakeLists +# in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.5) + +set(PROJECT_VER "0.3.8") +set(PROJECT_NAME "brewboard") + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(brewboard) diff -r ff7f7b47d699 -r cba50f7529d0 Makefile --- a/Makefile Mon Nov 25 15:40:11 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -# -# This is a project Makefile. It is assumed the directory this Makefile resides in is a -# project subdirectory. -# - -PROJECT_VER := "0.3.7" -PROJECT_NAME := brewboard - -include $(IDF_PATH)/make/project.mk - diff -r ff7f7b47d699 -r cba50f7529d0 components/PID/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/PID/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,2 @@ +idf_component_register(SRCS PID_v1.c INCLUDE_DIRS .) + diff -r ff7f7b47d699 -r cba50f7529d0 components/esp32-ds18b20/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/esp32-ds18b20/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,1 @@ +idf_component_register(SRCS ./ds18b20.c INCLUDE_DIRS include REQUIRES esp32-owb) diff -r ff7f7b47d699 -r cba50f7529d0 components/esp32-owb/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/esp32-owb/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,2 @@ +idf_component_register(SRCS owb_rmt.c owb.c owb_gpio.c INCLUDE_DIRS include) + diff -r ff7f7b47d699 -r cba50f7529d0 components/spidriver/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/spidriver/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,2 @@ +idf_component_register(SRCS spi_master_lobo.c INCLUDE_DIRS .) + diff -r ff7f7b47d699 -r cba50f7529d0 components/tft/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/tft/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,2 @@ +idf_component_register(SRCS comic24.c DefaultFont.c def_small.c DejaVuSans18.c DejaVuSans24.c minya24.c SmallFont.c tft.c tftspi.c tooney32.c Ubuntu16.c + REQUIRES spidriver INCLUDE_DIRS .) diff -r ff7f7b47d699 -r cba50f7529d0 components/websocket/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/websocket/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,2 @@ +idf_component_register(SRCS websocket.c websocket_server.c INCLUDE_DIRS include REQUIRES mbedtls) + diff -r ff7f7b47d699 -r cba50f7529d0 components/websocket/Kconfig --- a/components/websocket/Kconfig Mon Nov 25 15:40:11 2019 +0100 +++ b/components/websocket/Kconfig Mon Nov 25 21:01:46 2019 +0100 @@ -4,7 +4,7 @@ config WEBSOCKET_SERVER_MAX_CLIENTS int "Max clients" range 1 1000 - default 20 + default 10 help Maximum number of clients that the WebSocket server can handle at a time. @@ -29,7 +29,7 @@ config WEBSOCKET_SERVER_TASK_STACK_DEPTH int "Stack depth" range 3000 20000 - default 6000 + default 7000 help Stack depth for the WebSocket server. The task handles reads. diff -r ff7f7b47d699 -r cba50f7529d0 main/CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/main/CMakeLists.txt Mon Nov 25 21:01:46 2019 +0100 @@ -0,0 +1,5 @@ +idf_component_register(SRCS automation.c brewboard.c buttons.c calibration.c config.c files.c + manual.c recipes.c setup.c + task_driver.c task_ds18b20.c task_http.c task_sdcard.c task_sound.c task_tft.c task_wifi.c updates.c + INCLUDE_DIRS ".") + diff -r ff7f7b47d699 -r cba50f7529d0 main/Kconfig.projbuild --- a/main/Kconfig.projbuild Mon Nov 25 15:40:11 2019 +0100 +++ b/main/Kconfig.projbuild Mon Nov 25 21:01:46 2019 +0100 @@ -47,7 +47,7 @@ config SSR_MLT_GPIO int "MLT SSR GPIO number" range 0 34 - default 33 + default 32 help GPIO number (IOxx) to the SSR for the MLT kettle. @@ -58,7 +58,7 @@ config SSR_HLT_GPIO int "HLT SSR GPIO number" range 0 34 - default 32 + default 33 help GPIO number (IOxx) to the SSR for the HLT kettle. diff -r ff7f7b47d699 -r cba50f7529d0 sdkconfig --- a/sdkconfig Mon Nov 25 15:40:11 2019 +0100 +++ b/sdkconfig Mon Nov 25 21:01:46 2019 +0100 @@ -10,8 +10,6 @@ # SDK tool configuration # CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_SDK_PYTHON="python" -CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set CONFIG_APP_BUILD_GENERATE_BINARIES=y @@ -39,15 +37,7 @@ # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT_ENABLED is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set -CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0" -CONFIG_ESPTOOLPY_BAUD_115200B=y -# CONFIG_ESPTOOLPY_BAUD_230400B is not set -# CONFIG_ESPTOOLPY_BAUD_921600B is not set -# CONFIG_ESPTOOLPY_BAUD_2MB is not set -# CONFIG_ESPTOOLPY_BAUD_OTHER is not set CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 -CONFIG_ESPTOOLPY_BAUD=115200 -CONFIG_ESPTOOLPY_COMPRESSED=y # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set CONFIG_ESPTOOLPY_FLASHMODE_DIO=y @@ -80,6 +70,13 @@ # CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 +# CONFIG_PARTITION_TABLE_SINGLE_APP is not set +# CONFIG_PARTITION_TABLE_TWO_OTA is not set +CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" +CONFIG_PARTITION_TABLE_OFFSET=0x8000 +CONFIG_PARTITION_TABLE_MD5=y CONFIG_TEMP_SENSORS_ONEWIRE=y # CONFIG_TEMP_SENSORS_SIMULATOR is not set CONFIG_ONE_WIRE_MLT=27 @@ -88,13 +85,6 @@ CONFIG_SSR_HLT_GPIO=33 CONFIG_SSR_PUMP_GPIO=12 CONFIG_BUZZER_GPIO=25 -# CONFIG_PARTITION_TABLE_SINGLE_APP is not set -# CONFIG_PARTITION_TABLE_TWO_OTA is not set -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_FILENAME="partitions.csv" -CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_PARTITION_TABLE_MD5=y CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y # CONFIG_COMPILER_OPTIMIZATION_SIZE is not set # CONFIG_COMPILER_OPTIMIZATION_PERF is not set @@ -560,19 +550,17 @@ # CONFIG_WL_SECTOR_SIZE_512 is not set CONFIG_WL_SECTOR_SIZE_4096=y CONFIG_WL_SECTOR_SIZE=4096 +CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 +CONFIG_WPA_MBEDTLS_CRYPTO=y CONFIG_WEBSOCKET_SERVER_MAX_CLIENTS=10 CONFIG_WEBSOCKET_SERVER_QUEUE_SIZE=10 CONFIG_WEBSOCKET_SERVER_QUEUE_TIMEOUT=30 CONFIG_WEBSOCKET_SERVER_TASK_STACK_DEPTH=7000 CONFIG_WEBSOCKET_SERVER_TASK_PRIORITY=5 -CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 -CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" -CONFIG_PYTHON="python" -CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set