Skip to content

Commit d099662

Browse files
committed
Merge branch 'fix/qrcode_error_lp_environment_sensor' into 'master'
fix: Fix the qrcode dependency error in lp_environment_sensor example Closes AEG-2289 See merge request ae_group/esp-iot-solution!1268
2 parents 718df98 + d8d84ab commit d099662

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

examples/ulp/lp_cpu/lp_environment_sensor/components/app_wifi/app_wifi.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -108,6 +108,14 @@ static void intro_print(bool provisioned)
108108
static uint8_t *custom_mfg_data = NULL;
109109
static size_t custom_mfg_data_len = 0;
110110

111+
static esp_err_t qrcode_display(const char *text)
112+
{
113+
#define MAX_QRCODE_VERSION 5
114+
esp_qrcode_config_t cfg = ESP_QRCODE_CONFIG_DEFAULT();
115+
cfg.max_qrcode_version = MAX_QRCODE_VERSION;
116+
return esp_qrcode_generate(&cfg, text);
117+
}
118+
111119
esp_err_t app_wifi_set_custom_mfg_data(uint16_t device_type, uint8_t device_subtype)
112120
{
113121
int8_t mfg_data[] = {MFG_DATA_HEADER, MGF_DATA_APP_ID, MFG_DATA_VERSION, MFG_DATA_CUSTOMER_ID};
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
dependencies:
2-
espressif/esp_rainmaker: "1.1.0"
3-
qrcode:
4-
git: https://github.com/espressif/esp-rainmaker
5-
path: examples/common/qrcode
6-
version: "*"
7-
2+
espressif/esp_rainmaker: 1.1.0
3+
espressif/qrcode: 0.1.0
84
protocol_examples_common:
95
path: ${IDF_PATH}/examples/common_components/protocol_examples_common

0 commit comments

Comments
 (0)