Webpage small refactor

98427bcf · Eric Duminil · d6310634 · 98427bcf · 98427bcf
Commit 98427bcf authored Feb 21, 2022 by Eric Duminil
--- a/ampel-firmware/ntp.h
+++ b/ampel-firmware/ntp.h
@@ -2,6 +2,7 @@
 #define AMPEL_TIME_H_INCLUDED

 namespace ntp {
+  extern bool connected_at_least_once;
  void initialize();
  void connect();
  void update();

--- a/ampel-firmware/web_server.cpp
+++ b/ampel-firmware/web_server.cpp
@@ -29,6 +29,14 @@ namespace web_server {
  void handleDeleteCSV();
  void handleWebServerCSV();

+  const __FlashStringHelper* showHTMLIf(bool is_active){
+    return is_active ? F("") : F("hidden");
+  }
+
+  const __FlashStringHelper* yesOrNo(bool is_active){
+    return is_active ? F("Yes") : F("No");
+  }
+
  void definePages() {
    header_template =
        PSTR("<!doctype html><html lang=en>"
@@ -224,11 +232,11 @@ namespace web_server {
    // Body
    snprintf_P(content, sizeof(content), body1_template, csv_writer::filename, config::ampel_name(), sensor::co2,
        sensor::temperature, sensor::humidity, sensor::timestamp, config::measurement_timestep,
-        config::is_csv_active() ? "" : "hidden", csv_writer::last_successful_write, config::csv_interval,
-        csv_writer::getAvailableSpace() / 1024, config::is_mqtt_active() ? "" : "hidden",
-        mqtt::connected ? "Yes" : "No", mqtt::last_successful_publish, config::mqtt_sending_interval
+        showHTMLIf(config::is_csv_active()), csv_writer::last_successful_write, config::csv_interval,
+        csv_writer::getAvailableSpace() / 1024, showHTMLIf(config::is_mqtt_active()),
+        yesOrNo(mqtt::connected), mqtt::last_successful_publish, config::mqtt_sending_interval
 #if defined(ESP32)
-        , config::is_lorawan_active() ? "" : "hidden", lorawan::connected ? "Yes" : "No",
+        , showHTMLIf(config::is_lorawan_active()), yesOrNo(lorawan::connected),
        config::lorawan_frequency_plan, lorawan::last_transmission, config::lorawan_sending_interval
 #endif
        );
@@ -238,10 +246,10 @@ namespace web_server {
    web_config::http.sendContent(content);

    snprintf_P(content, sizeof(content), body2_template, config::temperature_offset,
-        config::auto_calibrate_sensor ? "Yes" : "No", config::ampel_name(), config::ampel_name(), wifi::local_ip,
+        yesOrNo(config::auto_calibrate_sensor), config::ampel_name(), config::ampel_name(), wifi::local_ip,
        wifi::local_ip, ampel.macAddress, ESP.getFreeHeap(), esp_get_max_free_block_size(),
        esp_get_heap_fragmentation(), ampel.max_loop_duration, ampel.board, ampel.sensorId, ampel.version, dd, hh, mm,
-        ss, wifi::isAccessPoint() ? "" : "hidden"); //TODO: When time is not yet set
+        ss, showHTMLIf(!ntp::connected_at_least_once));

    Serial.print(F(" - Body2 size : "));
    Serial.print(strlen(content));