Imported-Repos/gunner47-GyverLamp
1
0
Fork 0
mirror of https://github.com/gunner47/GyverLamp.git synced 2025-08-08 09:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправлена ошибка неправильного сохранения в EEPROM настроек будильников и эффектов

Browse Source
This commit is contained in:
gunner47
2019-08-31 11:42:12 +03:00
parent c1973420d7
commit 774bff0bb4
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/GyverLamp_v1.4/EepromManager.h
View File

@@ -130,7 +130,7 @@ class EepromManager
static void SaveModesSettings(int8_t* currentMode, ModeType modes[]) 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(); EEPROM.commit();
} }
@@ -152,8 +152,8 @@ class EepromManager
static void SaveAlarmsSettings(uint8_t* alarmNumber, AlarmType alarms[]) static void SaveAlarmsSettings(uint8_t* alarmNumber, AlarmType alarms[])
{ {
EEPROM.write(5 * (*alarmNumber), alarms[*alarmNumber].State); EEPROM.write(EEPROM_ALARM_START_ADDRESS + EEPROM_ALARM_STRUCT_SIZE * (*alarmNumber), alarms[*alarmNumber].State);
WriteUint16((uint16_t)(5 * (*alarmNumber) + 1), alarms[*alarmNumber].Time); WriteUint16(EEPROM_ALARM_START_ADDRESS + EEPROM_ALARM_STRUCT_SIZE * (*alarmNumber) + 1, alarms[*alarmNumber].Time);
EEPROM.commit(); EEPROM.commit();
} }

9
firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
View File

@@ -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::ReadFavoritesFromEeprom),
&(FavoritesManager::SaveFavoritesToEeprom)); &(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 #ifdef USE_NTP
timeClient.begin(); timeClient.begin();
#endif #endif