min version now selects highest ecc for data

Author: idolpx

lib/qrcode/qrcode.c

@@ -771,7 +771,7 @@ uint8_t qrcode_initBytes(QRCode *qrcode, uint8_t *data, uint16_t length) {
 
     // If Version is 0, choose the smallest version that can hold the data
     if (qrcode->version == VERSION_AUTO) {
-        qrcode->version = qrcode_minVersion(qrcode->ecc, qrcode->mode, (char*)data, length);
+        qrcode->version = qrcode_minVersion(qrcode->mode, (char*)data, length);
     }
     else if (qrcode->version > 40 || qrcode->ecc > 3)
     {
@@ -899,9 +899,10 @@ uint16_t qrcode_dataCapacity(uint8_t version, uint8_t ecc) {
     return dataCapacity;
 }
 
-uint8_t qrcode_minVersion(uint8_t ecc, uint8_t mode, const char *data, uint16_t length) {
+uint8_t qrcode_minVersion(uint8_t mode, const char *data, uint16_t length) {
 
     uint8_t version = 1;
+    uint8_t ecc = ECC_HIGH;
     uint8_t lengthMode = getModeBits(version, mode);
     uint16_t lengthMax;
 
@@ -910,7 +911,13 @@ uint8_t qrcode_minVersion(uint8_t ecc, uint8_t mode, const char *data, uint16_t
         lengthMax = qrcode_dataCapacity(version, ecc) - 2;
         //printf("Testing version[%d] ecc[%d] len[%d] lengthMode[%d] encoded[%d] max[%d]\n", version, ecc, length, lengthMode, lengthEncoded, lengthMax);
         if (lengthEncoded > lengthMax) {
-            version++;
+            if (ecc == 0)
+            {
+                version++;
+                ecc = ECC_HIGH;
+            }
+            else
+                ecc--;
         } else {
             break;
         }

lib/qrcode/qrcode.h

@@ -83,7 +83,7 @@ bool qrcode_getModule(QRCode *qrcode, uint8_t x, uint8_t y);
 
 uint8_t qrcode_determineMode(const char *data, uint16_t length);
 uint16_t qrcode_dataCapacity(uint8_t version, uint8_t ecc);
-uint8_t qrcode_minVersion(uint8_t ecc, uint8_t mode, const char *data, uint16_t length);
+uint8_t qrcode_minVersion(uint8_t mode, const char *data, uint16_t length);
 uint16_t qrcode_encodeBase45(unsigned char * dst, uint16_t *_max_dst_len, const unsigned char * src, uint16_t src_len);
 
 #ifdef __cplusplus

lib/qrcode/qrmanager.h

@@ -23,8 +23,8 @@ typedef enum {
 } qr_ecc_t;
 
 typedef enum {
-    QR_OUTPUT_MODE_ANSI,
     QR_OUTPUT_MODE_BINARY,
+    QR_OUTPUT_MODE_ANSI,
     QR_OUTPUT_MODE_BITMAP,
     QR_OUTPUT_MODE_SVG,
     QR_OUTPUT_MODE_ATASCII,
@@ -49,6 +49,7 @@ class QRManager {
         qrcode.ecc = ecc;
 
         output_mode = mode;
+        code = std::vector<uint8_t>();
     };
     ~QRManager() {
         free(qrcode.modules);