Skip to content

Commit 0d08f6c

Browse files
committed
Build libs of esp-raimaker
1 parent eb3d6cc commit 0d08f6c

File tree

5 files changed

+66
-6
lines changed

5 files changed

+66
-6
lines changed

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/lib
44
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/image_util
55
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/face_detection
66
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-face/face_recognition
7+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/esp_rmaker_core
8+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/esp_rmaker_ota
9+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/json_generator
10+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/esp_rmaker_mqtt
11+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/esp_rmaker_standard_types
12+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/json_parser
13+
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/components/esp-rainmaker/components/qrcode
714

815
include $(IDF_PATH)/make/project.mk
916

main/sketch.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
#include "Arduino.h"
2-
2+
#include "esp_rmaker_core.h"
3+
#include <esp_rmaker_standard_params.h>
4+
#include "esp_camera.h"
35
void setup(){
4-
6+
/*esp_rmaker_config_t rainmaker_cfg = {
7+
.info = {
8+
.name = "Device",
9+
.type = "switch",
10+
},
11+
.enable_time_sync = false,
12+
};
13+
esp_err_t err = esp_rmaker_init(&rainmaker_cfg);
14+
esp_rmaker_device_add_name_param("Switch","name");
15+
esp_camera_deinit();
16+
*/
517
}
618

719
void loop(){

sdkconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y
1515
CONFIG_APP_COMPILE_TIME_DATE=y
1616
# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
1717
# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
18+
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
1819
CONFIG_ENABLE_ARDUINO_DEPENDS=y
1920
CONFIG_AUTOSTART_ARDUINO=y
2021
# CONFIG_ARDUINO_RUN_CORE0 is not set
@@ -65,6 +66,17 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
6566
# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
6667
# CONFIG_SECURE_BOOT_ENABLED is not set
6768
# CONFIG_SECURE_FLASH_ENC_ENABLED is not set
69+
CONFIG_ESP_RMAKER_TASK_STACK=4096
70+
CONFIG_ESP_RMAKER_TASK_PRIORITY=5
71+
CONFIG_ESP_RMAKER_MAX_NODE_CONFIG_SIZE=2048
72+
CONFIG_ESP_RMAKER_MAX_PARAM_DATA_SIZE=1024
73+
CONFIG_ESP_RMAKER_FACTORY_PARTITION_NAME="fctry"
74+
CONFIG_ESP_RMAKER_SNTP_SERVER_NAME="pool.ntp.org"
75+
CONFIG_ESP_RMAKER_OTA_AUTOFETCH=y
76+
CONFIG_ESP_RMAKER_OTA_AUTOFETCH_PERIOD=0
77+
# CONFIG_ESP_RMAKER_SKIP_COMMON_NAME_CHECK is not set
78+
# CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK is not set
79+
# CONFIG_ESP_RMAKER_SKIP_PROJECT_NAME_CHECK is not set
6880
CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-DO00EAB0"
6981
# CONFIG_ESPTOOLPY_BAUD_115200B is not set
7082
# CONFIG_ESPTOOLPY_BAUD_230400B is not set
@@ -261,6 +273,7 @@ CONFIG_D2WD_PSRAM_CLK_IO=9
261273
CONFIG_D2WD_PSRAM_CS_IO=10
262274
CONFIG_PICO_PSRAM_CS_IO=10
263275
CONFIG_SPIRAM_SPIWP_SD3_PIN=7
276+
# CONFIG_SPIRAM_2T_MODE is not set
264277
# CONFIG_ESP32_MEMMAP_TRACEMEM is not set
265278
# CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS is not set
266279
# CONFIG_ESP32_TRAX is not set
@@ -296,6 +309,7 @@ CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
296309
# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set
297310
# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
298311
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
312+
CONFIG_ESP32_RTC_XTAL_CAL_RETRY=1
299313
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
300314
# CONFIG_ESP32_XTAL_FREQ_40 is not set
301315
# CONFIG_ESP32_XTAL_FREQ_26 is not set
@@ -382,6 +396,7 @@ CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
382396
# CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
383397
CONFIG_ESP32_WIFI_IRAM_OPT=y
384398
# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
399+
CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
385400
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
386401
# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
387402
CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
@@ -491,6 +506,7 @@ CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
491506
CONFIG_LWIP_TIMERS_ONDEMAND=y
492507
CONFIG_LWIP_MAX_SOCKETS=10
493508
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
509+
# CONFIG_LWIP_SO_LINGER is not set
494510
CONFIG_LWIP_SO_REUSE=y
495511
CONFIG_LWIP_SO_REUSE_RXTOALL=y
496512
CONFIG_LWIP_SO_RCVBUF=y
@@ -648,6 +664,10 @@ CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
648664
# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
649665
# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
650666
# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
667+
# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set
668+
CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
669+
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
670+
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
651671
CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
652672
CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
653673
CONFIG_SPIFFS_MAX_PARTITIONS=3
@@ -687,6 +707,8 @@ CONFIG_WL_SECTOR_SIZE=4096
687707
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
688708
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
689709
CONFIG_WPA_MBEDTLS_CRYPTO=y
710+
# CONFIG_WPA_TLS_V12 is not set
711+
# CONFIG_WPA_WPS_WARS is not set
690712
# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
691713

692714
# Deprecated options for backward compatibility
@@ -754,6 +776,7 @@ CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
754776
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
755777
CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
756778
CONFIG_BLUEDROID_ENABLED=y
779+
# CONFIG_NIMBLE_ENABLED is not set
757780
CONFIG_BTC_TASK_STACK_SIZE=8192
758781
CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
759782
# CONFIG_BLUEDROID_PINNED_TO_CORE_1 is not set

tools/config.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ if [ -z $IDF_BRANCH ]; then
1212
IDF_BRANCH="release/v4.0"
1313
fi
1414

15+
if [ -z $AR ]; then
16+
AR="idf-release"
17+
fi
1518
# Owner of the target ESP32 Arduino repository
16-
AR_USER="espressif"
19+
AR_USER="sweetymhaiske"
1720

1821
# The full name of the repository
1922
AR_REPO="$AR_USER/arduino-esp32"
2023

2124
IDF_REPO_URL="https://github.com/espressif/esp-idf.git"
2225
CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
2326
FACE_REPO_URL="https://github.com/espressif/esp-face.git"
27+
RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git"
2428
AR_REPO_URL="https://github.com/$AR_REPO.git"
2529

2630
if [ -n $GITHUB_TOKEN ]; then

tools/update-components.sh

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ source ./tools/config.sh
88

99
if [ ! -d "$AR_COMPS/arduino" ]; then
1010
git clone $AR_REPO_URL "$AR_COMPS/arduino"
11+
git -C "$AR_COMPS/arduino" checkout "$AR/v4.0"
1112
else
12-
git -C "$AR_COMPS/arduino" fetch origin && \
13-
git -C "$AR_COMPS/arduino" pull origin master
13+
git -C "$AR_COMPS/arduino" checkout "$AR/v4.0"
1414
fi
1515
if [ $? -ne 0 ]; then exit 1; fi
16-
#git -C "$AR_COMPS/arduino" submodule update --init --recursive
16+
git -C "$AR_COMPS/arduino" submodule update --init --recursive
1717

1818
#
1919
# CLONE/UPDATE ESP32-CAMERA
@@ -38,3 +38,17 @@ else
3838
git -C "$AR_COMPS/esp-face" pull origin master
3939
fi
4040
if [ $? -ne 0 ]; then exit 1; fi
41+
42+
#
43+
# CLONE/UPDATE RAINMAKER
44+
#
45+
46+
if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then
47+
git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker"
48+
else
49+
git -C "$AR_COMPS/esp-rainmaker" fetch origin && \
50+
git -C "$AR_COMPS/esp-rainmaker" pull origin master
51+
fi
52+
if [ $? -ne 0 ]; then exit 1; fi
53+
git -C "$AR_COMPS/arduino" submodule update --init --recursive
54+

0 commit comments

Comments
 (0)