fix(prov): revert custom QR print implementation

Author: me-no-dev

CMakeLists.txt

@@ -304,12 +304,6 @@ if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThre
   endif()
 endif()
 
-if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_WiFiProv OR CONFIG_ARDUINO_SELECTIVE_RainMaker)
-  if(NOT IDF_TARGET STREQUAL "esp32c2")
-    list(APPEND requires espressif__qrcode)
-  endif()
-endif()
-
 idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
 
 if(NOT CONFIG_FREERTOS_HZ EQUAL 1000 AND NOT "$ENV{ARDUINO_SKIP_TICK_CHECK}")

libraries/WiFiProv/src/WiFiProv.cpp

@@ -30,7 +30,6 @@
 #include <esp32-hal.h>
 #if __has_include("qrcode.h")
 #include "qrcode.h"
-#include "qrcodegen.h"
 #endif
 
 #include <nvs_flash.h>
@@ -183,60 +182,6 @@ bool WiFiProvClass::disableAutoStop(uint32_t cleanup_delay) {
 
 // Copied from IDF example
 
-#if __has_include("qrcode.h")
-static const char *lt[] = {
-  /* 0 */ "  ",
-  /* 1 */ "\u2580 ",
-  /* 2 */ " \u2580",
-  /* 3 */ "\u2580\u2580",
-  /* 4 */ "\u2584 ",
-  /* 5 */ "\u2588 ",
-  /* 6 */ "\u2584\u2580",
-  /* 7 */ "\u2588\u2580",
-  /* 8 */ " \u2584",
-  /* 9 */ "\u2580\u2584",
-  /* 10 */ " \u2588",
-  /* 11 */ "\u2580\u2588",
-  /* 12 */ "\u2584\u2584",
-  /* 13 */ "\u2588\u2584",
-  /* 14 */ "\u2584\u2588",
-  /* 15 */ "\u2588\u2588",
-};
-
-static Print *qr_out = NULL;
-
-static void _qrcode_print_console(esp_qrcode_handle_t qrcode) {
-  int size = qrcodegen_getSize(qrcode);
-  int border = 2;
-  unsigned char num = 0;
-
-  if (qr_out == NULL) {
-    return;
-  }
-
-  for (int y = -border; y < size + border; y += 2) {
-    for (int x = -border; x < size + border; x += 2) {
-      num = 0;
-      if (qrcodegen_getModule(qrcode, x, y)) {
-        num |= 1 << 0;
-      }
-      if ((x < size + border) && qrcodegen_getModule(qrcode, x + 1, y)) {
-        num |= 1 << 1;
-      }
-      if ((y < size + border) && qrcodegen_getModule(qrcode, x, y + 1)) {
-        num |= 1 << 2;
-      }
-      if ((x < size + border) && (y < size + border) && qrcodegen_getModule(qrcode, x + 1, y + 1)) {
-        num |= 1 << 3;
-      }
-      qr_out->print(lt[num]);
-    }
-    qr_out->print("\n");
-  }
-  qr_out->print("\n");
-}
-#endif
-
 void WiFiProvClass::printQR(const char *name, const char *pop, const char *transport, Print &out) {
   if (!name || !transport) {
     log_w("Cannot generate QR code payload. Data missing.");
@@ -261,11 +206,8 @@ void WiFiProvClass::printQR(const char *name, const char *pop, const char *trans
 #if __has_include("qrcode.h")
   if (out) {
     esp_qrcode_config_t cfg = ESP_QRCODE_CONFIG_DEFAULT();
-    cfg.display_func = _qrcode_print_console;
     out.printf("Scan this QR code from the provisioning application for Provisioning.\n");
-    qr_out = &out;
     esp_qrcode_generate(&cfg, payload);
-    qr_out = NULL;
     out.printf("If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s\n", "https://rainmaker.espressif.com/qrcode.html", payload);
   }
 #else