refactor: update format setting

Author: rsny430

.clang-format

@@ -1,5 +1,5 @@
-BasedOnStyle: Google
-IndentWidth: 4
+BasedOnStyle: LLVM
+IndentWidth: 2
 ColumnLimit: 200
 AllowShortFunctionsOnASingleLine: Empty
 BreakBeforeBraces: Attach

CONTRIBUTING.md

@@ -15,7 +15,7 @@
 
 ## 2. 基本スタイル (Basic Style)
 
-- **インデント**: スペース 4 つ
+- **インデント**: スペース 2 つ
 - **中括弧の位置**: 同じ行に置く (Attach)
   - OK: `void loop() {`
   - NG: `void loop()\n{`
@@ -26,10 +26,10 @@
 
 ## 3. ハードウェア定義 (Hardware Definitions)
 
-- **ピン定義**: `#define` マクロの使用は避け、`const uint8_t` または `enum` を使用してください。
+- **ピン定義**: `#define` マクロの使用は避け、`constexpr` または `enum` を使用してください。
   ```cpp
   // OK
-  const uint8_t LED_PIN = 13;
+  constexpr uint8_t LED_PIN = 13;
   // または
   enum Pin : uint8_t { LED_RED = 13 };
   ```

src/Config.h

@@ -15,7 +15,7 @@ constexpr int OLED_SDA = PIN_D14;
 
 // システム
 constexpr int WARN_LED = PIN_D02;
-}  // namespace Pin
+} // namespace Pin
 
 constexpr unsigned long DEBOUNCE_DELAY = 50;
 constexpr unsigned long DISPLAY_UPDATE_INTERVAL_MS = 100;
@@ -24,19 +24,19 @@ namespace OLED {
 constexpr int WIDTH = 128;
 constexpr int HEIGHT = 64;
 constexpr int ADDRESS = 0x3C;
-}  // namespace OLED
+} // namespace OLED
 
 namespace Time {
 constexpr int JST_OFFSET = 9;
 }
 
 namespace Trip {
-constexpr float MOVE_THRESHOLD_KMH = 3.0f;  // 「移動中」とみなすための閾値
+constexpr float MOVE_THRESHOLD_KMH = 3.0f; // 「移動中」とみなすための閾値
 }
 
 namespace Power {
-constexpr int BATTERY_LOW_THRESHOLD = 3600;  // 3.6V
+constexpr int BATTERY_LOW_THRESHOLD = 3600; // 3.6V
 constexpr int BATTERY_CHECK_INTERVAL_MS = 10000;
 constexpr int LED_BLINK_INTERVAL_MS = 500;
-}  // namespace Power
-}  // namespace Config
+} // namespace Power
+} // namespace Config

src/drivers/Button.cpp

@@ -3,25 +3,27 @@
 Button::Button(int pin) : pinNumber(pin) {}
 
 void Button::begin() {
-    pinMode(pinNumber, INPUT_PULLUP);
-    stablePinLevel = digitalRead(pinNumber);
-    lastPinLevel = stablePinLevel;
-    lastDebounceTime = millis();
+  pinMode(pinNumber, INPUT_PULLUP);
+  stablePinLevel = digitalRead(pinNumber);
+  lastPinLevel = stablePinLevel;
+  lastDebounceTime = millis();
 }
 
 bool Button::isPressed() {
-    bool rawPinLevel = digitalRead(pinNumber);
-    bool pressed = false;
+  bool rawPinLevel = digitalRead(pinNumber);
+  bool pressed = false;
 
-    if (rawPinLevel != lastPinLevel) resetDebounceTimer();
+  if (rawPinLevel != lastPinLevel)
+    resetDebounceTimer();
 
-    if (hasDebounceTimePassed()) {
-        if (stablePinLevel != rawPinLevel) {
-            if (rawPinLevel == LOW) pressed = true;
-            stablePinLevel = rawPinLevel;
-        }
+  if (hasDebounceTimePassed()) {
+    if (stablePinLevel != rawPinLevel) {
+      if (rawPinLevel == LOW)
+        pressed = true;
+      stablePinLevel = rawPinLevel;
     }
+  }
 
-    lastPinLevel = rawPinLevel;
-    return pressed;
+  lastPinLevel = rawPinLevel;
+  return pressed;
 }

src/drivers/Button.h

@@ -4,26 +4,26 @@
 #include "Arduino.h"
 
 class Button {
-   private:
-    const int pinNumber;
-    bool stablePinLevel;
-    bool lastPinLevel;
-    unsigned long lastDebounceTime;
+private:
+  const int pinNumber;
+  bool stablePinLevel;
+  bool lastPinLevel;
+  unsigned long lastDebounceTime;
 
-    inline void resetDebounceTimer() {
-        lastDebounceTime = millis();
-    }
+  inline void resetDebounceTimer() {
+    lastDebounceTime = millis();
+  }
 
-    inline bool hasDebounceTimePassed() const {
-        return (millis() - lastDebounceTime) > Config::DEBOUNCE_DELAY;
-    }
+  inline bool hasDebounceTimePassed() const {
+    return (millis() - lastDebounceTime) > Config::DEBOUNCE_DELAY;
+  }
 
-   public:
-    Button(int pin);
-    void begin();
-    bool isPressed();
+public:
+  Button(int pin);
+  void begin();
+  bool isPressed();
 
-    inline bool isHeld() const {
-        return stablePinLevel == LOW;
-    }
+  inline bool isHeld() const {
+    return stablePinLevel == LOW;
+  }
 };

src/drivers/GPSWrapper.cpp

@@ -5,45 +5,50 @@
 #include "../Config.h"
 
 bool GPSWrapper::begin() {
-    if (gnss.begin() != 0) return false;
-    gnss.select(GPS);
-    gnss.select(QZ_L1CA);
-    if (gnss.start(COLD_START) != 0) return false;
-
-    return true;
+  if (gnss.begin() != 0)
+    return false;
+  gnss.select(GPS);
+  gnss.select(QZ_L1CA);
+  if (gnss.start(COLD_START) != 0)
+    return false;
+
+  return true;
 }
 
 void GPSWrapper::update() {
-    if (!gnss.waitUpdate(0)) return;
-    gnss.getNavData(&navData);
+  if (!gnss.waitUpdate(0))
+    return;
+  gnss.getNavData(&navData);
 }
 
 float GPSWrapper::getSpeedKmh() const {
-    if (!(navData.posFixMode == Fix2D || navData.posFixMode == Fix3D)) return 0.0f;
-    if (navData.velocity < 0.1f) return 0.0f; // 測位誤差対策
-    float speedKmh = navData.velocity * 3.6f;
-    return speedKmh;
+  if (!(navData.posFixMode == Fix2D || navData.posFixMode == Fix3D))
+    return 0.0f;
+  if (navData.velocity < 0.1f)
+    return 0.0f; // 測位誤差対策
+  float speedKmh = navData.velocity * 3.6f;
+  return speedKmh;
 }
 
-void GPSWrapper::getTimeJST(char* displayData, size_t size) const {
-    if (!(navData.time.year >= 2020)) {
-        snprintf(displayData, size, "??:??");
-        return;
-    }
+void GPSWrapper::getTimeJST(char *displayData, size_t size) const {
+  if (!(navData.time.year >= 2020)) {
+    snprintf(displayData, size, "??:??");
+    return;
+  }
 
-    int hour = (navData.time.hour + Config::Time::JST_OFFSET + 24) % 24;
-    int minute = navData.time.minute;
-    snprintf(displayData, size, "%02d:%02d", hour, minute);
+  int hour = (navData.time.hour + Config::Time::JST_OFFSET + 24) % 24;
+  int minute = navData.time.minute;
+  snprintf(displayData, size, "%02d:%02d", hour, minute);
 }
 
 #ifdef UNIT_TEST
 void GPSWrapper::setMockTime(int h, int m, int s) {
-    SpGnss::mockTimeData.hour = h;
-    SpGnss::mockTimeData.minute = m;
-    SpGnss::mockTimeData.second = s;
+  SpGnss::mockTimeData.hour = h;
+  SpGnss::mockTimeData.minute = m;
+  SpGnss::mockTimeData.second = s;
 }
 
 void GPSWrapper::setMockSpeed(float speedKmh) {
-    SpGnss::mockVelocityData = speedKmh / 3.6f;
+  SpGnss::mockVelocityData = speedKmh / 3.6f;
 }
 #endif

src/drivers/GPSWrapper.h

@@ -4,19 +4,19 @@
 #include <GNSS.h>
 
 class GPSWrapper {
-   public:
-    bool begin();
-    void update();
-    float getSpeedKmh() const;
-    void getTimeJST(char* buffer, size_t size) const;
+public:
+  bool begin();
+  void update();
+  float getSpeedKmh() const;
+  void getTimeJST(char *buffer, size_t size) const;
 
-   private:
-    SpGnss gnss;
-    SpNavData navData;
+private:
+  SpGnss gnss;
+  SpNavData navData;
 
 #ifdef UNIT_TEST
-   public:
-    static void setMockTime(int h, int m, int s);
-    static void setMockSpeed(float speedKmh);
+public:
+  static void setMockTime(int h, int m, int s);
+  static void setMockSpeed(float speedKmh);
 #endif
 };

src/drivers/OLEDDriver.cpp

@@ -5,75 +5,78 @@
 #include "../Config.h"
 
 OLEDDriver::OLEDDriver() : display(Config::OLED::WIDTH, Config::OLED::HEIGHT, &Wire, -1) {
-    currentType = DisplayDataType::INVALID;
+  currentType = DisplayDataType::INVALID;
 }
 
 bool OLEDDriver::begin() {
-    if (!display.begin(SSD1306_SWITCHCAPVCC, Config::OLED::ADDRESS)) return false;
+  if (!display.begin(SSD1306_SWITCHCAPVCC, Config::OLED::ADDRESS))
+    return false;
 
-    display.clearDisplay();
-    display.display();
-    display.setTextColor(SSD1306_WHITE);
-    display.setTextSize(1);
+  display.clearDisplay();
+  display.display();
+  display.setTextColor(SSD1306_WHITE);
+  display.setTextSize(1);
 
-    currentValue = "";
-    return true;
+  currentValue = "";
+  return true;
 }
 
 void OLEDDriver::clear() {
-    display.clearDisplay();
-    display.display();
-    currentValue = "";
-    currentType = DisplayDataType::INVALID;
+  display.clearDisplay();
+  display.display();
+  currentValue = "";
+  currentType = DisplayDataType::INVALID;
 }
 
-void OLEDDriver::drawTitle(const String& title) {
-    display.setTextSize(1);
-    display.setCursor(0, 0);
-    display.println(title);
+void OLEDDriver::drawTitle(const String &title) {
+  display.setTextSize(1);
+  display.setCursor(0, 0);
+  display.println(title);
 }
 
-void OLEDDriver::drawUnit(const String& unit) {
-    if (unit.length() <= 0) return;
+void OLEDDriver::drawUnit(const String &unit) {
+  if (unit.length() <= 0)
+    return;
 
-    int16_t x1, y1;
-    uint16_t w, h;
-    display.setTextSize(1);
-    display.getTextBounds(unit, 0, 0, &x1, &y1, &w, &h);
-    display.setCursor(Config::OLED::WIDTH - w - 4, Config::OLED::HEIGHT - h - 2);
-    display.print(unit);
+  int16_t x1, y1;
+  uint16_t w, h;
+  display.setTextSize(1);
+  display.getTextBounds(unit, 0, 0, &x1, &y1, &w, &h);
+  display.setCursor(Config::OLED::WIDTH - w - 4, Config::OLED::HEIGHT - h - 2);
+  display.print(unit);
 }
 
-void OLEDDriver::drawValue(const String& value) {
-    int len = value.length();
-    if (len < 5)
-        display.setTextSize(3);
-    else
-        display.setTextSize(2);
+void OLEDDriver::drawValue(const String &value) {
+  int len = value.length();
+  if (len < 5)
+    display.setTextSize(3);
+  else
+    display.setTextSize(2);
 
-    int16_t x1, y1;
-    uint16_t w, h;
-    display.getTextBounds(value, 0, 0, &x1, &y1, &w, &h);
+  int16_t x1, y1;
+  uint16_t w, h;
+  display.getTextBounds(value, 0, 0, &x1, &y1, &w, &h);
 
-    int x = (Config::OLED::WIDTH - w) / 2;
-    int y = (Config::OLED::HEIGHT - h) / 2 + 8;  // shift down a bit below title
+  int x = (Config::OLED::WIDTH - w) / 2;
+  int y = (Config::OLED::HEIGHT - h) / 2 + 8; // shift down a bit below title
 
-    display.setCursor(x, y);
-    display.print(value);
+  display.setCursor(x, y);
+  display.print(value);
 }
 
-void OLEDDriver::show(DisplayDataType type, const char* value) {
-    if (type == currentType && currentValue.equals(value)) return;
+void OLEDDriver::show(DisplayDataType type, const char *value) {
+  if (type == currentType && currentValue.equals(value))
+    return;
 
-    currentType = type;
-    currentValue = String(value);
+  currentType = type;
+  currentValue = String(value);
 
-    display.clearDisplay();
+  display.clearDisplay();
 
-    DisplayMetadata meta = getDisplayMetadata(type);
-    drawTitle(meta.title);
-    drawValue(currentValue);
-    drawUnit(meta.unit);
+  DisplayMetadata meta = getDisplayMetadata(type);
+  drawTitle(meta.title);
+  drawValue(currentValue);
+  drawUnit(meta.unit);
 
-    display.display();
+  display.display();
 }