attiny wait 20ms good for deepSleepInstant, remove unused cert

dontsovcmc · Mar 30, 2021 · 3519187 · 3519187
1 parent b504c36
commit 3519187
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 40 deletions.
diff --git a/Attiny85/src/Power.cpp b/Attiny85/src/Power.cpp
@@ -25,8 +25,6 @@ void ESPPowerPin::power(const bool on)
 	}
 	else
 	{
-		delayMicroseconds(50000);   // чтобы заснул
-
 		digitalWrite(power_pin, LOW);
 
 		pinMode(power_pin, INPUT);  // снижаем потребление

diff --git a/Attiny85/src/main.cpp b/Attiny85/src/main.cpp
@@ -269,6 +269,7 @@ void loop() {
 		LOG(F("Sleep received"));
 	}
 
-	delayMicroseconds(100000);
+	delayMicroseconds(20000);
+
 	esp.power(false);
 }
diff --git a/ESP8266/src/WateriusHttps.cpp b/ESP8266/src/WateriusHttps.cpp
@@ -26,7 +26,6 @@ WateriusHttps::ResponseData WateriusHttps::sendJsonPostRequest(const String &url
     WiFiClient *wc;
     if (url.substring(0, 5) == "https") {
         wc = &wifiTlsClient;
-        certs.append(le_ca_cert);
         certs.append(lets_encrypt_x3_ca);
         certs.append(lets_encrypt_x4_ca);
         certs.append(cloud_waterius_ru_ca);

diff --git a/ESP8266/src/cert.h b/ESP8266/src/cert.h
@@ -3,41 +3,6 @@
 
 #include "Arduino.h"
 
-//https://letsencrypt.org/certs/isrgrootx1.pem
-static const char le_ca_cert[] PROGMEM = R"EOF(
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
-WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
-ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
-h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
-0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
-A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
-T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
-B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
-B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
-KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
-OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
-jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
-qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
-rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
-hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
-3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
-NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
-ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
-TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
-jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
-oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
-4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
-mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
-emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-)EOF";
-
 
 //https://letsencrypt.org/certs/lets-encrypt-r3.pem
 static const char lets_encrypt_x3_ca[] PROGMEM = R"EOF(

diff --git a/ESP8266/src/main.cpp b/ESP8266/src/main.cpp
@@ -157,5 +157,5 @@ void loop()
     masterI2C.sendCmd('Z');        // "Можешь идти спать, attiny"
     LOG_END();
 
-    ESP.deepSleep(0, RF_DEFAULT);  // Спим до следущего включения EN
+    ESP.deepSleepInstant(0, RF_DEFAULT);  // Спим до следущего включения EN. Instant не ждет 92мс
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,8 +25,6 @@ void ESPPowerPin::power(const bool on) @@
     	}
     	else
     	{
-    		delayMicroseconds(50000);   // чтобы заснул
     		digitalWrite(power_pin, LOW);
     		pinMode(power_pin, INPUT);  // снижаем потребление
@@ Expand Down @@