From 774bff0bb42081c65146d889ad9933a3f872fb39 Mon Sep 17 00:00:00 2001
From: gunner47 <gunner47@ukr.net>
Date: Sat, 31 Aug 2019 11:42:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20EEPROM=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B1=D1=83=D0=B4=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=B8=20=D1=8D=D1=84=D1=84?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/GyverLamp_v1.4/EepromManager.h    | 6 +++---
 firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/firmware/GyverLamp_v1.4/EepromManager.h b/firmware/GyverLamp_v1.4/EepromManager.h
index 856de0e..4f88382 100644
--- a/firmware/GyverLamp_v1.4/EepromManager.h
+++ b/firmware/GyverLamp_v1.4/EepromManager.h
@@ -130,7 +130,7 @@ class EepromManager
 
     static void SaveModesSettings(int8_t* currentMode, ModeType modes[])
     {
-      EEPROM.put(3 * (*currentMode) + EEPROM_MODES_START_ADDRESS, modes[*currentMode]);
+      EEPROM.put(EEPROM_MODES_START_ADDRESS + EEPROM_MODE_STRUCT_SIZE * (*currentMode), modes[*currentMode]);
       EEPROM.commit();
     }
     
@@ -152,8 +152,8 @@ class EepromManager
 
     static void SaveAlarmsSettings(uint8_t* alarmNumber, AlarmType alarms[])
     {
-      EEPROM.write(5 * (*alarmNumber), alarms[*alarmNumber].State);
-      WriteUint16((uint16_t)(5 * (*alarmNumber) + 1), alarms[*alarmNumber].Time);
+      EEPROM.write(EEPROM_ALARM_START_ADDRESS + EEPROM_ALARM_STRUCT_SIZE * (*alarmNumber), alarms[*alarmNumber].State);
+      WriteUint16(EEPROM_ALARM_START_ADDRESS + EEPROM_ALARM_STRUCT_SIZE * (*alarmNumber) + 1, alarms[*alarmNumber].Time);
       EEPROM.commit();
     }
 
diff --git a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
index 60968ac..0de8045 100644
--- a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
+++ b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
@@ -56,7 +56,7 @@
 */
 
 // Ссылка для менеджера плат:
-// http://arduino.esp8266.com/stable/package_esp8266com_index.json
+// https://arduino.esp8266.com/stable/package_esp8266com_index.json
 
 
 // ============= НАСТРОЙКИ =============
@@ -321,13 +321,6 @@ void setup()
     &(FavoritesManager::ReadFavoritesFromEeprom),
     &(FavoritesManager::SaveFavoritesToEeprom));
 
-  sendCurrent();                                            // отправляем настройки (куда?)
-  char reply[inputBuffer.length() + 1];
-  inputBuffer.toCharArray(reply, inputBuffer.length() + 1);
-  Udp.beginPacket(Udp.remoteIP(), Udp.remotePort());
-  Udp.write(reply);
-  Udp.endPacket();
-
   #ifdef USE_NTP
   timeClient.begin();
   #endif