added clang format

Author: NanoCodeBug

pawos.ino

@@ -1,25 +1,23 @@
+#include <Adafruit_SPIFlash.h>
+#include <Adafruit_TinyUSB.h>
 #include <Arduino.h>
+#include <FatLib/FatFileSystem.h>
+#include <SPI.h>
 #include <WInterrupts.h>
 #include <wiring_private.h>
-#include <SPI.h>
-#include <Adafruit_TinyUSB.h>
-#include <Adafruit_SPIFlash.h>
-#include <FatLib/FatFileSystem.h>
 
-#include "src/lib/PawPet_FlashTransport.h"
 #include "src/lib/ArduinoLowPower.h"
+#include "src/lib/PawPet_FlashTransport.h"
 
+#include "src/common.h"
 #include "src/config.h"
 #include "src/global.h"
-#include "src/common.h"
 #include "src/states/gamestate.h"
 
 // TODO: Move setup of all devices elsewhere
 // have the .ino to contain the core update loop only
 
-static const SPIFlash_Device_t possible_devices[] = {
-  MX25R1635F
-};
+static const SPIFlash_Device_t possible_devices[] = {MX25R1635F};
 
 SPIClass dispSPI(&sercom4, SHARP_MISO, SHARP_SCK, SHARP_MOSI, SPI_PAD_2_SCK_3, SERCOM_RX_PAD_0);
 
@@ -66,17 +64,14 @@ void setup(void)
 
     // Disable 8mhz GLCK 3 that bootloader has setup, unused?
     GCLK->CLKCTRL.reg = GCLK_CLKCTRL_GEN_GCLK3;
-    while (GCLK->STATUS.bit.SYNCBUSY)
-        ;
+    while (GCLK->STATUS.bit.SYNCBUSY) {}
 
     GCLK->GENCTRL.reg = GCLK_GENCTRL_ID(3);
-    while (GCLK->STATUS.bit.SYNCBUSY)
-        ;
+    while (GCLK->STATUS.bit.SYNCBUSY) {}
 
     // disable DAC clock
     GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(GCM_DAC);
-    while (GCLK->STATUS.bit.SYNCBUSY)
-        ;
+    while (GCLK->STATUS.bit.SYNCBUSY) {}
 
     // power manager
     // disable unused counters
@@ -164,8 +159,7 @@ void setup(void)
 
 #ifdef DEBUG
     // wait for serial to attach
-    while (!Serial)
-        ;
+    while (!Serial) {}
 
     // dump registers for debugging power settings
     ZeroRegOptions opts = {Serial, false};
@@ -195,7 +189,7 @@ void loop(void)
 {
     //// UPDATE ////
     keysPressed |= readButtons();
-    
+
     currentTimeMs = millis();
 
     if (keysPressed)
@@ -211,30 +205,29 @@ void loop(void)
 
         g::keyPressed = keysPressed;
         g::keyReleased = ~(prevKeysPressed) & (keysPressed);
-        
+
         GameState *nextState = currentState->update();
 
         if (nextState != currentState)
         {
             delete currentState;
             currentState = nextState;
 
-            switch(nextState->tick)
+            switch (nextState->tick)
             {
-                case k_tickTime30:
+            case k_tickTime30:
                 requestedFpsSleep = k_30_fpsSleepMs;
                 break;
-                case k_tickTime15:
+            case k_tickTime15:
                 requestedFpsSleep = k_15_fpsSleepMs;
                 break;
-                case k_tickTime5:
+            case k_tickTime5:
                 requestedFpsSleep = k_5_fpsSleepMs;
                 break;
-                case k_tickTime1:
+            case k_tickTime1:
                 requestedFpsSleep = k_1_fpsSleepMs;
                 break;
             }
-            
         }
 
         // display is done with dma transfer

src/common.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Arduino.h>
 #include "config.h"
+#include <Arduino.h>
 
-#define PETPIC( x ) x, x##_meta
+#define PETPIC(x) x, x##_meta
 
 typedef const uint32_t image_t;
 typedef const uint16_t meta_t;
@@ -12,10 +12,10 @@ struct ImageMeta
 {
     uint16_t width;
     uint16_t height;
-    uint16_t alpha;			// has alpha channel
-    uint16_t encoding;		// true: span encoded, false: bitmap
-    uint16_t tileCount; 	// number of tiles
-    uint16_t tileOffset;	// array of offsets to start of each tile
+    uint16_t alpha;      // has alpha channel
+    uint16_t encoding;   // true: span encoded, false: bitmap
+    uint16_t tileCount;  // number of tiles
+    uint16_t tileOffset; // array of offsets to start of each tile
 };
 
 #define PET_WHITE 0
@@ -30,47 +30,47 @@ struct ImageMeta
 
 enum ButtonFlags
 {
-	BUTTON_A = 0x1,
-	BUTTON_B = 0x2,
-	BUTTON_C = 0x4,
-	BUTTON_P = 0x8,
+    BUTTON_A = 0x1,
+    BUTTON_B = 0x2,
+    BUTTON_C = 0x4,
+    BUTTON_P = 0x8,
 
-	UP = 0x10,
-	DOWN = 0x20,
-	LEFT = 0x40,
-	RIGHT = 0x80,
+    UP = 0x10,
+    DOWN = 0x20,
+    LEFT = 0x40,
+    RIGHT = 0x80,
 
-	END = 0x100
+    END = 0x100
 };
 
 extern "C" char *sbrk(int i);
 
 class Util
 {
-public:
-	inline static int batteryLevel()
-	{
-		while (ADC->STATUS.bit.SYNCBUSY == 1);
-		ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;	// Gain Factor Selection
-		ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val;	// 1.0V voltage reference
+  public:
+    inline static int batteryLevel()
+    {
+        while (ADC->STATUS.bit.SYNCBUSY == 1) {}
+        ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;  // Gain Factor Selection
+        ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val; // 1.0V voltage reference
 
-		float vbat = analogRead(PIN_VBAT);
-		//return (int)vbat;
-		vbat *= 2;		// we divided by 2, so multiply back
-		vbat *= 2.0;	// Multiply by 2.0V, our reference voltage
-		vbat /= 4096.0; // convert to voltage
-		return vbat * 100;
-	}
+        float vbat = analogRead(PIN_VBAT);
+        // return (int)vbat;
+        vbat *= 2;      // we divided by 2, so multiply back
+        vbat *= 2.0;    // Multiply by 2.0V, our reference voltage
+        vbat /= 4096.0; // convert to voltage
+        return vbat * 100;
+    }
 
-	static int32_t FreeRam()
-	{
-		char stack_dummy = 0;
-		return &stack_dummy - sbrk(0);
-	}
+    static int32_t FreeRam()
+    {
+        char stack_dummy = 0;
+        return &stack_dummy - sbrk(0);
+    }
 };
 
 struct Point2D
 {
-	int16_t x;
-	int16_t y;
+    int16_t x;
+    int16_t y;
 };

src/config.h

@@ -7,66 +7,50 @@
 
 #define M0_VER_5 1
 
-const unsigned char BUILD_STRING[]
-{
-	__TIME__[0],
-	__TIME__[1],
-	__TIME__[3],
-	__TIME__[4],
-	__DATE__[0],
-	__DATE__[1],
-	__DATE__[2],
-	__DATE__[4],
-	__DATE__[5],
-	'\0'
-};
+const unsigned char BUILD_STRING[]{__TIME__[0], __TIME__[1], __TIME__[3], __TIME__[4], __DATE__[0],
+                                   __DATE__[1], __DATE__[2], __DATE__[4], __DATE__[5], '\0'};
 
 #define DISP_WIDTH 128
 #define DISP_HEIGHT 128
 
 #if defined(M0_VER_5) || defined(M0_VER_6)
-	// 0 RX
-	// 1 TX
-	#define FLASH_MISO 2 // PORTA, 14
-	#define FLASH_SCK 3  // PORTA, 9
-	#define FLASH_MOSI 4 // PORTA, 8
-	#define PIN_BUTTON_C 5
-	#define PIN_RIGHT 6
-	#define PIN_LEFT 7
-	#define SHARP_SS 8
-	#define PIN_VBAT 9 // A7
-	#define PIN_BUTTON_A 10
-	#define PIN_BUTTON_P 11
-	#define PIN_DOWN 12
-	#define PIN_BUTTON_B 13
-	// 14 A0
-	#define PIN_BEEPER 15 // A1
-	// 16 A2
-	// 17 A3
-	// 18 A4
-	#define PIN_UP 19 // A5
-	// SDA 20 no pullup?
-	// SCL 21 no pullup?
-  #define SHARP_MISO 22 // MISO 
-	#define SHARP_MOSI 23 // MOSI
-	#define SHARP_SCK 24  // SCK
-	#define FLASH_CS 38 // PORTA, 13
-
-	#define RAM_SIZE 32000
-
-	#define DISP_ROTATION 1
+// 0 RX
+// 1 TX
+#define FLASH_MISO 2 // PORTA, 14
+#define FLASH_SCK 3  // PORTA, 9
+#define FLASH_MOSI 4 // PORTA, 8
+#define PIN_BUTTON_C 5
+#define PIN_RIGHT 6
+#define PIN_LEFT 7
+#define SHARP_SS 8
+#define PIN_VBAT 9 // A7
+#define PIN_BUTTON_A 10
+#define PIN_BUTTON_P 11
+#define PIN_DOWN 12
+#define PIN_BUTTON_B 13
+// 14 A0
+#define PIN_BEEPER 15 // A1
+// 16 A2
+// 17 A3
+// 18 A4
+#define PIN_UP 19     // A5
+                      // SDA 20 no pullup?
+                      // SCL 21 no pullup?
+#define SHARP_MISO 22 // MISO
+#define SHARP_MOSI 23 // MOSI
+#define SHARP_SCK 24  // SCK
+#define FLASH_CS 38   // PORTA, 13
+
+#define RAM_SIZE 32000
+
+#define DISP_ROTATION 1
 #endif
 
-#define MX25R1635F                                                             \
-  {                                                                            \
-    .total_size = (1 << 21), /* 2 MB / 16 Mb */                                \
-    .start_up_time_us = 800, .manufacturer_id = 0xc2,                          \
-    .memory_type = 0x28, .capacity = 0x15, .max_clock_speed_mhz = 33 /*8*/,    \
-    .quad_enable_bit_mask = 0x40, .has_sector_protection = false,              \
-    .supports_fast_read = true, .supports_qspi = true,                         \
-    .supports_qspi_writes = true, .write_status_register_split = false,        \
-    .single_status_byte = true, \
-  }
-
-
-
+#define MX25R1635F                                                                                                     \
+    {                                                                                                                  \
+        .total_size = (1 << 21), /* 2 MB / 16 Mb */                                                                    \
+            .start_up_time_us = 800, .manufacturer_id = 0xc2, .memory_type = 0x28, .capacity = 0x15,                   \
+        .max_clock_speed_mhz = 33 /*8*/, .quad_enable_bit_mask = 0x40, .has_sector_protection = false,                 \
+        .supports_fast_read = true, .supports_qspi = true, .supports_qspi_writes = true,                               \
+        .write_status_register_split = false, .single_status_byte = true,                                              \
+    }

src/global.cpp

@@ -1,11 +1,11 @@
 #include "global.h"
-#include <FatLib/FatFileSystem.h>
 #include "graphics/graphic_manager.h"
+#include <FatLib/FatFileSystem.h>
 
 namespace g
 {
- FatFileSystem g_fatfs;
- GraphicCache* g_cache;
- uint32_t keyReleased;
- uint32_t keyPressed;
-}
+FatFileSystem g_fatfs;
+GraphicCache *g_cache;
+uint32_t keyReleased;
+uint32_t keyPressed;
+} // namespace g

src/global.h

@@ -3,7 +3,7 @@
 
 /**
  * Global objects and constants
- * 
+ *
  */
 
 constexpr uint32_t k_sleepTimeMs = 1 * 60 * 1000; // 1 minute sleep
@@ -16,8 +16,8 @@ constexpr uint32_t k_1_fpsSleepMs = 1000; // 1 fps
 // ticks per update, arbitrary tick rate that should scale across fps
 // leave overhead for 60 fps mode if possible
 
-constexpr uint32_t k_tickTime30 = 2;  // k_frameSleepTimeMs / 16; 30 fps ticks
-constexpr uint32_t k_tickTime15 = 4;  // k_frameSleepTimeMs / 16; 15 fps ticks
+constexpr uint32_t k_tickTime30 = 2; // k_frameSleepTimeMs / 16; 30 fps ticks
+constexpr uint32_t k_tickTime15 = 4; // k_frameSleepTimeMs / 16; 15 fps ticks
 constexpr uint32_t k_tickTime5 = 13; // k_frameSleepTimeMs / 16; 5 fps ticks
 constexpr uint32_t k_tickTime1 = 63; // k_frameSleepTimeMs / 16; 1 fps ticks
 
@@ -26,14 +26,14 @@ class GraphicCache;
 
 namespace g
 {
-    extern FatFileSystem g_fatfs;
-    extern GraphicCache *g_cache;
-    static struct
-    {
-        uint32_t flashSize;
-        uint8_t filesysFound : 1;
-    } stats;
-
-    extern uint32_t keyReleased;
-    extern uint32_t keyPressed;
-}
+extern FatFileSystem g_fatfs;
+extern GraphicCache *g_cache;
+static struct
+{
+    uint32_t flashSize;
+    uint8_t filesysFound : 1;
+} stats;
+
+extern uint32_t keyReleased;
+extern uint32_t keyPressed;
+} // namespace g

src/graphics/graphic_manager.h

@@ -25,7 +25,7 @@ class GraphicCache
     static CacheEntry gcache[GRAPHIC_CACHE_COUNT];
     static uint16_t gindex;
 
-public:
+  public:
     GraphicCache();
 
     int32_t LoadGraphic(const char *name);