apply clang v12 formatting with inline ifs for #3

Author: ModischFabrications

.clang-format

@@ -1,5 +1,6 @@
 ---
 # We'll use defaults from the LLVM style, but with 4 columns indentation.
+# see https://releases.llvm.org/12.0.1/tools/clang/docs/ClangFormatStyleOptions.html
 BasedOnStyle: LLVM
 IndentWidth: 4
 ---
@@ -9,6 +10,5 @@ DerivePointerAlignment: false
 PointerAlignment: Left
 ColumnLimit: 120
 AllowShortBlocksOnASingleLine: Empty
-# AllowShortIfStatementsOnASingleLine: AllIfsAndElse
-
+AllowShortIfStatementsOnASingleLine: WithoutElse
 ---

src/controller.h

@@ -26,8 +26,7 @@ Mode mode;
 uint32_t timeout = 0;
 
 void _toMode(Mode new_mode) {
-    if (new_mode == mode)
-        return;
+    if (new_mode == mode) return;
     print(F("New Mode: "));
     switch (new_mode) {
     case OFF:

src/display.h

@@ -58,12 +58,12 @@ void setupPanel() {
     // initial values come from persistence/controller
 }
 
-void colorDot(uint16_t color){
+void colorDot(uint16_t color) {
     // top right corner
-    screen->drawPixel(screen->width()-1, 0, color);
+    screen->drawPixel(screen->width() - 1, 0, color);
 }
 
-void flashDot(){
+void flashDot() {
     colorDot(white);
     delay(200);
     colorDot(black);

src/inputs/touch.h

@@ -2,9 +2,9 @@
 
 #include "controller.h"
 #include "pinout.h"
+#include "shared/rebootManager.h"
 #include "shared/serialWrapper.h"
 #include <Arduino.h>
-#include "shared/rebootManager.h"
 
 namespace Input_Touch {
 
@@ -36,7 +36,7 @@ void logAllTouches() {
 
 void setup() {
     logAllTouches();
-    delay(10);  // make sure touch pins are loaded
+    delay(10); // make sure touch pins are loaded
     // touchAttachInterrupt(Pinout::TOUCH_TOP, touchedTop, TOUCH_THRESHOLD);
     touchAttachInterrupt(Pinout::TOUCH_LEFT, touchedLeft, TOUCH_THRESHOLD);
     touchAttachInterrupt(Pinout::TOUCH_RIGHT, touchedRight, TOUCH_THRESHOLD);

src/inputs/website.h

@@ -27,7 +27,7 @@ void GetRoot(AsyncWebServerRequest* request) {
 
 void GetAPI(AsyncWebServerRequest* request) {
     RebootManager::setActive();
-    
+
     String message = F("Possible Commands, chain with \"&\":\n");
     message.reserve(200);
     // always show possible commands
@@ -38,7 +38,7 @@ void GetAPI(AsyncWebServerRequest* request) {
     }
     message += F("OK: \n");
 
-// TODO streamline
+    // TODO streamline
     String paramKey;
     paramKey.reserve(20);
     paramKey = F("mode");

src/modes/clock.h

@@ -27,8 +27,7 @@ void setup() {}
 uint32_t nextUpdate = 0;
 void loop() {
     uint32_t now = millis();
-    if (now < nextUpdate)
-        return;
+    if (now < nextUpdate) return;
     nextUpdate = now + UPDATE_DELAY;
     updateScreen();
 }

src/modes/colorwave.h

@@ -12,7 +12,8 @@ namespace {
 const uint8_t WIDTH = Display::PANEL_RES_X;
 const uint8_t HEIGHT = Display::PANEL_RES_Y;
 
-// heavily inspired by https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA/blob/master/examples/2_PatternPlasma/2_PatternPlasma.ino
+// heavily inspired by
+// https://github.com/mrfaptastic/ESP32-HUB75-MatrixPanel-I2S-DMA/blob/master/examples/2_PatternPlasma/2_PatternPlasma.ino
 
 uint16_t time_counter = 0, cycles = 0;
 CRGB currentColor;

src/modes/dashboard.h

@@ -38,8 +38,7 @@ void setup() {}
 uint32_t nextUpdate = 0;
 void loop() {
     uint32_t now = millis();
-    if (now < nextUpdate)
-        return;
+    if (now < nextUpdate) return;
     nextUpdate = now + UPDATE_DELAY;
     updateScreen();
 }

src/modes/fire.h

@@ -68,8 +68,7 @@ void updateScreen() {
     byte chgchance = 125; // higher number less chance (0-254) default: 245
 
     for (int i = 0; i <= (WIDTH - 1); i++) {
-        if (random8() > chgchance)
-            continue;
+        if (random8() > chgchance) continue;
         byte rCol = random8();
         if (i >= 1 && i <= (WIDTH - 2)) {
             if (intensity[XY(0, i - 1)] > 0 || intensity[XY(0, i + 1)] > 0) {
@@ -100,8 +99,7 @@ void updateScreen() {
         CRGB c = ColorFromPalette(activePalette, intensity[i]);
         uint8_t x = i / HEIGHT;
         uint8_t y = i % HEIGHT;
-        if (true)
-            y = HEIGHT - 1 - y;
+        if (true) y = HEIGHT - 1 - y;
         Display::screen->drawPixelRGB888(x, y, c.r, c.g, c.b);
     }
 }

src/pinout.h

@@ -52,7 +52,7 @@ void setup() {
     pinMode(LED_BUILTIN, OUTPUT);
 
     for (uint8_t p : Pinout::TOUCH) {
-        pinMode(p, INPUT);  // prevents shorts
+        pinMode(p, INPUT); // prevents shorts
     }
 
     // Matrix sets up itself

src/shared/persistence/persistenceManager.h

@@ -57,9 +57,7 @@ void callListeners() {
         fListener listener = listeners[i];
 
         // check for value
-        if (listener == nullptr) {
-            println(F("Listener not initialised"));
-        }
+        if (listener == nullptr) { println(F("Listener not initialised")); }
         // unpack function pointer from list and call
         (*listener)();
     }

src/shared/persistence/persistenceStore.h

@@ -39,17 +39,17 @@ const uint16_t MAX_BYTES_USED = 127;
 
 // call once at startup to reserve (emulated) storage for usage
 void setup() {
-  // ESP needs to know how much storage we actually need, AVR won't
-  EEPROM.begin(MAX_BYTES_USED);
+    // ESP needs to know how much storage we actually need, AVR won't
+    EEPROM.begin(MAX_BYTES_USED);
 }
 
 // save settings to EEPROM for persistent storage
 void saveSettings(const Configuration settings) {
-  EEPROM.write(EEPROM_VERSION_ADDR, VERSION);
-  EEPROM.put(EEPROM_SETTINGS_ADDR, settings);
+    EEPROM.write(EEPROM_VERSION_ADDR, VERSION);
+    EEPROM.put(EEPROM_SETTINGS_ADDR, settings);
 
-  // commit planned changes
-  EEPROM.commit();
+    // commit planned changes
+    EEPROM.commit();
 }
 
 /**
@@ -58,21 +58,21 @@ void saveSettings(const Configuration settings) {
  * The chance that a random, unset combination is a match is very low.
  * */
 const Configuration loadSettings() {
-  // could be rubbish or zeros, either way should work
-  uint8_t savedVersion = EEPROM.read(EEPROM_VERSION_ADDR);
+    // could be rubbish or zeros, either way should work
+    uint8_t savedVersion = EEPROM.read(EEPROM_VERSION_ADDR);
 
-  if (savedVersion != VERSION) {
-    // save new default settings as fallback, updates version for next run
-    saveSettings(defaultConfiguration);
+    if (savedVersion != VERSION) {
+        // save new default settings as fallback, updates version for next run
+        saveSettings(defaultConfiguration);
 
-    return defaultConfiguration;
-  }
+        return defaultConfiguration;
+    }
 
-  // default isn't actually used, but it prevents compile warnings
-  Configuration settings = defaultConfiguration;
-  EEPROM.get(EEPROM_SETTINGS_ADDR, settings);
+    // default isn't actually used, but it prevents compile warnings
+    Configuration settings = defaultConfiguration;
+    EEPROM.get(EEPROM_SETTINGS_ADDR, settings);
 
-  return settings;
+    return settings;
 }
 
 } // namespace PersistenceStore

src/shared/rebootManager.h

@@ -24,8 +24,7 @@ void rebootNow() {
 void setActive() { scheduledRestart = millis() + INACTIVITY_THRESHOLD_MS; }
 
 void loop() {
-    if (millis() > MIN_REBOOT_DELAY_MS && scheduledRestart < millis())
-        rebootNow();
+    if (millis() > MIN_REBOOT_DELAY_MS && scheduledRestart < millis()) rebootNow();
 }
 
 } // namespace RebootManager

src/shared/serialWrapper.h

@@ -53,7 +53,7 @@ void heartbeatSerial() {
     lastCycle = time;
 }
 
-void println(){
+void println() {
     if (!USE_SERIAL) return;
     Serial.println();
 }

src/shared/timeService.h

@@ -16,9 +16,7 @@ const long gmtOffset_sec = 3600;
 const int daylightOffset_sec = 3600;
 
 void updateLocalTime() {
-    if (!getLocalTime(&timeinfo)) {
-        logError(F("Failed to obtain time"));
-    }
+    if (!getLocalTime(&timeinfo)) { logError(F("Failed to obtain time")); }
 }
 } // namespace
 
@@ -27,8 +25,7 @@ void setup() { configTime(gmtOffset_sec, daylightOffset_sec, ntpServer); }
 uint32_t nextUpdate = 0;
 void loop() {
     uint32_t now = millis();
-    if (now < nextUpdate)
-        return;
+    if (now < nextUpdate) return;
     nextUpdate = now + UPDATE_DELAY;
     updateLocalTime();
 }