mirror of
https://github.com/tbnobody/OpenDTU.git
synced 2026-01-05 20:33:38 +01:00
Remove not required F() macro. Frees ~20kb flash.
This commit is contained in:
58
src/main.cpp
58
src/main.cpp
@@ -27,80 +27,80 @@ void setup()
|
||||
while (!Serial)
|
||||
yield();
|
||||
MessageOutput.println();
|
||||
MessageOutput.println(F("Starting OpenDTU"));
|
||||
MessageOutput.println("Starting OpenDTU");
|
||||
|
||||
// Initialize file system
|
||||
MessageOutput.print(F("Initialize FS... "));
|
||||
MessageOutput.print("Initialize FS... ");
|
||||
if (!LittleFS.begin(false)) { // Do not format if mount failed
|
||||
MessageOutput.print(F("failed... trying to format..."));
|
||||
MessageOutput.print("failed... trying to format...");
|
||||
if (!LittleFS.begin(true)) {
|
||||
MessageOutput.print("success");
|
||||
} else {
|
||||
MessageOutput.print("failed");
|
||||
}
|
||||
} else {
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
}
|
||||
|
||||
// Read configuration values
|
||||
MessageOutput.print(F("Reading configuration... "));
|
||||
MessageOutput.print("Reading configuration... ");
|
||||
if (!Configuration.read()) {
|
||||
MessageOutput.print(F("initializing... "));
|
||||
MessageOutput.print("initializing... ");
|
||||
Configuration.init();
|
||||
if (Configuration.write()) {
|
||||
MessageOutput.print(F("written... "));
|
||||
MessageOutput.print("written... ");
|
||||
} else {
|
||||
MessageOutput.print(F("failed... "));
|
||||
MessageOutput.print("failed... ");
|
||||
}
|
||||
}
|
||||
if (Configuration.get().Cfg_Version != CONFIG_VERSION) {
|
||||
MessageOutput.print(F("migrated... "));
|
||||
MessageOutput.print("migrated... ");
|
||||
Configuration.migrate();
|
||||
}
|
||||
CONFIG_T& config = Configuration.get();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Load PinMapping
|
||||
MessageOutput.print(F("Reading PinMapping... "));
|
||||
MessageOutput.print("Reading PinMapping... ");
|
||||
if (PinMapping.init(String(Configuration.get().Dev_PinMapping))) {
|
||||
MessageOutput.print(F("found valid mapping "));
|
||||
MessageOutput.print("found valid mapping ");
|
||||
} else {
|
||||
MessageOutput.print(F("using default config "));
|
||||
MessageOutput.print("using default config ");
|
||||
}
|
||||
const PinMapping_t& pin = PinMapping.get();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize WiFi
|
||||
MessageOutput.print(F("Initialize Network... "));
|
||||
MessageOutput.print("Initialize Network... ");
|
||||
NetworkSettings.init();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
NetworkSettings.applyConfig();
|
||||
|
||||
// Initialize NTP
|
||||
MessageOutput.print(F("Initialize NTP... "));
|
||||
MessageOutput.print("Initialize NTP... ");
|
||||
NtpSettings.init();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize SunPosition
|
||||
MessageOutput.print(F("Initialize SunPosition... "));
|
||||
MessageOutput.print("Initialize SunPosition... ");
|
||||
SunPosition.init();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize MqTT
|
||||
MessageOutput.print(F("Initialize MqTT... "));
|
||||
MessageOutput.print("Initialize MqTT... ");
|
||||
MqttSettings.init();
|
||||
MqttHandleDtu.init();
|
||||
MqttHandleInverter.init();
|
||||
MqttHandleHass.init();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize WebApi
|
||||
MessageOutput.print(F("Initialize WebApi... "));
|
||||
MessageOutput.print("Initialize WebApi... ");
|
||||
WebApi.init();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize Display
|
||||
MessageOutput.print(F("Initialize Display... "));
|
||||
MessageOutput.print("Initialize Display... ");
|
||||
Display.init(
|
||||
static_cast<DisplayType_t>(pin.display_type),
|
||||
pin.display_data,
|
||||
@@ -112,12 +112,12 @@ void setup()
|
||||
Display.enableScreensaver = config.Display_ScreenSaver;
|
||||
Display.setContrast(config.Display_Contrast);
|
||||
Display.setStartupDisplay();
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Check for default DTU serial
|
||||
MessageOutput.print(F("Check for default DTU serial... "));
|
||||
MessageOutput.print("Check for default DTU serial... ");
|
||||
if (config.Dtu_Serial == DTU_SERIAL) {
|
||||
MessageOutput.print(F("generate serial based on ESP chip id: "));
|
||||
MessageOutput.print("generate serial based on ESP chip id: ");
|
||||
uint64_t dtuId = Utils::generateDtuSerial();
|
||||
MessageOutput.printf("%0x%08x... ",
|
||||
((uint32_t)((dtuId >> 32) & 0xFFFFFFFF)),
|
||||
@@ -125,7 +125,7 @@ void setup()
|
||||
config.Dtu_Serial = dtuId;
|
||||
Configuration.write();
|
||||
}
|
||||
MessageOutput.println(F("done"));
|
||||
MessageOutput.println("done");
|
||||
|
||||
InverterSettings.init();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user