refactor: Move GPSWrapper and rename classes

Author: rsny430

src/drivers/Button.cpp src/drivers/ButtonDriver.cppsrc/drivers/Button.cpp renamed to src/drivers/ButtonDriver.cpp

@@ -1,17 +1,17 @@
-#include "Button.h"
+#include "ButtonDriver.h"
 
 namespace drivers {
 
-Button::Button(int pin) : pinNumber(pin) {}
+ButtonDriver::ButtonDriver(int pin) : pinNumber(pin) {}
 
-void Button::begin() {
+void ButtonDriver::begin() {
   pinMode(pinNumber, INPUT_PULLUP);
   stablePinLevel = digitalRead(pinNumber);
   lastPinLevel = stablePinLevel;
   lastDebounceTime = millis();
 }
 
-bool Button::isPressed() {
+bool ButtonDriver::isPressed() {
   bool rawPinLevel = digitalRead(pinNumber);
   bool pressed = false;
 
@@ -31,7 +31,7 @@ bool Button::isPressed() {
 }
 
 #ifdef UNIT_TEST
-void Button::setMockState(int pin, int state) {
+void ButtonDriver::setMockState(int pin, int state) {
   setPinState(pin, state);
 }
 #endif

src/drivers/Button.h src/drivers/ButtonDriver.hsrc/drivers/Button.h renamed to src/drivers/ButtonDriver.h

@@ -5,7 +5,7 @@
 
 namespace drivers {
 
-class Button {
+class ButtonDriver {
 private:
   const int pinNumber;
   bool stablePinLevel;
@@ -21,7 +21,7 @@ class Button {
   }
 
 public:
-  Button(int pin);
+  ButtonDriver(int pin);
   void begin();
   bool isPressed();
 

src/system/CycleComputer.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../drivers/GPSWrapper.h"
 #include "../drivers/OLEDDriver.h"
+#include "GPSWrapper.h"
 #include "InputManager.h"
 #include "ModeManager.h"
 #include "PowerManager.h"
@@ -14,7 +14,7 @@ class CycleComputer {
   drivers::OLEDDriver *display;
   InputManager inputManager;
   ModeManager modeManager;
-  drivers::GPSWrapper gps;
+  GPSWrapper gps;
   TripComputer tripComputer;
   PowerManager powerManager;
 

src/drivers/GPSWrapper.cpp src/system/GPSWrapper.cppsrc/drivers/GPSWrapper.cpp renamed to src/system/GPSWrapper.cpp

@@ -4,7 +4,7 @@
 
 #include "../Config.h"
 
-namespace drivers {
+namespace application {
 
 bool GPSWrapper::begin() {
   if (gnss.begin() != 0)
@@ -55,4 +55,4 @@ void GPSWrapper::setMockSpeed(float speedKmh) {
 }
 #endif
 
-} // namespace drivers
+} // namespace application

src/drivers/GPSWrapper.h src/system/GPSWrapper.hsrc/drivers/GPSWrapper.h renamed to src/system/GPSWrapper.h

@@ -3,7 +3,7 @@
 #include <Arduino.h>
 #include <GNSS.h>
 
-namespace drivers {
+namespace application {
 
 class GPSWrapper {
 public:
@@ -23,4 +23,4 @@ class GPSWrapper {
 #endif
 };
 
-} // namespace drivers
+} // namespace application

src/system/InputManager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../drivers/Button.h"
+#include "../drivers/ButtonDriver.h"
 
 namespace application {
 
@@ -13,8 +13,8 @@ enum class InputEvent {
 
 class InputManager {
 private:
-  drivers::Button btnA;
-  drivers::Button btnB;
+  drivers::ButtonDriver btnA;
+  drivers::ButtonDriver btnB;
   unsigned long lastInputTime = 0;
 
 public:

tests/host/CycleComputerTest.cpp

@@ -132,7 +132,7 @@ TEST_F(CycleComputerTest, DisplayGPSSpeed) {
   EXPECT_CALL(mockDisplay, show(_, _)).Times(AnyNumber());
 
   float testSpeed = 15.5;
-  drivers::GPSWrapper::setMockSpeed(testSpeed);
+  application::GPSWrapper::setMockSpeed(testSpeed);
 
   // Expect display to show formatted speed string
   EXPECT_CALL(mockDisplay, show(application::DisplayDataType::SPEED, testing::HasSubstr("15.5"))).Times(testing::AtLeast(1));
@@ -152,7 +152,7 @@ TEST_F(CycleComputerTest, DisplayTime) {
   pressButton(Config::Pin::BTN_A); // TIME
 
   // Set UTC time to 3:34, which is 12:34 JST (UTC+9)
-  drivers::GPSWrapper::setMockTime(3, 34, 56);
+  application::GPSWrapper::setMockTime(3, 34, 56);
 
   EXPECT_CALL(mockDisplay, show(application::DisplayDataType::TIME, StrEq("12:34"))).Times(testing::AtLeast(1));
 
@@ -167,7 +167,7 @@ TEST_F(CycleComputerTest, ResetData) {
   EXPECT_CALL(mockDisplay, show(_, _)).Times(AnyNumber());
 
   // 1. Accumulate some distance
-  drivers::GPSWrapper::setMockSpeed(30.0f);
+  application::GPSWrapper::setMockSpeed(30.0f);
   // Simulate 1 hour passing (needs many updates or large time jump?)
   // CycleComputer calls tripComputer.update(speed, millis())
   // We can jump time.

tests/host/InputManagerTest.cpp

@@ -9,29 +9,29 @@ class InputManagerTest : public ::testing::Test {
 
   void SetUp() override {
     // Reset mocks
-    // drivers::Button::resetMock(); // Removed
+    // drivers::ButtonDriver::resetMock(); // Removed
     inputManager = new application::InputManager();
     inputManager->begin();
 
     // Ensure initial state is released (HIGH)
-    drivers::Button::setMockState(Config::Pin::BTN_A, HIGH);
-    drivers::Button::setMockState(Config::Pin::BTN_B, HIGH);
+    drivers::ButtonDriver::setMockState(Config::Pin::BTN_A, HIGH);
+    drivers::ButtonDriver::setMockState(Config::Pin::BTN_B, HIGH);
   }
 
   void TearDown() override {
     delete inputManager;
   }
 };
 
-// Helper to simulate button press with debounce
+// Helper to simulate ButtonDriver press with debounce
 void pressButton(application::InputManager *im, int pin) {
-  drivers::Button::setMockState(pin, LOW);
+  drivers::ButtonDriver::setMockState(pin, LOW);
   im->update();       // Detect change (start debounce)
   _mock_millis += 70; // Wait > 50ms (Config::DEBOUNCE_DELAY assumed 50)
 }
 
 void releaseButton(application::InputManager *im, int pin) {
-  drivers::Button::setMockState(pin, HIGH);
+  drivers::ButtonDriver::setMockState(pin, HIGH);
   im->update(); // Detect change
   _mock_millis += 70;
 }
@@ -40,7 +40,7 @@ TEST_F(InputManagerTest, InitialStateReturnsNone) {
   EXPECT_EQ(inputManager->update(), application::InputEvent::NONE);
 }
 
-TEST_F(InputManagerTest, ButtonAPress) {
+TEST_F(InputManagerTest, ButtonDriverAPress) {
   pressButton(inputManager, Config::Pin::BTN_A);
   EXPECT_EQ(inputManager->update(), application::InputEvent::BTN_A);
 
@@ -51,7 +51,7 @@ TEST_F(InputManagerTest, ButtonAPress) {
   EXPECT_EQ(inputManager->update(), application::InputEvent::NONE);
 }
 
-TEST_F(InputManagerTest, ButtonBPress) {
+TEST_F(InputManagerTest, ButtonDriverBPress) {
   pressButton(inputManager, Config::Pin::BTN_B);
   EXPECT_EQ(inputManager->update(), application::InputEvent::BTN_B);
 
@@ -60,8 +60,8 @@ TEST_F(InputManagerTest, ButtonBPress) {
 }
 
 TEST_F(InputManagerTest, SimultaneousPress) {
-  drivers::Button::setMockState(Config::Pin::BTN_A, LOW);
-  drivers::Button::setMockState(Config::Pin::BTN_B, LOW);
+  drivers::ButtonDriver::setMockState(Config::Pin::BTN_A, LOW);
+  drivers::ButtonDriver::setMockState(Config::Pin::BTN_B, LOW);
   inputManager->update(); // Detect both change
 
   _mock_millis += 70;
@@ -72,7 +72,7 @@ TEST_F(InputManagerTest, SimultaneousPress) {
   EXPECT_EQ(inputManager->update(), application::InputEvent::NONE);
 }
 
-TEST_F(InputManagerTest, ButtonRelease) {
+TEST_F(InputManagerTest, ButtonDriverRelease) {
   pressButton(inputManager, Config::Pin::BTN_A);
   EXPECT_EQ(inputManager->update(), application::InputEvent::BTN_A);