Merge pull request #535 from doudar/ConfigApp

Config app
doudar · Mar 16, 2024 · 6f72a14 · 6f72a14
2 parents e37747d + 3ad728f
commit 6f72a14
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 238 deletions.
diff --git a/.pre-commit-config.oldyaml b/.pre-commit-config.oldyaml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -60,7 +60,6 @@
         "iostream": "cpp",
         "*.dontuse": "cpp"
     },
-    "C_Cpp.errorSquiggles": "Disabled",
     "cSpell.words": [
         "Appender",
         "Baranick",
@@ -83,5 +82,4 @@
         "VERSIONFILE",
         "WEBSERVER"
     ],
-    "cmake.configureOnOpen": true
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Many updates and bug fixes which enable the Config App to communicate with SmartSpin2k. 
 - Scanned devices no longer saved to filesystem. The new scanning method would keep snowballing them otherwise. 
 - increased MTU for android
+- Updated WiFi connection setup.
+- Firmware no longer updates if only the html files need to be loaded. 
 
 ### Hardware
 - added Yesoul S3

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
diff --git a/include/Version_Converter.h b/include/Version_Converter.h
@@ -7,86 +7,45 @@
 
 #pragma once
 
-#include <Arduino.h>
-
-struct Version {
- private:
-  // Define four member variables major, minor, revision and build.
-  // Here, we are saying it as version-tag
-  int major, minor, revision, build, commitCount;
-  char *branch, *commit;
-
- public:
-  // Parameterized constructor. Pass string to it and it will
-  // extract version-tag from it.
-  //
-  // Use initializer list to assign version-tag variables
-  // Assign it by zero, otherwise std::scanf() will assign
-  // garbage value to the version-tag, if number of version-tag
-  // will be less than four.
-  explicit Version(const std::string& version) : major(0), minor(0), revision(0), build(0), commitCount(0), branch(const_cast<char*>("master")), commit(const_cast<char*>("")) {
-    if (sscanf(version.c_str(), "v%d.%d.%d.%d-%99s-%d-%99s", &major, &minor, &revision, &build, branch, &commitCount, commit) != 7) {
-      if (sscanf(version.c_str(), "v%d.%d.%d.%d", &major, &minor, &revision, &build) != 4) {
-        sscanf(version.c_str(), "%d.%d.%d.%d", &major, &minor, &revision, &build);
-      }
-    }
-
-    // version-tag must be >=0, if it is less than zero, then make it zero.
-    if (major < 0) major = 0;
-    if (minor < 0) minor = 0;
-    if (revision < 0) revision = 0;
-    if (build < 0) build = 0;
-    if (commitCount < 0) commitCount = 0;
-  }
-
-  // Overload greater than(>) operator to compare two version objects
-  bool operator>(const Version& other) {
-    // Start comparing version tag from left most.
-    // There are three relation between two number. It could be >, < or ==
-    // While comparing the version tag, if they are equal, then move to the
-    // next version-tag. If it could be greater then return true otherwise
-    // return false.
+#pragma once
 
-    if (branch != other.branch) return false;
+#include <string>
+#include <sstream>
 
-    // Compare major version-tag
-    if (major > other.major)
-      return true;
-    else if (major < other.major)
-      return false;
+class Version {
+private:
+    int year, month, day;
 
-    // Compare moinor version-tag
-    // If control came here it means that above version-tag(s) are equal
-    if (minor > other.minor)
-      return true;
-    else if (minor < other.minor)
-      return false;
+public:
+    // Parameterized constructor that extracts year, month, and day from the version string.
+    explicit Version(const std::string& versionStr) : year(0), month(0), day(0) {
+        std::istringstream versionStream(versionStr);
+        char dot; // Used to ignore the dots in the version string.
 
-    // Compare revision version-tag
-    // If control came here it means that above version-tag(s) are equal
-    if (revision > other.revision)
-      return true;
-    else if (revision < other.revision)
-      return false;
+        versionStream >> year >> dot >> month >> dot >> day;
 
-    // Compare build version-tag
-    // If control came here it means that above version-tag(s) are equal
-    if (build > other.build)
-      return true;
-    else if (build < other.build)
-      return false;
+        // Ensure all version components are non-negative.
+        if (year < 0) year = 0;
+        if (month < 0) month = 0;
+        if (day < 0) day = 0;
+    }
 
-    if (commitCount > other.commitCount)
-      return true;
-    else if (commitCount < other.commitCount)
-      return false;
+    // Overload the greater than (>) operator to compare two version objects.
+    bool operator>(const Version& other) const {
+        if (year != other.year) 
+            return year > other.year;
+        if (month != other.month) 
+            return month > other.month;
+        return day > other.day;
+    }
 
-    return false;
-  }
+    // Overload the equal to (==) operator to compare two version objects.
+    bool operator==(const Version& other) const {
+        return year == other.year && month == other.month && day == other.day;
+    }
 
-  // Overload equal to(==) operator to compare two version
-  bool operator==(const Version& other) {
-    return major == other.major && minor == other.minor && revision == other.revision && build == other.build && branch == other.branch && commitCount == other.commitCount &&
-           commit == other.commit;
-  }
+    // Overload the less than (<) operator for completeness (optional).
+    bool operator<(const Version& other) const {
+        return !(*this > other) && !(*this == other);
+    }
 };
diff --git a/include/cert.h b/include/cert.h
@@ -15,68 +15,35 @@
 
 #pragma once
 
-const char* rootCACertificate =
-
-    /* DigiCert Assured ID Root CA
-     * ===========================*/
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG\n"
-    "EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw\n"
-    "IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx\n"
-    "MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL\n"
-    "ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew\n"
-    "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO\n"
-    "9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy\n"
-    "UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW\n"
-    "/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy\n"
-    "oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf\n"
-    "GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF\n"
-    "66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq\n"
-    "hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc\n"
-    "EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn\n"
-    "SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i\n"
-    "8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe\n"
-    "+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==\n"
-    "-----END CERTIFICATE-----\n"
-    /* DigiCert Global Root CA
-     * =======================*/
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG\n"
-    "EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw\n"
-    "HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw\n"
-    "MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3\n"
-    "dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq\n"
-    "hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn\n"
-    "TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5\n"
-    "BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H\n"
-    "4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y\n"
-    "7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB\n"
-    "o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm\n"
-    "8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF\n"
-    "BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr\n"
-    "EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt\n"
-    "tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886\n"
-    "UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk\n"
-    "CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\n"
-    "-----END CERTIFICATE-----\n"
-    /* DigiCert High Assurance EV Root CA
-     * ==================================*/
-    "-----BEGIN CERTIFICATE-----\n"
-    "MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG\n"
-    "EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw\n"
-    "KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw\n"
-    "MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ\n"
-    "MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu\n"
-    "Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t\n"
-    "Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS\n"
-    "OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3\n"
-    "MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ\n"
-    "NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe\n"
-    "h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB\n"
-    "Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY\n"
-    "JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ\n"
-    "V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp\n"
-    "myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK\n"
-    "mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe\n"
-    "vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K\n"
-    "-----END CERTIFICATE-----\n";
+// certificate for https://raw.githubusercontent.com
+// DigiCert Global Root G2, valid until Sat Mar 29 2031, size: 1720 bytes 
+const char* rootCACertificate = \
+"-----BEGIN CERTIFICATE-----\n" \
+"MIIEyDCCA7CgAwIBAgIQDPW9BitWAvR6uFAsI8zwZjANBgkqhkiG9w0BAQsFADBh\n" \
+"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" \
+"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH\n" \
+"MjAeFw0yMTAzMzAwMDAwMDBaFw0zMTAzMjkyMzU5NTlaMFkxCzAJBgNVBAYTAlVT\n" \
+"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2Jh\n" \
+"bCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTCCASIwDQYJKoZIhvcNAQEBBQAD\n" \
+"ggEPADCCAQoCggEBAMz3EGJPprtjb+2QUlbFbSd7ehJWivH0+dbn4Y+9lavyYEEV\n" \
+"cNsSAPonCrVXOFt9slGTcZUOakGUWzUb+nv6u8W+JDD+Vu/E832X4xT1FE3LpxDy\n" \
+"FuqrIvAxIhFhaZAmunjZlx/jfWardUSVc8is/+9dCopZQ+GssjoP80j812s3wWPc\n" \
+"3kbW20X+fSP9kOhRBx5Ro1/tSUZUfyyIxfQTnJcVPAPooTncaQwywa8WV0yUR0J8\n" \
+"osicfebUTVSvQpmowQTCd5zWSOTOEeAqgJnwQ3DPP3Zr0UxJqyRewg2C/Uaoq2yT\n" \
+"zGJSQnWS+Jr6Xl6ysGHlHx+5fwmY6D36g39HaaECAwEAAaOCAYIwggF+MBIGA1Ud\n" \
+"EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFHSFgMBmx9833s+9KTeqAx2+7c0XMB8G\n" \
+"A1UdIwQYMBaAFE4iVCAYlebjbuYP+vq5Eu0GF485MA4GA1UdDwEB/wQEAwIBhjAd\n" \
+"BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYIKwYBBQUHAQEEajBoMCQG\n" \
+"CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKG\n" \
+"NGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RH\n" \
+"Mi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQuY29t\n" \
+"L0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA9BgNVHSAENjA0MAsGCWCGSAGG/WwC\n" \
+"ATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgGBmeBDAECAzANBgkqhkiG\n" \
+"9w0BAQsFAAOCAQEAkPFwyyiXaZd8dP3A+iZ7U6utzWX9upwGnIrXWkOH7U1MVl+t\n" \
+"wcW1BSAuWdH/SvWgKtiwla3JLko716f2b4gp/DA/JIS7w7d7kwcsr4drdjPtAFVS\n" \
+"slme5LnQ89/nD/7d+MS5EHKBCQRfz5eeLjJ1js+aWNJXMX43AYGyZm0pGrFmCW3R\n" \
+"bpD0ufovARTFXFZkAdl9h6g4U5+LXUZtXMYnhIHUfoyMo5tS58aI7Dd8KvvwVVo4\n" \
+"chDYABPPTHPbqjc1qCmBaZx2vN4Ye5DUys/vZwP9BFohFrH/6j/f3IL16/RZkiMN\n" \
+"JCqVJUzKoZHm1Lesh3Sz8W2jmdv51b2EQJ8HmA==\n" \
+"-----END CERTIFICATE-----\n" \
+"";
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt