wip refactor

Author: rsny430

src2/App.h

@@ -14,57 +14,48 @@
 #include "common/Config.h"
 #include "common/DoubleBuffer.h"
 #include "domain/DataStore.h"
-#include "domain/TripLogic.h"
+#include "domain/TripState.h"
 #include "domain/VoltageMonitor.h"
 #include "hardware/Clock.h"
 #include "hardware/Gnss.h"
-#include "ui/FrameLogic.h"
-#include "ui/UI.h"
+#include "ui/DisplayFrame.h"
+#include "ui/Input.h"
+#include "ui/Renderer.h"
+#include <LowPower.h>
 
 class App {
 private:
   Gnss           gnss;
   Clock          systemClock;
   DataStore      dataStore;
   VoltageMonitor voltageMonitor;
-  UI             userInterface;
+  Input          input;
+  Renderer       renderer;
 
   Mode currentMode = Mode::SPD_TIM;
 
   DoubleBuffer<TripState>    tripBuffer;
   DoubleBuffer<DisplayFrame> frameBuffer;
   DoubleBuffer<SaveData>     saveBuffer;
 
-  unsigned long currentTime    = 0;
-  GnssData      currentGnss    = {};
-  Input::Event  currentButton  = Input::Event::NONE;
-  SpGnssTime    currentClock   = {};
-  float         currentVoltage = 0.0f;
+  unsigned long currentTime   = 0;
+  GnssData      currentGnss   = {};
+  Input::Event  currentButton = Input::Event::NONE;
 
   unsigned long lastSaveMs     = 0;
   unsigned long lastUiUpdateMs = 0;
 
-  bool gnssInitialized = false;
-
 public:
-  /**
-   * @brief アプリケーションの初期化
-   * @return true: 全モジュールの初期化成功, false: いずれかのモジュールが失敗
-   */
-  bool begin() {
-    // GNSS初期化（失敗してもアプリは継続可能）
-    gnssInitialized = gnss.begin();
-    if (!gnssInitialized) {
-      // GNSSが使えなくても他の機能は動作可能
-      // ログ出力やLED点滅などで警告を出すことも検討
-    }
+  App() : input(Config::Pins::BUTTON_SELECT, Config::Pins::BUTTON_PAUSE) {}
+
+  void begin() {
+    if (!renderer.begin()) shutdown();
+    input.begin();
+    if (!gnss.begin()) shutdown();
 
     systemClock.begin();
     voltageMonitor.begin();
-    userInterface.begin();
     loadFromStorage();
-
-    return gnssInitialized; // メイン機能の状態を返す
   }
 
   void update() {
@@ -74,88 +65,83 @@ class App {
   }
 
 private:
+  void shutdown() {
+    LowPower.begin();
+    LowPower.deepSleep(0);
+  }
+
   void loadFromStorage() {
     SaveData saved = dataStore.load();
-
-    TripState state;
-    state.resetAll();
-    state.distance.total = saved.totalDistance;
-    state.distance.trip  = saved.tripDistance;
-    state.time.moving    = saved.movingTimeMs;
-    state.speed.max      = saved.maxSpeed;
-
-    tripBuffer.initialize(state);
+    tripBuffer.initialize(TripState(saved));
     saveBuffer.initialize(saved);
     lastSaveMs = millis();
   }
 
   void collectInputs() {
-    currentTime    = millis();
-    currentButton  = userInterface.getInputEvent();
-    currentClock   = systemClock.now();
-    currentVoltage = voltageMonitor.update();
+    currentTime   = millis();
+    currentButton = input.update();
 
     bool updated        = gnss.update();
-    currentGnss.status  = updated ? UpdateStatus::Updated : UpdateStatus::NoChange;
+    currentGnss.updated = updated;
     currentGnss.navData = gnss.navData;
 
-    if (updated && (SpFixMode)currentGnss.navData.posFixMode != FixInvalid) {
-      systemClock.sync(currentGnss.navData.time);
+    if (updated) {
+      const SpFixMode fixMode = (SpFixMode)currentGnss.navData.posFixMode;
+      if (fixMode == Fix2D || fixMode == Fix3D) { systemClock.sync(currentGnss.navData.time); }
     }
   }
 
   void updateState() {
-    tripBuffer.prepare();
-    tripBuffer.current().resetMeta();
-
-    if (currentButton != Input::Event::NONE) {
-      if (handleButton()) return;
-    }
-
-    TripLogic::computeTrip(tripBuffer.current(), currentGnss, currentTime);
+    if (currentButton != Input::Event::NONE) handleButton();
+    tripBuffer.apply(TripState(tripBuffer.current(), currentGnss, currentTime));
   }
 
-  bool handleButton() {
+  void handleButton() {
     TripState &state = tripBuffer.current();
 
     switch (currentButton) {
     case Input::Event::SELECT:
-      currentMode = static_cast<Mode>((static_cast<int>(currentMode) + 1) % 3);
-      state.forceUpdate();
+      currentMode = rotateMode(currentMode);
       break;
 
     case Input::Event::PAUSE:
-      state.status =
-          state.isPaused() ? TripStateBase::Status::Stopped : TripStateBase::Status::Paused;
-      state.forceUpdate();
+      state.status = state.isPaused() ? TripState::Status::Stopped : TripState::Status::Paused;
       break;
 
     case Input::Event::RESET:
       applyReset(currentMode);
       break;
 
     case Input::Event::RESET_LONG:
-      state.resetAll();
-      dataStore.clear();
-      userInterface.showResetMessage();
-      frameBuffer.initialize(DisplayFrame());
-      saveBuffer.initialize(createSaveData(state, 0.0f));
-      return true;
+      resetAllData();
+      break;
 
     default:
       break;
     }
-    return false;
+  }
+
+  static Mode rotateMode(Mode mode) {
+    return static_cast<Mode>((static_cast<int>(mode) + 1) % Config::UI::MODE_COUNT);
+  }
+
+  void resetAllData() {
+    TripState &state = tripBuffer.current();
+    state.clearAllData();
+    dataStore.clear();
+    renderer.showResetMessage();
+    frameBuffer.initialize(DisplayFrame());
+    saveBuffer.initialize(SaveData(state, 0.0f));
   }
 
   void applyReset(Mode mode) {
     TripState &state = tripBuffer.current();
     switch (mode) {
     case Mode::SPD_TIM:
-      state.resetTrip();
+      state.clearTripData();
       break;
     case Mode::AVG_ODO:
-      state.resetAll();
+      state.clearAllData();
       break;
     case Mode::MAX_CLK:
       state.resetMaxSpeed();
@@ -171,47 +157,36 @@ class App {
   void outputToDisplay() {
     if (!shouldUpdateUI()) return;
 
-    DisplayFrame nextFrame =
-        FrameLogic::buildFrame(tripBuffer.current(), currentGnss, currentClock, currentMode);
-
+    SpGnssTime   nowClock = systemClock.now();
+    DisplayFrame nextFrame(tripBuffer.current(), currentGnss, nowClock, currentMode);
     if (frameBuffer.apply(nextFrame)) {
-      userInterface.draw(frameBuffer.current());
+      renderer.render(frameBuffer.current());
       lastUiUpdateMs = currentTime;
     }
   }
 
   bool shouldUpdateUI() const {
-    return (currentButton != Input::Event::NONE) ||
-           (currentTime - lastUiUpdateMs >= Config::UI::UPDATE_INTERVAL_MS) ||
-           TripLogic::isChanged(tripBuffer.previous(), tripBuffer.current()) ||
-           (currentGnss.status == UpdateStatus::Updated);
+    const bool hasButtonInput  = (currentButton != Input::Event::NONE);
+    const bool intervalElapsed = (currentTime - lastUiUpdateMs >= Config::UI::UPDATE_INTERVAL_MS);
+    const bool stateChanged    = (tripBuffer.previous() != tripBuffer.current());
+    const bool gnssUpdated     = currentGnss.updated;
+    return hasButtonInput || intervalElapsed || stateChanged || gnssUpdated;
   }
 
   void outputToStorage() {
     if (!shouldSave()) return;
+    float      currentVoltage = voltageMonitor.update();
+    TripState &state          = tripBuffer.current();
+    state.updateAverageSpeed();
 
-    SaveData nextSave = createSaveData(tripBuffer.current(), currentVoltage);
-
-    if (saveBuffer.apply(nextSave)) { dataStore.save(saveBuffer.current()); }
+    SaveData nextSave(state, currentVoltage);
+    if (saveBuffer.apply(nextSave)) dataStore.save(saveBuffer.current());
     lastSaveMs = currentTime;
   }
 
   bool shouldSave() const {
     const bool shouldUpdate = (currentTime - lastSaveMs >= DataStore::SAVE_INTERVAL_MS);
-    const bool gnssStable   = (currentGnss.status == UpdateStatus::NoChange);
+    const bool gnssStable   = !currentGnss.updated;
     return shouldUpdate && gnssStable;
   }
-
-  static SaveData createSaveData(const TripState &state, float voltage) {
-    SaveData data;
-    data.magicNumber   = SAVE_DATA_MAGIC_NUMBER;
-    data.totalDistance = state.distance.total;
-    data.tripDistance  = state.distance.trip;
-    data.movingTimeMs  = state.time.moving;
-    data.maxSpeed      = state.speed.max;
-    data.voltage       = voltage;
-    data.updateStatus  = state.updateStatus;
-    data.crc           = 0;
-    return data;
-  }
 };

src2/common/BaseTypes.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <GNSS.h>
+
+/**
+ * @file BaseTypes.h
+ * @brief 基本的なデータ型の定義
+ */
+
+/// 表示モードを示す列挙型
+enum class Mode { SPD_TIM, AVG_ODO, MAX_CLK };
+
+/// GNSSから取得したデータを保持する構造体
+struct GnssData {
+  SpNavData     navData;
+  unsigned long timestamp;
+  bool          updated;
+
+  bool isUpdated() const { return updated; }
+};

src2/common/Config.h

@@ -4,79 +4,64 @@
 
 /**
  * @file Config.h
- * @brief ハードウェア設定とシステムパラメータの一元管理
+ * @brief ハードウェア設定とシステムパラメータ
  *
  * すべてのピン番号、閾値、タイミング設定をこのファイルで定義します。
  * ハードウェア構成の変更時は、このファイルのみ修正すれば済みます。
  */
 
 namespace Config {
 
-// =============================================================================
 // ハードウェアピン設定
-// =============================================================================
 namespace Pins {
 constexpr int BUTTON_SELECT = PIN_D09; // モード切替ボタン
 constexpr int BUTTON_PAUSE  = PIN_D04; // 一時停止ボタン
 constexpr int VOLTAGE_SENSE = PIN_A5;  // バッテリー電圧監視用ADC
 constexpr int LOW_BATT_LED  = PIN_D00; // 低電圧警告LED
 } // namespace Pins
 
-// =============================================================================
 // OLED ディスプレイ設定
-// =============================================================================
 namespace Display {
 constexpr int WIDTH   = 128;  // OLED横幅 (ピクセル)
 constexpr int HEIGHT  = 64;   // OLED縦幅 (ピクセル)
 constexpr int ADDRESS = 0x3C; // I2Cアドレス (SSD1306標準)
 } // namespace Display
 
-// =============================================================================
 // ボタン入力設定
-// =============================================================================
 namespace Button {
 constexpr unsigned long DEBOUNCE_MS     = 20;   // チャタリング防止時間
 constexpr unsigned long SINGLE_PRESS_MS = 30;   // シングルプレス判定時間
 constexpr unsigned long LONG_PRESS_MS   = 3000; // 長押し判定時間
 } // namespace Button
 
-// =============================================================================
 // GNSS設定
-// =============================================================================
 namespace Gnss {
 constexpr unsigned long SIGNAL_TIMEOUT_MS    = 3000; // GNSS信号ロスト判定時間
 constexpr float         MIN_MOVING_SPEED_KMH = 0.5f; // 移動判定の最低速度
 } // namespace Gnss
 
-// =============================================================================
 // データ保存設定
-// =============================================================================
 namespace Storage {
 constexpr unsigned long SAVE_INTERVAL_MS      = 30000;      // 自動保存間隔 (30秒)
 constexpr unsigned long EEPROM_ADDR           = 0;          // EEPROM保存先アドレス
 constexpr float         MAX_VALID_DISTANCE_KM = 1000000.0f; // 距離データ有効範囲
 } // namespace Storage
 
-// =============================================================================
 // 電圧監視設定
-// =============================================================================
 namespace Voltage {
 constexpr float LOW_THRESHOLD     = 1.0f;    // 低電圧警告閾値 (V)
 constexpr float REFERENCE_VOLTAGE = 3.3f;    // ADC基準電圧 (V)
 constexpr float ADC_MAX_VALUE     = 1023.0f; // ADC最大値 (10bit)
 } // namespace Voltage
 
-// =============================================================================
 // UI更新設定
-// =============================================================================
 namespace UI {
 constexpr unsigned long UPDATE_INTERVAL_MS = 500; // UI更新間隔
 constexpr unsigned long BLINK_INTERVAL_MS  = 500; // 点滅間隔
+constexpr int           MODE_COUNT         = 3;   // 表示モード数
 } // namespace UI
 
-// =============================================================================
 // 時刻設定
-// =============================================================================
 namespace Time {
 constexpr int TIMEZONE_OFFSET_HOURS = 9;    // JST = UTC + 9
 constexpr int MIN_VALID_YEAR        = 2026; // GPS時刻の有効判定年