Merge pull request #633 from espressif2022/feat/add_user_data

feat(qrcode): Add user_data for qrcode (IEC-446)

Author: mahavirj

qrcode/esp_qrcode_main.c

@@ -103,7 +103,15 @@ esp_err_t esp_qrcode_generate(esp_qrcode_config_t *cfg, const char *text)
                                    qrcodegen_VERSION_MIN, cfg->max_qrcode_version,
                                    qrcodegen_Mask_AUTO, true);
     if (ok && cfg->display_func) {
-        cfg->display_func((esp_qrcode_handle_t)qrcode);
+        // If user_data is provided, use callback version
+        // Otherwise use simple version (backward compatible)
+        if (cfg->user_data != NULL) {
+            // Use callback version with user_data
+            cfg->display_func_with_cb((esp_qrcode_handle_t)qrcode, cfg->user_data);
+        } else {
+            // Use simple version without user_data (backward compatible)
+            cfg->display_func((esp_qrcode_handle_t)qrcode);
+        }
         err = ESP_OK;
     }
 

qrcode/idf_component.yml

@@ -1,3 +1,3 @@
-version: "0.1.0~2"
+version: "0.2.0"
 description: QR Code generator
 url: https://github.com/espressif/idf-extra-components/tree/master/qrcode

qrcode/include/qrcode.h

@@ -21,9 +21,13 @@ typedef const uint8_t *esp_qrcode_handle_t;
   * @brief  QR Code configuration options
   */
 typedef struct {
-    void (*display_func)(esp_qrcode_handle_t qrcode);   /**< Function called for displaying the QR Code after encoding is complete */
+    union {
+        void (*display_func)(esp_qrcode_handle_t qrcode);                    /**< Function called for displaying the QR Code (without user_data, for backward compatibility) */
+        void (*display_func_with_cb)(esp_qrcode_handle_t qrcode, void *user_data);   /**< Function called for displaying the QR Code with user_data callback */
+    };                                                                        /**< Display function union for QR Code display */
     int max_qrcode_version;                             /**< Max QR Code Version to be used. Range: 2 - 40 */
     int qrcode_ecc_level;                               /**< Error Correction Level for QR Code */
+    void *user_data;                                    /**< User data */
 } esp_qrcode_config_t;
 
 /**
@@ -90,6 +94,7 @@ bool esp_qrcode_get_module(esp_qrcode_handle_t qrcode, int x, int y);
     .display_func = esp_qrcode_print_console, \
     .max_qrcode_version = 10, \
     .qrcode_ecc_level = ESP_QRCODE_ECC_LOW, \
+    .user_data = NULL, \
 }
 
 #ifdef __cplusplus