feat(qrcode): Add user_data for qrcode

Author: espressif2022

qrcode/esp_qrcode_main.c

@@ -32,8 +32,9 @@ static const char *lt[] = {
     /* 15 */ "\u2588\u2588",
 };
 
-void esp_qrcode_print_console(esp_qrcode_handle_t qrcode)
+void esp_qrcode_print_console(esp_qrcode_handle_t qrcode, void *user_data)
 {
+    (void)user_data;
     int size = qrcodegen_getSize(qrcode);
     int border = 2;
     unsigned char num = 0;
@@ -103,7 +104,7 @@ 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);
+        cfg->display_func((esp_qrcode_handle_t)qrcode, cfg->user_data);
         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,10 @@ 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 */
+    void (*display_func)(esp_qrcode_handle_t qrcode, void *user_data);   /**< Function called for displaying the QR Code after encoding is complete */
     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;
 
 /**
@@ -57,7 +58,7 @@ esp_err_t esp_qrcode_generate(esp_qrcode_config_t *cfg, const char *text);
   *
   * @param  qrcode  QR Code handle used by the display function.
   */
-void esp_qrcode_print_console(esp_qrcode_handle_t qrcode);
+void esp_qrcode_print_console(esp_qrcode_handle_t qrcode, void *user_data);
 
 /**
   * @brief  Returns the side length of the given QR Code
@@ -90,6 +91,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