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