refactor:

Author: rsny430

src/App.h

@@ -1,41 +1,12 @@
 #include <Arduino.h>
 #include <stddef.h>
 
-#include "domain/Clock.h"
-#include "domain/DataStore.h"
-#include "domain/Trip.h"
 #include "hardware/Gnss.h"
-#include "hardware/OLED.h"
-#include "hardware/VoltageSensor.h"
-#include "ui/Input.h"
-#include "ui/Mode.h"
-#include "ui/Renderer.h"
-
-constexpr int   BTN_A                 = PIN_D09;
-constexpr int   BTN_B                 = PIN_D04;
-constexpr int   WARN_LED              = PIN_D00;
-constexpr int   VOLTAGE_PIN           = PIN_A5;
-constexpr float LOW_VOLTAGE_THRESHOLD = 4.5f;
-
-class VoltageMonitor {
-private:
-  VoltageSensor voltageSensor;
-
-public:
-  VoltageMonitor() : voltageSensor(VOLTAGE_PIN) {}
-
-  void begin() {
-    voltageSensor.begin();
-    pinMode(WARN_LED, OUTPUT);
-  }
-
-  float update() {
-    const float currentVoltage = voltageSensor.readVoltage();
-    if (currentVoltage <= LOW_VOLTAGE_THRESHOLD) digitalWrite(WARN_LED, HIGH);
-    else digitalWrite(WARN_LED, LOW);
-    return currentVoltage;
-  }
-};
+#include "logic/Clock.h"
+#include "logic/DataStore.h"
+#include "logic/Trip.h"
+#include "logic/VoltageMonitor.h"
+#include "ui/UI.h"
 
 class DataPersistence {
 private:
@@ -56,97 +27,37 @@ class DataPersistence {
   void update(bool isGnssUpdated, float currentVoltage) {
     if ((millis() - lastSaveMillis > DataStore::SAVE_INTERVAL_MS) && !isGnssUpdated) {
       AppData            currentData;
-      const Trip::State &state   = trip.getState();
-      currentData.totalDistance  = state.totalKm;
-      currentData.tripDistance   = state.tripDistance;
-      currentData.movingTimeMs   = state.totalMovingMs;
-      currentData.maxSpeed       = state.maxSpeed;
-      currentData.batteryVoltage = currentVoltage;
+      const Trip::State &state  = trip.getState();
+      currentData.totalDistance = state.totalKm;
+      currentData.tripDistance  = state.tripDistance;
+      currentData.movingTimeMs  = state.totalMovingMs;
+      currentData.maxSpeed      = state.maxSpeed;
+      currentData.voltage       = currentVoltage;
 
       dataStore.save(currentData);
       lastSaveMillis = millis();
     }
   }
 };
 
-class UserInterface {
-private:
-  OLED     oled;
-  Input    input;
-  Mode     mode;
-  Renderer renderer;
-
-  Frame createFrame(const SpNavData &navData, const Trip &trip, const Clock &clock) const {
-    Frame frame;
-
-    switch (navData.posFixMode) {
-    case Fix2D:
-      strcpy(frame.header.fixStatus, "2D");
-      break;
-    case Fix3D:
-      strcpy(frame.header.fixStatus, "3D");
-      break;
-    default:
-      strcpy(frame.header.fixStatus, "WAIT");
-      break;
-    }
-
-    mode.fillFrame(frame, trip, clock);
-
-    return frame;
-  }
-
-public:
-  UserInterface() : input(BTN_A, BTN_B) {}
-
-  void begin() {
-    oled.begin();
-    input.begin();
-  }
-
-  void update(Trip &trip, DataStore &dataStore, const Clock &clock, const SpNavData &navData) {
-    Input::Event id = input.update();
-
-    if (id == Input::Event::RESET_LONG) {
-      oled.clear();
-      oled.setTextSize(1);
-      oled.setTextColor(WHITE);
-      const char *msg  = "RESETTING...";
-      OLED::Rect  rect = oled.getTextBounds(msg);
-      oled.setCursor((oled.getWidth() - rect.w) / 2, (oled.getHeight() - rect.h) / 2);
-      oled.print(msg);
-      oled.display();
-      delay(500); // Visual feedback
-
-      oled.restart();
-      renderer.reset();
-    }
-
-    if (id != Input::Event::NONE) { mode.handleInput(id, trip, dataStore); }
-
-    Frame frame = createFrame(navData, trip, clock);
-    renderer.render(oled, frame);
-  }
-};
-
 class App {
 private:
   Gnss gnss;
   Trip trip;
 
   DataStore dataStore;
 
-  VoltageMonitor  batteryMonitor;
+  VoltageMonitor  voltageMonitor;
   DataPersistence dataPersistence;
-  UserInterface   userInterface;
+  UI              userInterface;
 
 public:
   App() : dataPersistence(dataStore, trip) {}
 
   void begin() {
     gnss.begin();
     trip.begin();
-    batteryMonitor.begin();
+    voltageMonitor.begin();
     dataPersistence.load();
     userInterface.begin();
   }
@@ -158,7 +69,7 @@ class App {
     trip.update(navData, millis(), isGnssUpdated);
     Clock clock(navData);
 
-    float currentVoltage = batteryMonitor.update();
+    float currentVoltage = voltageMonitor.update();
     dataPersistence.update(isGnssUpdated, currentVoltage);
     userInterface.update(trip, dataStore, clock, navData);
   }