Skip to content

Commit 9778259

Browse files
committed
delete debug code
1 parent 3846551 commit 9778259

File tree

10 files changed

+16
-198
lines changed

10 files changed

+16
-198
lines changed

src/Config.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22

33
#include <Arduino.h>
44

5-
#define DEBUG_MODE
6-
75
namespace Config {
8-
namespace Debug {
9-
constexpr bool ENABLE_BUTTON_LOG = true;
10-
constexpr bool ENABLE_GPS_LOG = true;
11-
} // namespace Debug
126

137
namespace Pin {
148
// ボタン

src/drivers/Button.cpp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,23 @@
11
#include "Button.h"
22

3-
#include "../system/Logger.h"
4-
53
Button::Button(int pin) : pinNumber(pin) {}
64

75
void Button::begin() {
86
pinMode(pinNumber, INPUT_PULLUP);
97
stablePinLevel = digitalRead(pinNumber);
108
lastPinLevel = stablePinLevel;
119
lastDebounceTime = millis();
12-
LOG_DEBUG_IF(Config::Debug::ENABLE_BUTTON_LOG, "Button initialized on pin %d. Initial state: %s", pinNumber, stablePinLevel == HIGH ? "HIGH" : "LOW");
1310
}
1411

1512
bool Button::isPressed() {
1613
bool rawPinLevel = digitalRead(pinNumber);
1714
bool pressed = false;
1815

19-
if (rawPinLevel != lastPinLevel) {
20-
resetDebounceTimer();
21-
LOG_DEBUG_IF(Config::Debug::ENABLE_BUTTON_LOG, "Pin %d raw change: %d -> %d", pinNumber, lastPinLevel, rawPinLevel);
22-
}
16+
if (rawPinLevel != lastPinLevel) resetDebounceTimer();
2317

2418
if (hasDebounceTimePassed()) {
2519
if (stablePinLevel != rawPinLevel) {
26-
if (rawPinLevel == LOW) {
27-
pressed = true;
28-
LOG_DEBUG_IF(Config::Debug::ENABLE_BUTTON_LOG, "Button on pin %d PRESSED (stable)", pinNumber);
29-
} else {
30-
LOG_DEBUG_IF(Config::Debug::ENABLE_BUTTON_LOG, "Button on pin %d RELEASED (stable)", pinNumber);
31-
}
20+
if (rawPinLevel == LOW) pressed = true;
3221
stablePinLevel = rawPinLevel;
3322
}
3423
}

src/drivers/GPSWrapper.cpp

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,24 @@
33
#include <Arduino.h>
44

55
#include "../Config.h"
6-
#include "../system/Logger.h"
76

87
bool GPSWrapper::begin() {
9-
if (gnss.begin() != 0) {
10-
LOG_ERROR("GPS begin failed");
11-
return false;
12-
}
13-
8+
if (gnss.begin() != 0) return false;
149
gnss.select(GPS);
1510
gnss.select(QZ_L1CA);
11+
if (gnss.start(COLD_START) != 0) return false;
1612

17-
if (gnss.start(COLD_START) != 0) {
18-
LOG_ERROR("GPS start failed");
19-
return false;
20-
}
21-
22-
LOG_DEBUG_IF(Config::Debug::ENABLE_GPS_LOG, "GPS initialized successfully");
2313
return true;
2414
}
2515

2616
void GPSWrapper::update() {
2717
if (!gnss.waitUpdate(0)) return;
2818
gnss.getNavData(&navData);
29-
30-
if (navData.posFixMode == Fix2D || navData.posFixMode == Fix3D) {
31-
LOG_DEBUG_IF(Config::Debug::ENABLE_GPS_LOG, "GPS Fix: Mode=%d, Sats=%d, Lat=%f, Lon=%f, Vel=%f, Time=%02d:%02d:%02d",
32-
navData.posFixMode,
33-
navData.numSatellites,
34-
navData.latitude,
35-
navData.longitude,
36-
navData.velocity,
37-
navData.time.hour, navData.time.minute, navData.time.second
38-
);
39-
}
4019
}
4120

4221
float GPSWrapper::getSpeedKmh() const {
43-
if (!(navData.posFixMode == Fix2D || navData.posFixMode == Fix3D)) {
44-
return 0.0f;
45-
}
46-
if (navData.velocity < 0.1f) return 0.0f; // 測位誤差対策
47-
22+
if (!(navData.posFixMode == Fix2D || navData.posFixMode == Fix3D)) return 0.0f;
23+
if (navData.velocity < 0.1f) return 0.0f; // 測位誤差対策
4824
float speedKmh = navData.velocity * 3.6f;
4925
return speedKmh;
5026
}

src/drivers/OLEDDriver.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
#include <Arduino.h>
44

55
#include "../Config.h"
6-
#include "../system/Logger.h"
76

87
OLEDDriver::OLEDDriver() : display(Config::OLED::WIDTH, Config::OLED::HEIGHT, &Wire, -1) {
98
currentType = DisplayDataType::INVALID;
109
}
1110

1211
bool OLEDDriver::begin() {
13-
if (!display.begin(SSD1306_SWITCHCAPVCC, Config::OLED::ADDRESS)) {
14-
LOG_ERROR("SSD1306 allocation failed");
15-
return false;
16-
}
12+
if (!display.begin(SSD1306_SWITCHCAPVCC, Config::OLED::ADDRESS)) return false;
1713

1814
display.clearDisplay();
1915
display.display();

src/system/CycleComputer.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "../Config.h"
44
#include "../drivers/OLEDDriver.h"
5-
#include "Logger.h"
65

76
inline void formatFloat(float val, int width, int prec, char* buf, size_t size) {
87
char fmt[6];
@@ -59,23 +58,9 @@ void CycleComputer::updateDisplay() {
5958
DisplayDataType type;
6059
getDisplayData(modeManager.getMode(), type, buf, sizeof(buf));
6160

62-
logDebugInfo(modeManager.getMode(), buf);
63-
6461
display->show(type, buf);
6562
}
6663

67-
void CycleComputer::logDebugInfo(Mode currentMode, const char* value) {
68-
#ifdef DEBUG_MODE
69-
static int lastDebugMode = -1;
70-
71-
int modeInt = (int)currentMode;
72-
if (lastDebugMode != modeInt) {
73-
LOG_DEBUG("[CycleComputer] Mode changed: %d Value: %s", modeInt, value);
74-
lastDebugMode = modeInt;
75-
}
76-
#endif
77-
}
78-
7964
void CycleComputer::getDisplayData(Mode mode, DisplayDataType& type, char* buf, size_t size) {
8065
switch (mode) {
8166
case Mode::SPEED:

src/system/CycleComputer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class CycleComputer {
2222
void handleInput();
2323
void updateDisplay();
2424
void getDisplayData(Mode mode, DisplayDataType& type, char* buf, size_t size);
25-
void logDebugInfo(Mode currentMode, const char* value);
2625

2726
public:
2827
CycleComputer(OLEDDriver* display);

src/system/DisplayData.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ DisplayMetadata getDisplayMetadata(DisplayDataType type) {
44
switch (type) {
55
case DisplayDataType::SPEED:
66
return {"SPEED", "km/h"};
7-
case DisplayDataType::TIME:
8-
return {"TIME", ""};
97
case DisplayDataType::MAX_SPEED:
108
return {"MAX SPEED", "km/h"};
11-
case DisplayDataType::DISTANCE:
12-
return {"DISTANCE", "km"};
9+
case DisplayDataType::AVG_SPEED:
10+
return {"AVG SPEED", "km/h"};
11+
case DisplayDataType::TIME:
12+
return {"TIME", ""};
1313
case DisplayDataType::MOVING_TIME:
1414
return {"MOVING TIME", ""};
1515
case DisplayDataType::ELAPSED_TIME:
1616
return {"ELAPSED TIME", ""};
17-
case DisplayDataType::AVG_SPEED:
18-
return {"AVG SPEED", "km/h"};
17+
case DisplayDataType::DISTANCE:
18+
return {"DISTANCE", "km"};
1919
default:
2020
return {"UNKNOWN", ""};
2121
}

src/system/InputManager.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "InputManager.h"
22

33
#include "../Config.h"
4-
#include "Logger.h"
54

65
InputManager::InputManager() : btnA(Config::Pin::BTN_A), btnB(Config::Pin::BTN_B) {}
76

@@ -14,20 +13,9 @@ InputEvent InputManager::update() {
1413
bool aPressed = btnA.isPressed();
1514
bool bPressed = btnB.isPressed();
1615

17-
if ((aPressed && btnB.isHeld()) || (bPressed && btnA.isHeld())) {
18-
LOG_DEBUG("[InputManager] 同時に押された");
19-
return InputEvent::BTN_BOTH;
20-
}
21-
22-
if (aPressed) {
23-
LOG_DEBUG("[InputManager] Aボタンが押された");
24-
return InputEvent::BTN_A;
25-
}
26-
27-
if (bPressed) {
28-
LOG_DEBUG("[InputManager] Bボタンが押された");
29-
return InputEvent::BTN_B;
30-
}
16+
if ((aPressed && btnB.isHeld()) || (bPressed && btnA.isHeld())) return InputEvent::BTN_BOTH;
17+
if (aPressed) return InputEvent::BTN_A;
18+
if (bPressed) return InputEvent::BTN_B;
3119

3220
return InputEvent::NONE;
3321
}

src/system/Logger.cpp

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/system/Logger.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)