Skip to content

Commit a952776

Browse files
authored
new lib builder for solo1 (#18)
1 parent 89d821c commit a952776

13 files changed

+202
-117
lines changed

.github/workflows/push.yml

+30-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,44 @@
1-
name: ESP32 Arduino Libs CI
1+
name: ESP32-solo1 Arduino new builder
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
pull_request:
4+
workflow_dispatch: # Manually start a workflow
5+
# push:
6+
# branches: master
7+
# paths-ignore:
8+
# - '.github/**' # Ignore changes towards the .github directory
89

910
jobs:
10-
1111
build-libs:
1212
name: Build Arduino Libs
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v2
16+
- uses: actions/setup-python@v2
17+
with:
18+
python-version: '3.8.10'
19+
architecture: 'x64'
1620
- name: Install dependencies
1721
run: bash ./tools/prepare-ci.sh
1822
- name: Build Arduino Libs
1923
run: bash ./build.sh
20-
- name: Upload archive
21-
uses: actions/upload-artifact@v1
24+
- name: Upload artifact
25+
uses: actions/upload-artifact@v2
2226
with:
23-
name: artifacts
27+
name: esp32-arduino
2428
path: dist
29+
- name: Download new builded framework
30+
uses: actions/download-artifact@v2
31+
with:
32+
name: esp32-arduino
33+
path: ./esp32-arduino
34+
- name: Display files from folder esp32-arduino
35+
run: ls esp32-arduino/*
36+
- name: Release
37+
uses: softprops/action-gh-release@v1
38+
#if: startsWith(github.ref, 'refs/tags/')
39+
with:
40+
tag_name: ${{ github.run_number }}
41+
prerelease: true
42+
files: esp32-arduino/framework*
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
# CMakeLists in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
if(IDF_TARGET STREQUAL "esp32")
6-
set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components)
7-
endif()
8-
95
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
106
project(arduino-lib-builder)
117

build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then
1010
exit 1
1111
fi
1212

13-
TARGET="all"
13+
TARGET="esp32"
1414
BUILD_TYPE="all"
1515
SKIP_ENV=0
1616
COPY_OUT=0
@@ -158,7 +158,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
158158
done
159159

160160
# archive the build
161-
if [ "$TARGET" = "all" ] && [ "$BUILD_TYPE" = "all" ]; then
161+
if [ "$BUILD_TYPE" = "all" ]; then
162162
./tools/archive-build.sh
163163
if [ $? -ne 0 ]; then exit 1; fi
164164
fi

configs/builds.json

+9-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,16 @@
3434
"targets":[
3535
{
3636
"target": "esp32s3",
37-
"idf_libs":["qio","80m"],
37+
"idf_libs":["dio","80m"],
3838
"bootloaders":[
3939
["qio","120m"],
4040
["qio","80m"],
41+
["qout","120m"],
42+
["qout","80m"],
43+
["dio","120m"],
4144
["dio","80m"],
45+
["dout","120m"],
46+
["dout","80m"],
4247
["opi_flash","opi_ram","80m"]
4348
],
4449
"mem_variants":[
@@ -48,7 +53,7 @@
4853
},
4954
{
5055
"target": "esp32s2",
51-
"idf_libs":["qio","80m"],
56+
"idf_libs":["dio","80m"],
5257
"bootloaders":[
5358
["qio","80m"],
5459
["qout","80m"],
@@ -63,7 +68,7 @@
6368
},
6469
{
6570
"target": "esp32c3",
66-
"idf_libs":["qio","80m"],
71+
"idf_libs":["dio","80m"],
6772
"bootloaders":[
6873
["qio","80m"],
6974
["qout","80m"],
@@ -92,4 +97,4 @@
9297
"mem_variants":[]
9398
}
9499
]
95-
}
100+
}

configs/defconfig.esp32

+20-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
2+
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
3+
CONFIG_DISABLE_HAL_LOCKS=y
24
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
3-
CONFIG_ARDUHAL_ESP_LOG=y
45
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
5-
CONFIG_COMPILER_CXX_EXCEPTIONS=y
6+
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
67
CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
78
CONFIG_COMPILER_WARN_WRITE_STRINGS=y
89
CONFIG_BT_ENABLED=y
@@ -17,41 +18,42 @@ CONFIG_BT_STACK_NO_LOG=y
1718
CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
1819
CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
1920
CONFIG_ESP32_SPIRAM_SUPPORT=y
20-
# CONFIG_SPIRAM_BOOT_INIT is not set
21+
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
2122
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
2223
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2324
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
24-
CONFIG_ESP32_ULP_COPROC_ENABLED=y
2525
CONFIG_ESP32_XTAL_FREQ_AUTO=y
2626
CONFIG_ETH_SPI_ETHERNET_DM9051=y
2727
CONFIG_ETH_SPI_ETHERNET_W5500=y
28-
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
2928
CONFIG_HTTPD_WS_SUPPORT=y
30-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
3129
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
3230
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
33-
CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
31+
CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
3432
CONFIG_ESP_TASK_WDT_PANIC=y
35-
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
33+
CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
3634
CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
3735
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
3836
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
3937
CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
40-
# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
4138
CONFIG_FATFS_CODEPAGE_850=y
4239
CONFIG_FATFS_LFN_STACK=y
4340
# CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
4441
CONFIG_FMB_TIMER_PORT_ENABLED=y
42+
CONFIG_FREERTOS_UNICORE=y
4543
CONFIG_FREERTOS_HZ=1000
4644
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
4745
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
4846
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
4947
CONFIG_FREERTOS_FPU_IN_ISR=y
48+
CONFIG_HAL_ASSERTION_DISABLE=y
5049
CONFIG_HEAP_POISONING_LIGHT=y
51-
CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
50+
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
5251
# CONFIG_LOG_COLORS is not set
52+
CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
5353
CONFIG_LWIP_MAX_SOCKETS=16
54-
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
54+
CONFIG_LWIP_SO_RCVBUF=y
55+
CONFIG_LWIP_IP_FORWARD=y
56+
CONFIG_LWIP_IPV4_NAPT=y
5557
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
5658
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
5759
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
@@ -60,15 +62,19 @@ CONFIG_LWIP_TCP_MSS=1436
6062
CONFIG_LWIP_TCP_RTO_TIME=3000
6163
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
6264
CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
63-
CONFIG_LWIP_SNTP_MAX_SERVERS=3
64-
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
6565
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
6666
# CONFIG_MBEDTLS_HARDWARE_SHA is not set
6767
CONFIG_MBEDTLS_PSK_MODES=y
6868
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
69-
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
69+
CONFIG_NEWLIB_NANO_FORMAT=y
70+
# CONFIG_OPENSSL_ERROR_STACK is not set
7071
CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
7172
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
73+
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
7274
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
7375
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
7476
CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
77+
CONFIG_ULP_COPROC_ENABLED=y
78+
# CONFIG_VFS_SUPPORT_SELECT is not set
79+
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
80+
# CONFIG_VFS_SUPPORT_TERMIOS is not set

configs/defconfig.esp32c3

+39-7
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,60 @@
11
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
2-
CONFIG_ARDUINO_RUN_CORE0=y
3-
CONFIG_ARDUINO_EVENT_RUN_CORE0=y
2+
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
3+
CONFIG_DISABLE_HAL_LOCKS=y
44
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
5+
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
6+
CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
57
CONFIG_BT_ENABLED=y
8+
CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y
9+
CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y
10+
CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y
11+
CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y
12+
CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y
13+
CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y
14+
CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y
15+
CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y
16+
CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y
17+
CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y
18+
CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y
19+
CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y
20+
CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y
21+
CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y
22+
CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y
23+
CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y
24+
CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y
25+
CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y
26+
CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y
27+
CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y
28+
CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y
629
CONFIG_BT_BLE_BLUFI_ENABLE=y
730
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
31+
CONFIG_ESP32C3_REV_MIN_0=y
832
CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576
9-
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
1033
CONFIG_HTTPD_WS_SUPPORT=y
1134
CONFIG_ESP_HTTPS_SERVER_ENABLE=y
12-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
35+
CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
36+
CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
1337
# CONFIG_ESP32_WIFI_IRAM_OPT is not set
1438
# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
1539
CONFIG_ESP_WIFI_FTM_ENABLE=y
1640
CONFIG_FATFS_LFN_HEAP=y
1741
CONFIG_FMB_TIMER_PORT_ENABLED=y
1842
CONFIG_FREERTOS_HZ=1000
1943
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
20-
CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
44+
CONFIG_HAL_ASSERTION_DISABLE=y
45+
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
2146
# CONFIG_LOG_COLORS is not set
47+
CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
2248
CONFIG_LWIP_MAX_SOCKETS=16
49+
CONFIG_LWIP_SO_RCVBUF=y
50+
CONFIG_LWIP_IP_FORWARD=y
51+
CONFIG_LWIP_IPV4_NAPT=y
2352
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
24-
CONFIG_LWIP_SNTP_MAX_SERVERS=3
25-
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
2653
CONFIG_MBEDTLS_PSK_MODES=y
2754
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
2855
CONFIG_MBEDTLS_CAMELLIA_C=y
56+
CONFIG_NEWLIB_NANO_FORMAT=y
57+
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
58+
# CONFIG_VFS_SUPPORT_SELECT is not set
59+
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
60+
# CONFIG_VFS_SUPPORT_TERMIOS is not set

configs/defconfig.esp32s2

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,38 @@
11
CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
2+
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y
3+
CONFIG_DISABLE_HAL_LOCKS=y
24
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
35
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
4-
CONFIG_ARDUINO_RUN_CORE0=y
5-
CONFIG_ARDUINO_EVENT_RUN_CORE0=y
6-
CONFIG_ARDUHAL_ESP_LOG=y
76
CONFIG_TINYUSB_MSC_BUFSIZE=4096
87
CONFIG_TINYUSB_DESC_DFU_RT_STRING="Espressif DFU Device"
98
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
10-
CONFIG_COMPILER_CXX_EXCEPTIONS=y
9+
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
1110
CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y
1211
CONFIG_COMPILER_WARN_WRITE_STRINGS=y
1312
# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set
1413
# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
1514
CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
1615
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
17-
# CONFIG_SPIRAM_BOOT_INIT is not set
16+
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
1817
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
1918
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
2019
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
2120
CONFIG_ESP32S2_KEEP_USB_ALIVE=y
22-
CONFIG_ETH_SPI_ETHERNET_DM9051=y
23-
CONFIG_ETH_SPI_ETHERNET_W5500=y
2421
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y
25-
CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
2622
CONFIG_HTTPD_WS_SUPPORT=y
2723
CONFIG_ESP_HTTPS_SERVER_ENABLE=y
28-
CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
2924
CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
3025
CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
3126
CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
3227
CONFIG_ESP_TASK_WDT_PANIC=y
33-
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
28+
CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
3429
CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
3530
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
3631
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
3732
CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
3833
CONFIG_ESP32_WIFI_CSI_ENABLED=y
3934
# CONFIG_ESP32_WIFI_IRAM_OPT is not set
4035
# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
41-
# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
4236
CONFIG_ESP_WIFI_FTM_ENABLE=y
4337
CONFIG_FATFS_CODEPAGE_850=y
4438
CONFIG_FATFS_LFN_STACK=y
@@ -48,11 +42,15 @@ CONFIG_FREERTOS_HZ=1000
4842
# CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
4943
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
5044
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
45+
CONFIG_HAL_ASSERTION_DISABLE=y
5146
CONFIG_HEAP_POISONING_LIGHT=y
52-
CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
47+
CONFIG_LOG_DEFAULT_LEVEL_NONE=y
5348
# CONFIG_LOG_COLORS is not set
49+
CONFIG_LWIP_LOCAL_HOSTNAME="tasmota"
5450
CONFIG_LWIP_MAX_SOCKETS=16
55-
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
51+
CONFIG_LWIP_SO_RCVBUF=y
52+
CONFIG_LWIP_IP_FORWARD=y
53+
CONFIG_LWIP_IPV4_NAPT=y
5654
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
5755
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
5856
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
@@ -61,16 +59,17 @@ CONFIG_LWIP_TCP_MSS=1436
6159
CONFIG_LWIP_TCP_RTO_TIME=3000
6260
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
6361
CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
64-
CONFIG_LWIP_SNTP_MAX_SERVERS=3
65-
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
6662
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
67-
# CONFIG_MBEDTLS_HARDWARE_MPI is not set
68-
# CONFIG_MBEDTLS_HARDWARE_SHA is not set
63+
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
6964
CONFIG_MBEDTLS_PSK_MODES=y
7065
CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
71-
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
66+
CONFIG_NEWLIB_NANO_FORMAT=y
7267
CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
7368
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
69+
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
7470
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
7571
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
7672
CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
73+
# CONFIG_VFS_SUPPORT_SELECT is not set
74+
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
75+
# CONFIG_VFS_SUPPORT_TERMIOS is not set

0 commit comments

Comments
 (0)