Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
dontsovcmc committed Mar 30, 2021
2 parents ab9f114 + 3519187 commit b0ec25b
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 96 deletions.
2 changes: 0 additions & 2 deletions Attiny85/src/Power.cpp
Original file line number Diff 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
4 changes: 4 additions & 0 deletions Attiny85/src/SlaveI2C.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ void SlaveI2C::begin(const uint8_t mode) {

void SlaveI2C::end() {
Wire.end();
DDRB &= ~_BV(SDA); // INPUT
PORTB &= ~_BV(SDA); // INPUT
DDRB &= ~_BV(SCL); // INPUT
PORTB &= ~_BV(SCL); // INPUT
}

void SlaveI2C::requestEvent() {
Expand Down
11 changes: 9 additions & 2 deletions Attiny85/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@
#endif


#define FIRMWARE_VER 15 // Версия прошивки. Передается в ESP и на сервер в данных.
#define FIRMWARE_VER 16 // Версия прошивки. Передается в ESP и на сервер в данных.

/*
Версии прошивок
16 - 2021.03.29 - dontsovcmc
1. Отключение подтягивающих резисторов в I2C (ошибка в tinycore)
2. Отключение ESP с задержкой 100мс после получения команды на сон (потребление ESP ниже на 7мкА).
15 - 2021.02.07 - kick2nick
Время пробуждения ESP изменено с 1 суток (1440 мин.) на настриваемое значение
1. Добавил период пробуждения esp.
Expand Down Expand Up @@ -257,12 +261,15 @@ void loop() {
}
}

esp.power(false);
slaveI2C.end(); // выключаем i2c slave.

if (!slaveI2C.masterGoingToSleep()) {
LOG(F("ESP wake up fail"));
} else {
LOG(F("Sleep received"));
}

delayMicroseconds(20000);

esp.power(false);
}
18 changes: 8 additions & 10 deletions ESP8266/src/Logging.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,19 @@ const char S_RQT[] PROGMEM = "RQT";
#define LOG_DEBUG(svc, content) do {} while (0)

// Depending on log level, add code for logging
#if LOGLEVEL >= 0
#ifdef LOGLEVEL
#undef LOG_BEGIN
#define LOG_BEGIN(baud) do { Serial.begin( baud ,SERIAL_8N1, SERIAL_TX_ONLY); } while(0)
#define LOG_BEGIN(baud) do { Serial.begin(baud, SERIAL_8N1); } while(0)
#undef LOG_END
#define LOG_END() do { Serial.flush(); Serial.end(); } while(0)
#undef LOG_ERROR
#define LOG_ERROR(svc, content) do { LOG_FORMAT_TIME; Serial << " ERROR (" << svc << ") : " << content << endl; } while(0)
#if LOGLEVEL >= 1
#undef LOG_ERROR
#define LOG_ERROR(svc, content) do { LOG_FORMAT_TIME; Serial << " ERROR (" << svc << ") : " << content << endl; } while(0)
#undef LOG_INFO
#define LOG_INFO(svc, content) do { LOG_FORMAT_TIME; Serial << " INFO (" << svc << ") : " << content << endl; } while(0)
#if LOGLEVEL >= 2
#undef LOG_INFO
#define LOG_INFO(svc, content) do { LOG_FORMAT_TIME; Serial << " INFO (" << svc << ") : " << content << endl; } while(0)
#if LOGLEVEL >= 3
#undef LOG_DEBUG
#define LOG_DEBUG(svc, content) do { LOG_FORMAT_TIME; Serial << " DEBUG (" << svc << ") : " << content << endl; } while(0)
#endif // LOGLEVEL >= 3
#undef LOG_DEBUG
#define LOG_DEBUG(svc, content) do { LOG_FORMAT_TIME; Serial << " DEBUG (" << svc << ") : " << content << endl; } while(0)
#endif // LOGLEVEL >= 2
#endif // LOGLEVEL >= 1
#endif // LOGLEVEL >= 0
Expand Down
1 change: 0 additions & 1 deletion ESP8266/src/WateriusHttps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
136 changes: 58 additions & 78 deletions ESP8266/src/cert.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,93 +3,73 @@

#include "Arduino.h"

//
static const char le_ca_cert[] PROGMEM = R"EOF(
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-----END CERTIFICATE-----
)EOF";


//https://letsencrypt.org/certs/lets-encrypt-x4-cross-signed.pem.txt
//https://letsencrypt.org/certs/lets-encrypt-r3.pem
static const char lets_encrypt_x3_ca[] PROGMEM = R"EOF(
-----BEGIN CERTIFICATE-----
MIIDjTCCAnWgAwIBAgIJAOmKrpsw6h4mMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNV
BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
aWRnaXRzIFB0eSBMdGQxFjAUBgNVBAMMDTE5Mi4xNjguNTAuMTAwHhcNMTkwMjI3
MTIzMjQwWhcNMzAwNTE2MTIzMjQwWjBdMQswCQYDVQQGEwJBVTETMBEGA1UECAwK
U29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRYw
FAYDVQQDDA0xOTIuMTY4LjUwLjEwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
CgKCAQEAv7gqrIvUrULoVoOVdsXoOk8BewpcYPSCBbWK/abdV0oQmaE3r+uoe2q3
l6dtYHJoUoDaC/LDa22f/i4mOdgqygk0rT3XepH93ZtqRW1GZphGQlGkv+dvRj/I
R86BRsqEVD20lsqSNJwXQX3AmWB1Z66bb8DYKAIQ2MkMYKwsneAfd6OWI1YbI7hq
N0Jg7KY26+U+lEOcCc0vG19l/XDUzEi2ArvHC8qN5imPaavJmOEAhaV4dwTAlGPy
bblHq0LS/YI4Ptex3EeNwXfh/yvhr87LVzC2Ex4cHLfBU7PCXwBkYk3lZvjc3LCa
KL8njP32rYuthv6v8/0dEYLpofuaOwIDAQABo1AwTjAdBgNVHQ4EFgQUAmtYifhf
x11uScQe8MBze21wNcMwHwYDVR0jBBgwFoAUAmtYifhfx11uScQe8MBze21wNcMw
DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAP+YVTn47avqrFXmQAwuL
GkQji3HrIld1O8PJpjFCsLUXmJG8QOLXKljSA9pXWpNh+JHRFZ+G+yzJU2UAHFbb
WKtc1EGh9nw2LOqhS5/MjDOAY+nmSrP5x7/M0w06/G4lQBsJXx12SLsAZnQtkGVb
wKquzu4nxVAtlEohiUANP3Z4gnC333suJ+PMFeb7iVUVWBVHm861GRrkuWhXMnLr
ZyySPYqVL7motsaPhtMfSXpH3yMYTZ0BQKhM7qI4m6osfjIdJZE78OG8JZbmYes/
NLBwnp8b8DWTraLWTOuRi//kCJKfOVHZehk1Uc30Vf0IORSnrZr3JL+eU4ZDiTwf
3Q==
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
nLRbwHOoq7hHwg==
-----END CERTIFICATE-----
)EOF";


//https://letsencrypt.org/certs/lets-encrypt-x4-cross-signed.pem.txt
//https://letsencrypt.org/certs/lets-encrypt-r4.pem
static const char lets_encrypt_x4_ca[] PROGMEM = R"EOF(
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc6bLEeMfizANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDEwMloXDTIxMDMxNzE2NDEwMlow
SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFg0MIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEA4SR0Qnu3kTHZc/84qtjORFy3OQrcRK4NvUW5lzdnr71QT1/T
EFRr90HajmPmbVvA6ECpjEH80QOJ/2JhCWDWBwV4mpC9GmQ+T9zPdy+Ja8tnr0FN
xY0AwGv+jYTctfKVMajo9pCgQ0qTdFyzPkNpS4kiR3RRPplkw80kAfmELyh3FyKn
3cNsCExmLzd0xW+TjrBGNxZh0VCYyLAPT1hTfKz22i2WYVCtQ9wKpk+etVK5nI7v
Tt9GszHcIPxpwqMgdT7sOBs2TmZm0t/1ZqSTL3umDpQ+YD1KSxxvurRNHDyRWG4v
TcTacNvtATl2wEnn6TW1FAaQweWS4hD9a7m0hQIDAQABo4IBfTCCAXkwEgYDVR0T
AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
Y3JsMB0GA1UdDgQWBBTFsatOTLHNZDCTfsGEmQWr5gPiJTANBgkqhkiG9w0BAQsF
AAOCAQEANlaeSdstfAtqFN3jdRZJFjx9X+Ob3PIDlekPYQ1OQ1Uw43rE1FUj7hUw
g2MJKfs9b7M0WoQg7C20nJY/ajsg7pWhUG3J6rlkDTfVY9faeWi0qsPYXE6BpBDr
5BrW/Xv8yT8U2BiEAmNggWq8dmFl82fghmLzHBM8X8NZ3ZwA1fGePA53AP5IoD+0
ArpW8Ik1sSuQBjZ8oQLfN+G8OoY7MNRopyLyQQCNy4aWfE+xYnoVoa5+yr+aPiX0
7YQrY/cKawAn7QB4PyF5//IKSAVs7mAuB68wbMdE3FKfOHfJ24W4z/bIJTrTY8Y5
Sr4AUhtzf8oVDrHZYWRrP4joIcOu/Q==
MIIFFjCCAv6gAwIBAgIRAIp5IlCr5SxSbO7Pf8lC3WIwDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
RW5jcnlwdDELMAkGA1UEAxMCUjQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQCzKNx3KdPnkb7ztwoAx/vyVQslImNTNq/pCCDfDa8oPs3Gq1e2naQlGaXS
Mm1Jpgi5xy+hm5PFIEBrhDEgoo4wYCVg79kaiT8faXGy2uo/c0HEkG9m/X2eWNh3
z81ZdUTJoQp7nz8bDjpmb7Z1z4vLr53AcMX/0oIKr13N4uichZSk5gA16H5OOYHH
IYlgd+odlvKLg3tHxG0ywFJ+Ix5FtXHuo+8XwgOpk4nd9Z/buvHa4H6Xh3GBHhqC
VuQ+fBiiCOUWX6j6qOBIUU0YFKAMo+W2yrO1VRJrcsdafzuM+efZ0Y4STTMzAyrx
E+FCPMIuWWAubeAHRzNl39Jnyk2FAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
Af8CAQAwHQYDVR0OBBYEFDadPuCxQPYnLHy/jZ0xivZUpkYmMB8GA1UdIwQYMBaA
FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCJbu5CalWO+H+Az0lmIG14DXmlYHQE
k26umjuCyioWs2icOlZznPTcZvbfq02YPHGTCu3ctggVDULJ+fwOxKekzIqeyLNk
p8dyFwSAr23DYBIVeXDpxHhShvv0MLJzqqDFBTHYe1X5X2Y7oogy+UDJxV2N24/g
Z8lxG4Vr2/VEfUOrw4Tosl5Z+1uzOdvTyBcxD/E5rGgTLczmulctHy3IMTmdTFr0
FnU0/HMQoquWQuODhFqzMqNcsdbjANUBwOEQrKI8Sy6+b84kHP7PtO+S4Ik8R2k7
ZeMlE1JmxBi/PZU860YlwT8/qOYToCHVyDjhv8qutbf2QnUl3SV86th2I1QQE14s
0y7CdAHcHkw3sAEeYGkwCA74MO+VFtnYbf9B2JBOhyyWb5087rGzitu5MTAW41X9
DwTeXEg+a24tAeht+Y1MionHUwa4j7FB/trN3Fnb/r90+4P66ZETVIEcjseUSMHO
w6yqv10/H/dw/8r2EDUincBBX3o9DL3SadqragkKy96HtMiLcqMMGAPm0gti1b6f
bnvOdr0mrIVIKX5nzOeGZORaYLoSD4C8qvFT7U+Um6DMo36cVDNsPmkF575/s3C2
CxGiCPQqVxPgfNSh+2CPd2Xv04lNeuw6gG89DlOhHuoFKRlmPnom+gwqhz3ZXMfz
TfmvjrBokzCICA==
-----END CERTIFICATE-----
)EOF";

Expand Down
2 changes: 1 addition & 1 deletion ESP8266/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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мс
}
6 changes: 4 additions & 2 deletions ESP8266/src/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@

#include <Arduino.h>

#define FIRMWARE_VERSION "0.10.1"
#define FIRMWARE_VERSION "0.10.2"


/*
Версии прошивки для ESP
0.10.2 - 2021.02.30 - Обновлены сертификаты Lets Encrypt
0.10.1 - 2021.02.08 - Добавлена настройка веса импульса для горячего
и холодного счетчика. Добавлена настройка периода
отправки данных.
Expand Down Expand Up @@ -58,7 +60,7 @@
/*
Уровень логирования
*/
#define LOGLEVEL 3
#define LOGLEVEL 2
//#define DEBUG_ESP_HTTP_CLIENT
//#define DEBUG_ESP_PORT Serial

Expand Down

0 comments on commit b0ec25b

Please sign in to comment.