add qrcode_minVersion() to auto size generated qrcode (#1007)

add qrcode_minVersion()
minor tweaks to qrManager::to_petscii()

Author: idolpx

lib/qrcode/qrcode.c

@@ -35,6 +35,7 @@
 
 #include "qrcode.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -843,6 +844,7 @@ int8_t qrcode_initText(QRCode *qrcode, uint8_t *modules, uint8_t version, uint8_
 }
 
 bool qrcode_getModule(QRCode *qrcode, uint8_t x, uint8_t y) {
+    //if (x < 0 || x >= qrcode->size || y < 0 || y >= qrcode->size) {
     if (x >= qrcode->size || y >= qrcode->size) {
         return false;
     }
@@ -860,3 +862,22 @@ void qrcode_getHex(QRCode *qrcode, char *result) {
 
 }
 */
+
+int8_t qrcode_minVersion(uint8_t ecc, const char *data) {
+    uint16_t len = strlen(data);
+
+    int8_t version = 1;
+    uint16_t capacity;
+    do {
+        capacity = NUM_ALPHANUMERIC_CAPACITY[ecc][version-1];
+        printf("Testing version[%d] ecc[%d] len[%d] capacity[%d]\n", version, ecc, len, capacity);
+        if (len > capacity) {
+            version++;
+        } else {
+            break;
+        }
+    } while (version <= 40);
+
+    printf("Set version[%d] ecc[%d] len[%d] capacity[%d]\n", version, ecc, len, capacity);
+    return version;
+}

lib/qrcode/qrcode.h

@@ -83,7 +83,7 @@ int8_t qrcode_initText(QRCode *qrcode, uint8_t *modules, uint8_t version, uint8_
 int8_t qrcode_initBytes(QRCode *qrcode, uint8_t *modules, uint8_t version, uint8_t ecc, uint8_t *data, uint16_t length);
 
 bool qrcode_getModule(QRCode *qrcode, uint8_t x, uint8_t y);
-
+int8_t qrcode_minVersion(uint8_t ecc, const char *data);
 
 
 #ifdef __cplusplus

lib/qrcode/qrmanager.cpp

@@ -11,15 +11,21 @@
 QRManager qrManager;
 
 std::vector<uint8_t> QRManager::encode(const void* src, size_t len, size_t version, size_t ecc, size_t *out_len) {
+    // If version is not specified, choose the smallest version that can hold the data
+    if (version < 1) 
+        version = qrcode_minVersion(ecc, (const char*)src);
+
     qrManager.version = version;
     qrManager.ecc_mode = ecc;
 
     *out_len = 0;
     qrManager.out_buf.clear();
     qrManager.out_buf.shrink_to_fit();
 
-    if (version < 1 || version > 40 || ecc > 3) {
-        return qrManager.out_buf;
+    //if (version < 1 || version > 40 || ecc < 0 || ecc > 3) {
+    //if (version < 1 || version > 40 || ecc > 3) {
+    if (version > 40 || ecc > 3) {
+        return qrManager.out_buf; // error
     }
 
     QRCode qr_code;
@@ -164,9 +170,14 @@ void QRManager::to_petscii(void) {
     std::vector<uint8_t> out;
     bool reverse = false;
 
-    out.push_back(size);
+//    out.push_back(0x00); // Load Address
+//    out.push_back(0x04); // Screen RAM 0x0400
+
+//    out.push_back(size);
+    out.push_back(13); // Carriage return
 
     for (auto y = 0; y < size; y += 2) {
+        out.push_back(32); // Space
         for (auto x = 0; x < size; x += 2) {
             uint8_t val = bytes[1+y*size+x];
             // QR Codes have odd number of rows/columns, so last PETSCII char is only half full
@@ -181,6 +192,8 @@ void QRManager::to_petscii(void) {
         }
         out.push_back(13); // Carriage return
     }
+//    out.push_back(00);
+//    out.push_back(00);
 
     qrManager.out_buf = out;
-}
+}

lib/qrcode/qrmanager.h

@@ -73,7 +73,7 @@ class QRManager {
     * PETSCII character can represent 4 bits. Carriage returns (0x0D) are
     * added at the end of each row to facilitate printing direct to screen.
     */
-   void to_petscii(void);
+    void to_petscii(void);
 
     size_t size() { return version * 4 + 17; }
     void set_buffer(const std::string& buffer) { in_buf = buffer; }