alex/esp-rainmaker
1
0
Fork 0
mirror of https://github.com/espressif/esp-rainmaker.git synced 2026-01-15 14:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/homekit_switch' into 'master'

Browse Source 
homekit_switch: Fixes for idf v5.x

See merge request app-frameworks/esp-rainmaker!371
This commit is contained in:
Piyush Shah
2023-05-22 15:17:13 +08:00
parent c0da2374b5 767643f6d3
commit c9f7b34cd3
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -86,14 +86,12 @@ build_idf_v5.0:
image: espressif/idf:release-v5.0
variables:
EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
EXAMPLES: "switch led_light fan temperature_sensor multi_device gpio"
build_idf_v5.1:
extends: .build_template
image: espressif/idf:release-v5.1
variables:
EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
EXAMPLES: "switch led_light fan temperature_sensor multi_device gpio"
build_docs:
stage: build

2
cli

Submodule cli updated: 01add85ea8...2865233052

2
components/rmaker_common

Submodule components/rmaker_common updated: 27556e1723...5ab4c7c19f

2
examples/homekit_switch/components/app_wifi/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
idf_component_register(SRCS "app_wifi_with_homekit.c"
INCLUDE_DIRS "."
REQUIRES wifi_provisioning qrcode esp_hap_core esp_hap_platform)
PRIV_REQUIRES wifi_provisioning qrcode esp_hap_core esp_hap_platform nvs_flash)

4
examples/homekit_switch/components/app_wifi/app_wifi_with_homekit.c
View File

@@ -80,10 +80,10 @@ static void app_wifi_print_qr(const char *name, const char *pop, const char *tra
PROV_QR_VERSION, name, transport);
}
#ifdef CONFIG_APP_WIFI_PROV_SHOW_QR
ESP_LOGI(TAG, "Scan this QR code from the phone app for Provisioning.");
printf("Scan this QR code from the phone app for Provisioning.\n");
qrcode_display(payload);
#endif /* CONFIG_APP_WIFI_PROV_SHOW_QR */
ESP_LOGI(TAG, "If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s", QRCODE_BASE_URL, payload);
printf("If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s\n", QRCODE_BASE_URL, payload);
esp_event_post(APP_WIFI_EVENT, APP_WIFI_EVENT_QR_DISPLAY, payload, strlen(payload) + 1, portMAX_DELAY);
}

6
examples/homekit_switch/main/app_homekit.c
View File

@@ -34,10 +34,10 @@ static void app_homekit_show_qr(void)
char *setup_payload = esp_hap_get_setup_payload(CONFIG_EXAMPLE_SETUP_CODE,
CONFIG_EXAMPLE_SETUP_ID, false, HAP_CID_SWITCH);
if (setup_payload) {
ESP_LOGI(TAG, "-----QR Code for HomeKit-----");
ESP_LOGI(TAG, "Scan this QR code from the Home app on iOS");
printf("-----QR Code for HomeKit-----\n");
printf("Scan this QR code from the Home app on iOS\n");
qrcode_display(setup_payload);
ESP_LOGI(TAG, "If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s",
printf("If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s\n",
QRCODE_BASE_URL, setup_payload);
free(setup_payload);
}

7
examples/homekit_switch/sdkconfig.defaults
View File

@@ -34,9 +34,8 @@ CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
# For additional security on reset to factory
CONFIG_ESP_RMAKER_USER_ID_CHECK=y
# Secure Local Control
CONFIG_ESP_RMAKER_LOCAL_CTRL_ENABLE=y
CONFIG_ESP_RMAKER_LOCAL_CTRL_SECURITY_1=y
# Application Rollback
CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
# Change default log level to reduce binary size
CONFIG_LOG_DEFAULT_LEVEL_WARN=y

3
examples/homekit_switch/sdkconfig.defaults.esp32 Normal file
View File

@@ -0,0 +1,3 @@
# To prevent IRAM overflow errors
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y