fix: arduino ide examples for v2.0.17 of arduino-esp32

govorox · Jul 17, 2024 · 2086598 · 2086598
1 parent 7a6e597
commit 2086598
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 43 deletions.
diff --git a/.github/workflows/arduino_examples.yml b/.github/workflows/arduino_examples.yml
@@ -23,7 +23,6 @@ jobs:
         arduino-cli config init
         arduino-cli core update-index
         arduino-cli core install arduino:avr
-        arduino-cli core install esp32:esp32@2.0.17
 
     - name: Install libs
       run: |
@@ -33,6 +32,7 @@ jobs:
         arduino-cli lib install "PubSubClient"
         arduino-cli lib install "TinyGSM"
 
-    - name: Compile Examples
+    - name: Compile Examples for Arduino-ESP32@2.0.17
       run: |
+        arduino-cli core install esp32:esp32@2.0.17
         ./.github/workflows/scripts/compile_arduino_examples.sh --clean
diff --git a/.github/workflows/scripts/compile_arduino_examples.sh b/.github/workflows/scripts/compile_arduino_examples.sh
@@ -70,7 +70,7 @@ clean_example() {
 # Remove previous log file
 rm -f "$ROOT_DIR/compile_errors.log"
 
-# compile_example "$ROOT_DIR"/examples/Esp32-Arduino-IDE/https_gsm_SIM800/ "esp32:esp32:esp32doit-devkit-v1"
+# compile_example "$ROOT_DIR"/examples/Esp32-Arduino-IDE/https_post_sim7600/ "esp32:esp32:esp32wroverkit"
 
 # Iterate over each example directory
 for example_dir in "$ROOT_DIR"/examples/Esp32-Arduino-IDE/*/; do

diff --git a/examples/Esp32-Arduino-IDE/https_eth_LilyGo-T-ETH-POE/https_eth_LilyGo-T-ETH-POE.ino b/examples/Esp32-Arduino-IDE/https_eth_LilyGo-T-ETH-POE/https_eth_LilyGo-T-ETH-POE.ino
@@ -9,12 +9,7 @@
  * Base example:  https://github.com/Xinyuan-LilyGO/LilyGO-T-ETH-POE/blob/master/example/eth/eth.ino
  * 
  **************************************************************/
-#if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3,0,0)
-#include <ETHClass2.h>       //Is to use the modified ETHClass
-#define ETH  ETH2
-#else
 #include <ETH.h>
-#endif
 #include "WiFi.h"
 #include "SSLClient.h"
 //To make http request esay: https://github.com/arduino-libraries/ArduinoHttpClient

diff --git a/...tps_gsm_SIM7600/https_get_sim7600/certs.h → ...p32-Arduino-IDE/https_get_sim7600/certs.h b/...tps_gsm_SIM7600/https_get_sim7600/certs.h → ...p32-Arduino-IDE/https_get_sim7600/certs.h
diff --git a/...0/https_get_sim7600/https_get_sim7600.ino → ...E/https_get_sim7600/https_get_sim7600.ino b/...0/https_get_sim7600/https_get_sim7600.ino → ...E/https_get_sim7600/https_get_sim7600.ino
@@ -45,7 +45,7 @@ const char server[] = "vsh.pp.ua";
 const char resource[] = "/TinyGSM/logo.txt";
 const int port = 443;
 
-#include <TinyGsmClient.h>
+#include <TinyGSM.h>
 #include <ArduinoHttpClient.h>
 #include "SSLClient.h"
 #include "utilities.h"
@@ -212,7 +212,6 @@ void loop()
         24 - HYBRID(CDMA and eHRPD)
     */
     modem.sendAT(GF("+CNSMOD?"));
-    if (modem.waitResponse(GF(GSM_NL "+CNSMOD:")) != 1) { }
     int nmodec = modem.stream.readStringUntil(',').toInt() != 0;
     int nmode = modem.stream.readStringUntil('\n').toInt();
     modem.waitResponse();

diff --git a/...gsm_SIM7600/https_get_sim7600/utilities.h → ...Arduino-IDE/https_get_sim7600/utilities.h b/...gsm_SIM7600/https_get_sim7600/utilities.h → ...Arduino-IDE/https_get_sim7600/utilities.h
diff --git a/...ps_gsm_SIM7600/https_post_sim7600/certs.h → ...32-Arduino-IDE/https_post_sim7600/certs.h b/...ps_gsm_SIM7600/https_post_sim7600/certs.h → ...32-Arduino-IDE/https_post_sim7600/certs.h
diff --git a/...https_post_sim7600/https_post_sim7600.ino → ...https_post_sim7600/https_post_sim7600.ino b/...https_post_sim7600/https_post_sim7600.ino → ...https_post_sim7600/https_post_sim7600.ino
@@ -45,7 +45,7 @@ const char server[] = "hookb.in";
 const char resource[] = "/eKKEKgbNZPCeYYRdZXDo";
 const int port = 443;
 
-#include <TinyGsmClient.h>
+#include <TinyGSM.h>
 #include <ArduinoHttpClient.h>
 #include "SSLClient.h"
 #include "utilities.h"
@@ -212,7 +212,6 @@ void loop()
         24 - HYBRID(CDMA and eHRPD)
     */
     modem.sendAT(GF("+CNSMOD?"));
-    if (modem.waitResponse(GF(GSM_NL "+CNSMOD:")) != 1) { }
     int nmodec = modem.stream.readStringUntil(',').toInt() != 0;
     int nmode = modem.stream.readStringUntil('\n').toInt();
     modem.waitResponse();

diff --git a/...sm_SIM7600/https_post_sim7600/utilities.h → ...rduino-IDE/https_post_sim7600/utilities.h b/...sm_SIM7600/https_post_sim7600/utilities.h → ...rduino-IDE/https_post_sim7600/utilities.h
diff --git a/examples/Esp32-Arduino-IDE/mqtt_gsm_SIM800L_Azure_x509_Device_Twin/ca_cert.h b/examples/Esp32-Arduino-IDE/mqtt_gsm_SIM800L_Azure_x509_Device_Twin/ca_cert.h
@@ -1,31 +1,87 @@
-//CA Certificate for www.howsmyssl.com (valid until 12-03-2027)
+// This file contains the root CA certificate, client certificate and client private key
 const char root_ca[] PROGMEM =
-"-----BEGIN CERTIFICATE-----\n"
-"MIIFBTCCAu2gAwIBAgIQS6hSk/eaL6JzBkuoBI110DANBgkqhkiG9w0BAQsFADBP\n"
-"MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy\n"
-"Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa\n"
-"Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF\n"
-"bmNyeXB0MQwwCgYDVQQDEwNSMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\n"
-"AoIBAQDPV+XmxFQS7bRH/sknWHZGUCiMHT6I3wWd1bUYKb3dtVq/+vbOo76vACFL\n"
-"YlpaPAEvxVgD9on/jhFD68G14BQHlo9vH9fnuoE5CXVlt8KvGFs3Jijno/QHK20a\n"
-"/6tYvJWuQP/py1fEtVt/eA0YYbwX51TGu0mRzW4Y0YCF7qZlNrx06rxQTOr8IfM4\n"
-"FpOUurDTazgGzRYSespSdcitdrLCnF2YRVxvYXvGLe48E1KGAdlX5jgc3421H5KR\n"
-"mudKHMxFqHJV8LDmowfs/acbZp4/SItxhHFYyTr6717yW0QrPHTnj7JHwQdqzZq3\n"
-"DZb3EoEmUVQK7GH29/Xi8orIlQ2NAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG\n"
-"MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/\n"
-"AgEAMB0GA1UdDgQWBBS7vMNHpeS8qcbDpHIMEI2iNeHI6DAfBgNVHSMEGDAWgBR5\n"
-"tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG\n"
-"Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD\n"
-"VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B\n"
-"AQsFAAOCAgEAkrHnQTfreZ2B5s3iJeE6IOmQRJWjgVzPw139vaBw1bGWKCIL0vIo\n"
-"zwzn1OZDjCQiHcFCktEJr59L9MhwTyAWsVrdAfYf+B9haxQnsHKNY67u4s5Lzzfd\n"
-"u6PUzeetUK29v+PsPmI2cJkxp+iN3epi4hKu9ZzUPSwMqtCceb7qPVxEbpYxY1p9\n"
-"1n5PJKBLBX9eb9LU6l8zSxPWV7bK3lG4XaMJgnT9x3ies7msFtpKK5bDtotij/l0\n"
-"GaKeA97pb5uwD9KgWvaFXMIEt8jVTjLEvwRdvCn294GPDF08U8lAkIv7tghluaQh\n"
-"1QnlE4SEN4LOECj8dsIGJXpGUk3aU3KkJz9icKy+aUgA+2cP21uh6NcDIS3XyfaZ\n"
-"QjmDQ993ChII8SXWupQZVBiIpcWO4RqZk3lr7Bz5MUCwzDIA359e57SSq5CCkY0N\n"
-"4B6Vulk7LktfwrdGNVI5BsC9qqxSwSKgRJeZ9wygIaehbHFHFhcBaMDKpiZlBHyz\n"
-"rsnnlFXCb5s8HKn5LsUgGvB24L7sGNZP2CX7dhHov+YhD+jozLW2p9W4959Bz2Ei\n"
-"RmqDtmiXLnzqTpXbI+suyCsohKRg6Un0RC47+cpiVwHiXZAW+cn8eiNIjqbVgXLx\n"
-"KPpdzvvtTnOPlC7SQZSYmdunr3Bf9b77AiC/ZidstK36dRILKz7OA54=\n"
+    "-----BEGIN CERTIFICATE-----\n"
+"MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF\n"
+"ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6\n"
+"b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL\n"
+"MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv\n"
+"b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj\n"
+"ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM\n"
+"9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw\n"
+"IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6\n"
+"VOujw5H5SNz/0egwLX0tdHA234gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L\n"
+"93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm\n"
+"jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC\n"
+"AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA\n"
+"A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI\n"
+"U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs\n"
+"N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv\n"
+"o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU\n"
+"5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy\n"
+"rqXRfboQnoZsG4q5WTP468SQvvG5\n"
 "-----END CERTIFICATE-----";
+
+// certificate
+const char client_cert_pem[] PROGMEM =
+    "-----BEGIN CERTIFICATE-----\n"
+"MIIDWTCCAkGgAwIBAgIUE9evNgJkNMn0MsfViCBjxUNRMZswDQYJKoZIhvcNAQEL\n"
+"BQAwTTFLMEkGA1UECwxCQW1hem9uIFdlYiBTZXJ2aWNlcyBPPUFtYXpvbi5jb20g\n"
+"SW5jLiBMPVNlYXR0bGUgU1Q9V2FzaGluZ3RvbiBDPVVTMB4XDTIzMTAwNDEwNTMw\n"
+"NloXDTQ5MTIzMTIzNTk1OVowHjEcMBoGA1UEAwwTQVdTIElvVCBDZXJ0aWZpY2F0\n"
+"ZTCCASIwDQYJKoZIhvcNAQE23QADggEPADCCAQoCggEBAMJlPMRdKRLO6FxDOQVM\n"
+"FTDRvUel/UZfB5PfcrNmIC8544q6kFlekveJL0DvEaYxkmasJTtMgVTYe8eiEnuP\n"
+"857Eoeu8so1Bqol+bmWtLm29K5zDC68ObETpv1wHX0Xcoh0IxMbtB//SxnRvVdrz\n"
+"neyX1H9paYqOyv+FIdjNL2otW6bEF1uLo+2wpV9q2MxmnajsXQ9GeI0ZrHzPevVg\n"
+"j69k9F8O5TOPyWKi8/PcAe7LVEYcCHp8bznlCslC8zS7wX+69qwI9x6cQksgxTeQ\n"
+"Q0pm7EbweyYicI7YeQs/7sA0iqBXxgFpW8FWgfKyR6MFNy9QKgwyvw/uWBUg65PQ\n"
+"0/cCAwEAAaNgMF4wHwYDVR0jBBgwFoAUPC5Zkf6FZgvddOyhRO+D/AEF4AkwHQYD\n"
+"VR0OBBYEFJRgXFfBW+opnmqhYtDxuID7gMaMMAwGA1UdEwEB/wQCMAAwDgYDVR0P\n"
+"AQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4IBAQBp2hHcgllqjTtD+O0qTXyLjB5L\n"
+"YpbJjIrkhh1obwMJkmCMTwF7W1H79gCDc9xPCsjSTGfD6UlmZgceIxTT389kGfs0\n"
+"TygBn1aDj6+SvDtl0/AnzlyK3Z5cfegIwMwAF4aT+A2L67kW/RvlZaRaw0RXGavj\n"
+"RR56oY16h4ufcNliXDk0didHKrudssT8RmrNnZJ907/wU8z5PzotnnWWp/nqNzcN\n"
+"lhPMS989rQ8hliIY3cQ4p35QbYuXqwXyO9EUgtKnZMHmTEAApTqXKbiqxK69gzag\n"
+"rfmHT4kSSEF8ytVv4+qxGkZjrRzLRi/Oszy+TtQl1uKMp7dtREyhMXXELVc6\n"
+"-----END CERTIFICATE-----";
+
+// private key
+const char client_private_key_pem[] PROGMEM =
+    "-----BEGIN RSA PRIVATE KEY-----\n"
+"MIIEowIBAAKCAQEAwmU8xF0pEs7oXEM5BUwVMNG9R6X9Rl8Hk99ys2YgLznjirqQ\n"
+"WV6S94kvQO8RpjGSZqwlO0yBVNh7x6ISe4/znsSh67yyjUGqiX5uZa0ubb0rnMML\n"
+"rw5sROm/XAdfRdyiHQjExu0H/9LGdG9V2vOd7JfUf2lpio7K/4Uh2M0vai1bpsQX\n"
+"W4uj7bClX2rYzGadqOxdD0Z4jRmsfM969WCPr2T0Xw7lM4/JYqLz89wB7stURhwI\n"
+"enxvOeUKyULzNLvBf7r223j3HpxCSyDFN5BDSmbsRvB7JiJwjth5Cz/uwDSKoFfG\n"
+"AWlbwVaB8rJHowU3L1AqDDK/D+5YFSDrk9DT9wIDAQABAoIBAF+o5eBTX7TrsJhG\n"
+"VDbxG7RsYdJyMlKAzP/Ng2oYpVnYCMrpx8LSsUuybFhtzKeV2U9BAwlNOo+AAFla\n"
+"vfGkAuRsKqoQr2Snnb4PQ1Axiplh76YyrPs2A71dsVceIZoFWpkjCYJCfh87n4EI\n"
+"kJ0wKNSWWnFgdBlE70wSPXescNq0H6kj1x7ik2LfvfByyzE0VGKJlHgBSzmdac/I\n"
+"a8sWSXGMyI7futhcrpKy8DHapR7a6bQYAXV2gZOXzA3t8WUctmwsNNMCCZOIJCHh\n"
+"eN8XoL2ZrMNGchslu0LhyhtA7wDlCosXLYbbCIzuMh02eUK9KS+6M2mQEpuocYDx\n"
+"L+WzlUECgYEA5tDxGIpTyjA1k2Pb5twljIxYzTLZZnIyhO5N2iuBeEng7PWx14Ic\n"
+"UNFh4qLB/rxouhVXk5OCoNpZgEBoNJwuioaRcdrgaBp7jgGwONwrp87mDigSfgAt\n"
+"sD1TinRxBlX1cupcGw4Ou/U1oLzpDSFyqtkLFkdbj57ZtYIvIV/QfDECgYEA15sB\n"
+"+GXJs2+Rgy1CncOdX3wB1BVX4eX/yF7oihsPfjXq87ZT8WK1wveUI7X0eVV4hcgp\n"
+"t5Xlwy4MfRLtg+jyWS3RWgWK04Y7ypOZdGVLrvPXBg6VrcF6dJXPMSIEL4JMVm+P\n"
+"OuHCTItI+WDGBJDbj/ctefrzMG2cfgxbwVpo0KcCgYEAl5j8AQY5aj6nsZqQv9wv\n"
+"vVQgrwWKzEKM88ogz/5rFrpPRNNKbyVBu8MJ63TCvbC5iB6kWoUz8rn2tsmWp5c8\n"
+"6jbgKEt9wGJEbEynlXDmK100tG+VVbSATZS53eIEqgijIUrUG+DrxH+VLXFmD/27\n"
+"9oJ/Sa6scHQAwbozglQP9sECgYAz5nxy7w2+w/yjNyHyGESp15AZHYoqNtN7yFzx\n"
+"4dG48AG+6QUL9lcKt85RSluvWYPJsIVaTBsjANLAyO2j809jaEQdB3iDsqxx91XZ\n"
+"TwkI9Gmua5RcX1a6+dUGXsnjJdp6dCBmbDH5ew31+fWw46322el4k5A2+CvTq+Xq\n"
+"hXj1wQKBgHDlcPYRv+GVZZGY6ZV9eK4zs9p2EijbJveS1GH6a6eEnIrfeSeXiUou\n"
+"w3h/ecyBCQDwC3ju6qSiNBfXzW+rYIHbE7ztR/10hEWv/FG0eJ4Ul8/I588gfJnn\n"
+"1my9XCbBOJfyxpaykYeGz+Kbu6ge93FSLtDbFwZvSwJMy7xbzZ2d\n"
+"-----END RSA PRIVATE KEY-----";
+
+// certificate
+const char client_public_key_pem[] PROGMEM =
+    "-----BEGIN PUBLIC KEY-----\n"
+"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwmU8xF0pEs7oXEM5BUwV\n"
+"MNG9R6X9Rl8Hk99ys2YgLznjirqQWV6S94kvQO8RpjGSZqwlO0yBVNh7x6I234/z\n"
+"nsSh67yyjUGqiX5uZa0ubb0rnMMLrw5sROm/XAdfRdyiHQjExu0H/9LGdG9V2vOd\n"
+"7JfUf2lpio7K/4Uh2M0vai1bpsQXW4uj7bClX2rYzGadqOxdD0Z4jRmsfM969WCP\n"
+"r2T0Xw7lM4/JYqLz89wB7stURhwIenxvOeUKyULzNLvBf7r2rAj3HpxCSyDFN5BD\n"
+"SmbsRvB7JiJwjth5Cz/uwDSKoFfGAWlbwVaB8rJHowU3L1AqDDK/D+5YFSDrk9DT\n"
+"9wIDAQAB\n"
+"-----END PUBLIC KEY-----";
diff --git a/...o-IDE/mqtt_gsm_SIM800L_Azure_x509_Device_Twin/mqtt_gsm_SIM800L_Azure_x509_Device_Twin.ino b/...o-IDE/mqtt_gsm_SIM800L_Azure_x509_Device_Twin/mqtt_gsm_SIM800L_Azure_x509_Device_Twin.ino
@@ -187,9 +187,10 @@ void setup()
 
 
   //Add CA Certificate
+  // Update with you own certs! These are for AWS IoT and here for example only.
   secure_presentation_layer.setCACert(root_ca);
-  secure_presentation_layer.setCertificate(client_cert_pem_start);    //x509 client Certificate
-  secure_presentation_layer.setPrivateKey(client_key_pem_start);      //x509 client key
+  secure_presentation_layer.setCertificate(client_cert_pem);       //x509 client Certificate
+  secure_presentation_layer.setPrivateKey(client_public_key_pem);      //x509 client key
 
   // Modem initial setup
   setupModem();