Merge pull request #274 from bobbycar-graz/qrcodes

main/actions/qraction.cpp

@@ -9,20 +9,18 @@
 using namespace espgui;
 
 SwitchQrDisplayAction::SwitchQrDisplayAction(const qraction::QrMenu &qrmenu) :
-    m_msg{qrmenu.message},
-    m_ver{qrmenu.ver}
+    m_msg{qrmenu.message}
 {
 }
 
 SwitchQrDisplayAction::SwitchQrDisplayAction(qraction::QrMenu &&qrmenu) :
-    m_msg{std::move(qrmenu.message)},
-    m_ver{qrmenu.ver}
+    m_msg{std::move(qrmenu.message)}
 {
 }
 
 void SwitchQrDisplayAction::triggered()
 {
-    switchScreen<QrDisplay>(m_msg, m_ver);
+    switchScreen<QrDisplay>(m_msg);
 }
 
 SwitchQrImportDisplayAction::SwitchQrImportDisplayAction(const std::string &nvskey) :

main/actions/qraction.h

@@ -9,7 +9,6 @@ namespace qraction {
 struct QrMenu {
     std::string message;
     std::string text;
-    uint8_t ver;
 };
 } // namespace
 
@@ -22,7 +21,6 @@ public:
     void triggered() override;
 private:
     std::string m_msg;
-    uint8_t m_ver;
 };
 
 class SwitchQrImportDisplayAction : public virtual espgui::ActionInterface

main/displays/menus/greenpassmenu.cpp

@@ -53,7 +53,7 @@ public:
         }
         else
         {
-            espgui::switchScreen<QrDisplay>(m_qrmenu.message, m_qrmenu.ver);
+            espgui::switchScreen<QrDisplay>(m_qrmenu.message);
         }
     }
 private:
@@ -74,7 +74,7 @@ GreenPassMenu::GreenPassMenu()
         {
             if (const auto certTxt = qrimport::get_qr_code(nvs_key); certTxt)
             {
-                constructMenuItem<CertMenuItem>(qraction::QrMenu{.message=*certTxt, .text=nvs_key , .ver=15});
+                constructMenuItem<CertMenuItem>(qraction::QrMenu{.message=*certTxt, .text=nvs_key });
             }
             else
             {

main/displays/menus/selectbuildservermenu.cpp

@@ -33,9 +33,8 @@ public:
 
     void triggered() override
     {
-        configs.write_config(configs.otaServerUrl, m_buildserver_url); // mir egal ob succeeded
-        if (m_buildserver_url.substr(m_buildserver_url.length() - 4) == ".bin")
-            configs.write_config(configs.otaUrl, m_buildserver_url); // mir egal ob es succeeded
+        ESP_LOGE("BOBBY", "Saving buildserver url: %s", m_buildserver_url.c_str());
+        configs.write_config(configs.otaServerUrl, m_buildserver_url);
 
         url_for_latest.clear();
         url_for_hashes.clear();

main/displays/qrdisplay.cpp

@@ -9,17 +9,104 @@
 
 using namespace espgui;
 
-QrDisplay::QrDisplay(std::string_view msg, uint8_t ver) :
-    m_msg{msg},
-    m_ver{ver}
+QrDisplay::QrDisplay(std::string_view msg) :
+    m_msg{msg}
 {
 }
 
+uint16_t get_qrver_from_strlen(std::string_view str)
+{
+    // alpha numeric, ECC Level M
+    // version 1-40
+    uint32_t len = str.length();
+    if (len <= 20)
+        return 1;
+    else if (len <= 38)
+        return 2;
+    else if (len <= 61)
+        return 3;
+    else if (len <= 90)
+        return 4;
+    else if (len <= 122)
+        return 5;
+    else if (len <= 154)
+        return 6;
+    else if (len <= 178)
+        return 7;
+    else if (len <= 221)
+        return 8;
+    else if (len <= 262)
+        return 9;
+    else if (len <= 311)
+        return 10;
+    else if (len <= 366)
+        return 11;
+    else if (len <= 419)
+        return 12;
+    else if (len <= 483)
+        return 13;
+    else if (len <= 528)
+        return 14;
+    else if (len <= 600)
+        return 15;
+    else if (len <= 656)
+        return 16;
+    else if (len <= 734)
+        return 17;
+    else if (len <= 816)
+        return 18;
+    else if (len <= 909)
+        return 19;
+    else if (len <= 970)
+        return 20;
+    else if (len <= 1035)
+        return 21;
+    else if (len <= 1134)
+        return 22;
+    else if (len <= 1248)
+        return 23;
+    else if (len <= 1326)
+        return 24;
+    else if (len <= 1451)
+        return 25;
+    else if (len <= 1542)
+        return 26;
+    else if (len <= 1637)
+        return 27;
+    else if (len <= 1732)
+        return 28;
+    else if (len <= 1839)
+        return 29;
+    else if (len <= 1994)
+        return 30;
+    else if (len <= 2113)
+        return 31;
+    else if (len <= 2238)
+        return 32;
+    else if (len <= 2369)
+        return 33;
+    else if (len <= 2506)
+        return 34;
+    else if (len <= 2632)
+        return 35;
+    else if (len <= 2780)
+        return 36;
+    else if (len <= 2894)
+        return 37;
+    else if (len <= 3054)
+        return 38;
+    else if (len <= 3220)
+        return 39;
+    else
+        return 40;
+}
+
 void QrDisplay::initScreen()
 {
     QRCode qrcode;
-    uint8_t qrcodeBytes[qrcode_getBufferSize(m_ver)];
-    qrcode_initText(&qrcode, qrcodeBytes, m_ver, ECC_MEDIUM, m_msg.data());
+    const auto ver = get_qrver_from_strlen(m_msg);
+    uint8_t qrcodeBytes[qrcode_getBufferSize(ver)];
+    qrcode_initText(&qrcode, qrcodeBytes, ver, ECC_MEDIUM, m_msg.data());
 
     const uint8_t multiplier = (tft.width() - 9) / qrcode.size;
     const uint8_t x_offset = (tft.width() - qrcode.size * multiplier) / 2;
@@ -45,9 +132,10 @@ void QrDisplay::buttonPressed(espgui::Button button)
 
     switch (button)
     {
-    using espgui::Button;
-    case Button::Left: switchScreen<GreenPassMenu>(); break;
-    case Button::Right: switchScreen<GreenPassMenu>(); break;
+    case espgui::Button::Left:
+    case espgui::Button::Right:
+        switchScreen<GreenPassMenu>();
+        break;
     default:;
     }
 }

main/displays/qrdisplay.h

@@ -6,12 +6,14 @@
 // local includes
 #include "bobbydisplay.h"
 
+uint16_t get_qrver_from_strlen(std::string_view str);
+
 class QrDisplay : public BobbyDisplay
 {
     using Base = BobbyDisplay;
 
 public:
-    QrDisplay(std::string_view msg, uint8_t ver);
+    explicit QrDisplay(std::string_view msg);
 
     void initScreen() override;
 
@@ -19,5 +21,4 @@ public:
 
 private:
     std::string_view m_msg;
-    uint8_t m_ver;
 };

main/displays/qrimportdisplay.cpp

@@ -8,6 +8,7 @@ constexpr const char * const TAG = "qrimport";
 
 // displays/menus includes
 #include "displays/menus/greenpassmenu.h"
+#include "bobbyerrorhandler.h"
 
 // local includes
 #include "qrimport.h"
@@ -76,15 +77,17 @@ void QrImportDisplay::redraw()
         tft.setTextColor(TFT_YELLOW, TFT_BLACK);
         m_statuslabel.redraw("In progress");
     }
-    else if (!m_result)
+    else if (!m_result && !m_result.error().empty())
     {
         tft.setTextColor(TFT_RED, TFT_BLACK);
-        m_statuslabel.redraw(m_result.error());
+        BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", m_result.error()));
+        m_result.error().clear();
     }
     else
     {
         tft.setTextColor(TFT_GREEN, TFT_BLACK);
         m_statuslabel.redraw("OK");
+        switchScreen<GreenPassMenu>();
     }
 }
 

main/qrimport.cpp

@@ -5,13 +5,12 @@
 #include <nvs.h>
 
 // 3rd party includes
+#include <ArduinoJson.h>
 #include <asynchttprequest.h>
 #include <cleanuphelper.h>
-#include <cpputils.h>
 #include <delayedconstruction.h>
 
 // local includes
-#include "globals.h"
 #include "newsettings.h"
 
 namespace qrimport {
@@ -110,7 +109,7 @@ tl::expected<void, std::string> start_qr_request()
         return tl::make_unexpected("request im oarsch");
     }
 
-    if (const auto res = http_request->start(fmt::format("http://qr.bobbycar.cloud/{}.qr", configs.otaUsername.value)); !res)
+    if (auto res = http_request->start(fmt::format("http://qr.bobbycar.cloud/qr/{}.qr", configs.otaUsername.value)); !res)
     {
         return res;
     }
@@ -137,9 +136,9 @@ tl::expected<std::string, std::string> check_request()
     }
     else if (http_request->statusCode() != 200)
     {
-        return tl::make_unexpected(fmt::format("unexpected response status: {} {}",
-                                               http_request->statusCode(),
-                                               http_request->takeBuffer()));
+        DynamicJsonDocument doc(256);
+        deserializeJson(doc, http_request->takeBuffer());
+        return tl::make_unexpected(fmt::format("{} {}", http_request->statusCode(), doc["error"].as<std::string>()));
     }
     else
     {