diff --git a/tasmota/settings.h b/tasmota/settings.h index 353b5cb0b..89f01e80e 100644 --- a/tasmota/settings.h +++ b/tasmota/settings.h @@ -1,5 +1,5 @@ /* - Settings->h - setting variables for Tasmota + settings.h - setting variables for Tasmota Copyright (C) 2021 Theo Arends diff --git a/tasmota/settings.ino b/tasmota/settings.ino index 08f98b753..37ead7630 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -1,5 +1,5 @@ /* - Settings->ino - user settings for Tasmota + settings.ino - user settings for Tasmota Copyright (C) 2021 Theo Arends diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index 44075f51b..f3b58d864 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -254,7 +254,7 @@ String EthernetMacAddress(void); #define FS_FILE_APPEND "a" #define TASM_FILE_SETTINGS "/.settings" // Settings binary blob -#define TASM_FILE_SETTINGS_LKG "/.Settings->lkg" // Last Known Good Settings binary blob +#define TASM_FILE_SETTINGS_LKG "/.settings.lkg" // Last Known Good Settings binary blob #define TASM_FILE_DRIVER "/.drvset%03d" #define TASM_FILE_SENSOR "/.snsset%03d" #define TASM_FILE_TLSKEY "/tlskey" // TLS private key diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino index e4b33b24f..9a791c751 100644 --- a/tasmota/xdrv_04_light.ino +++ b/tasmota/xdrv_04_light.ino @@ -892,7 +892,7 @@ public: calcLevels(); } - // save the current light state to Settings-> + // save the current light state to Settings void saveSettings() { if (Light.pwm_multi_channels) { // simply save each channel diff --git a/tasmota/xdrv_07_domoticz.ino b/tasmota/xdrv_07_domoticz.ino index 13c0d70f7..1f1dea37b 100644 --- a/tasmota/xdrv_07_domoticz.ino +++ b/tasmota/xdrv_07_domoticz.ino @@ -39,7 +39,7 @@ void (* const DomoticzCommand[])(void) PROGMEM = { const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}"; #if MAX_DOMOTICZ_SNS_IDX < DZ_MAX_SENSORS - #error "Domoticz: Too many sensors or change Settings->h layout" + #error "Domoticz: Too many sensors or change settings.h layout" #endif const char kDomoticzSensors[] PROGMEM = diff --git a/tasmota/xdrv_11_knx.ino b/tasmota/xdrv_11_knx.ino index 353e08c0d..12d663d9d 100644 --- a/tasmota/xdrv_11_knx.ino +++ b/tasmota/xdrv_11_knx.ino @@ -34,7 +34,7 @@ Constants in tasmota.h #define MAX_CALLBACKS 10 Both to MAX_KNX_CB -Variables in Settings->h +Variables in settings.h ----------------------- bool Settings->flag.knx_enabled Enable/Disable KNX Protocol diff --git a/tasmota/xdrv_44_miel_hvac.ino b/tasmota/xdrv_44_miel_hvac.ino index eaa0ec8d1..dd7461d8c 100644 --- a/tasmota/xdrv_44_miel_hvac.ino +++ b/tasmota/xdrv_44_miel_hvac.ino @@ -103,12 +103,12 @@ struct miel_hvac_data { CTASSERT(sizeof(struct miel_hvac_data) == 16); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->power) == 3); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->mode) == 4); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->temp) == 5); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->fan) == 6); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->vane) == 7); -CTASSERT(offsetof(struct miel_hvac_data, data.Settings->widevane) == 10); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.power) == 3); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.mode) == 4); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.temp) == 5); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.fan) == 6); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.vane) == 7); +CTASSERT(offsetof(struct miel_hvac_data, data.settings.widevane) == 10); CTASSERT(offsetof(struct miel_hvac_data, data.roomtemp.temp) == 3); @@ -854,7 +854,7 @@ static void miel_hvac_publish_settings(struct miel_hvac_softc *sc) { const struct miel_hvac_data_settings *set = - &sc->sc_Settings->data.settings; + &sc->sc_settings.data.settings; char hex[(sizeof(sc->sc_settings) + 1) * 2]; char temp[33]; const char *name; diff --git a/tasmota/xdrv_98_file_settings_demo.ino b/tasmota/xdrv_98_file_settings_demo.ino index 518be892e..306ff648e 100644 --- a/tasmota/xdrv_98_file_settings_demo.ino +++ b/tasmota/xdrv_98_file_settings_demo.ino @@ -61,16 +61,16 @@ void CmndDrvText(void) { if (!XdrvMailbox.usridx) { // Command DrvText for (uint32_t i = 0; i < DRV98_MAX_DRV_TEXT; i++) { - AddLog(LOG_LEVEL_DEBUG, PSTR("DRV: DrvText%02d %s"), i, Drv98Settings->drv_text[i]); + AddLog(LOG_LEVEL_DEBUG, PSTR("DRV: DrvText%02d %s"), i, Drv98Settings.drv_text[i]); } ResponseCmndDone(); } else { // Command DrvText uint32_t index = XdrvMailbox.index -1; if (XdrvMailbox.data_len > 0) { - snprintf_P(Drv98Settings->drv_text[index], sizeof(Drv98Settings->drv_text[index]), XdrvMailbox.data); + snprintf_P(Drv98Settings.drv_text[index], sizeof(Drv98Settings.drv_text[index]), XdrvMailbox.data); } - ResponseCmndIdxChar(Drv98Settings->drv_text[index]); + ResponseCmndIdxChar(Drv98Settings.drv_text[index]); } } } @@ -90,15 +90,15 @@ void DrvDemoSettingsDefault(void) { AddLog(LOG_LEVEL_INFO, PSTR("DRV: " D_USE_DEFAULTS)); memset(&Drv98Settings, 0x00, sizeof(Drv98Settings)); - Drv98Settings->version = DRV98_VERSION; + Drv98Settings.version = DRV98_VERSION; // Init any other parameter in struct Drv98Settings - snprintf_P(Drv98Settings->drv_text[0], sizeof(Drv98Settings->drv_text[0]), PSTR("Azalea")); + snprintf_P(Drv98Settings.drv_text[0], sizeof(Drv98Settings.drv_text[0]), PSTR("Azalea")); } void DrvDemoSettingsDelta(void) { // Fix possible setting deltas - if (Drv98Settings->version != DRV98_VERSION) { // Fix version dependent changes + if (Drv98Settings.version != DRV98_VERSION) { // Fix version dependent changes if (Settings->version < 0x01010100) { AddLog(LOG_LEVEL_INFO, PSTR("DRV: Update oldest version restore")); @@ -110,7 +110,7 @@ void DrvDemoSettingsDelta(void) { } // Set current version and save settings - Drv98Settings->version = DRV98_VERSION; + Drv98Settings.version = DRV98_VERSION; DrvDemoSettingsSave(); } } @@ -142,15 +142,15 @@ void DrvDemoSettingsLoad(void) { AddLog(LOG_LEVEL_INFO, PSTR("DRV: ERROR File system not enabled")); #endif // USE_UFILESYS - Drv98Settings->crc32 = DrvDemoSettingsCrc32(); + Drv98Settings.crc32 = DrvDemoSettingsCrc32(); } void DrvDemoSettingsSave(void) { // Called from FUNC_SAVE_SETTINGS every SaveData second and at restart - if (DrvDemoSettingsCrc32() != Drv98Settings->crc32) { + if (DrvDemoSettingsCrc32() != Drv98Settings.crc32) { // Try to save file /.drvset098 - Drv98Settings->crc32 = DrvDemoSettingsCrc32(); + Drv98Settings.crc32 = DrvDemoSettingsCrc32(); char filename[20]; // Use for sensors: