Run clang-format on files changed in branch

Author: Louis Pearson

src/components/stopwatch/StopWatchController.cpp

@@ -70,7 +70,7 @@ int wrap(int index) {
   return ((index % LAP_CAPACITY) + LAP_CAPACITY) % LAP_CAPACITY;
 }
 
-LapInfo_t *StopWatch::lastLap(int lap) {
+LapInfo_t* StopWatch::lastLap(int lap) {
   if (lap >= LAP_CAPACITY || lap > lapCount || lapCount == 0) {
     // Return "empty" LapInfo_t
     return &emptyLapInfo;

src/components/stopwatch/StopWatchController.h

@@ -14,7 +14,7 @@ namespace Pinetime {
     enum class StopWatchStates { Cleared, Running, Paused };
 
     struct LapInfo_t {
-      int count = 0; // Used to label the lap
+      int count = 0;       // Used to label the lap
       TickType_t time = 0; // delta time from beginning of stopwatch
     };
 
@@ -44,7 +44,7 @@ namespace Pinetime {
       /// Indexes into lap history, with 0 being the latest lap.
       /// If the lap is unavailable, count and time will be 0. If there is a
       /// real value, count should be above 0
-      LapInfo_t *lastLap(int lap=0);
+      LapInfo_t* lastLap(int lap = 0);
 
       bool isRunning();
       bool isCleared();
@@ -59,7 +59,7 @@ namespace Pinetime {
       TickType_t timeElapsedPreviously = 0;
       // Stores lap times
       LapInfo_t laps[LAP_CAPACITY];
-      LapInfo_t emptyLapInfo = { .count = 0, .time = 0 };
+      LapInfo_t emptyLapInfo = {.count = 0, .time = 0};
       int lapCount = 0;
       int lapHead = 0;
     };

src/displayapp/screens/StopWatch.cpp

@@ -45,7 +45,10 @@ static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
   stopWatch->stopLapBtnEventHandler(event);
 }
 
-StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask, Controllers::DateTime& dateTimeController, Controllers::StopWatch& stopWatchController)
+StopWatch::StopWatch(DisplayApp* app,
+                     System::SystemTask& systemTask,
+                     Controllers::DateTime& dateTimeController,
+                     Controllers::StopWatch& stopWatchController)
   : Screen(app),
     systemTask {systemTask},
     dateTimeController {dateTimeController},
@@ -172,28 +175,16 @@ void StopWatch::displayPaused() {
 }
 
 void StopWatch::updateLaps() {
-  Pinetime::Controllers::LapInfo_t *lap1 = stopWatchController.lastLap();
-  Pinetime::Controllers::LapInfo_t *lap2 = stopWatchController.lastLap(1);
+  Pinetime::Controllers::LapInfo_t* lap1 = stopWatchController.lastLap();
+  Pinetime::Controllers::LapInfo_t* lap2 = stopWatchController.lastLap(1);
 
   if (lap1->count != 0) {
     TimeSeparated_t laptime = convertTicksToTimeSegments(lap1->time);
-    lv_label_set_text_fmt(
-      lapOneText,
-      "#%2d   %2d:%02d.%02d",
-      lap1->count,
-      laptime.mins,
-      laptime.secs,
-      laptime.hundredths);
+    lv_label_set_text_fmt(lapOneText, "#%2d   %2d:%02d.%02d", lap1->count, laptime.mins, laptime.secs, laptime.hundredths);
   }
   if (lap2->count != 0) {
     TimeSeparated_t laptime = convertTicksToTimeSegments(lap2->time);
-    lv_label_set_text_fmt(
-      lapTwoText,
-      "#%2d   %2d:%02d.%02d",
-      lap2->count,
-      laptime.mins,
-      laptime.secs,
-      laptime.hundredths);
+    lv_label_set_text_fmt(lapTwoText, "#%2d   %2d:%02d.%02d", lap2->count, laptime.mins, laptime.secs, laptime.hundredths);
   }
 }
 
@@ -227,7 +218,8 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
   }
   // If running, then this button is used to save laps
   if (stopWatchController.isRunning()) {
-    TickType_t currentTime = stopWatchController.getElapsedPreviously() + calculateDelta(stopWatchController.getStart(), xTaskGetTickCount());
+    TickType_t currentTime =
+      stopWatchController.getElapsedPreviously() + calculateDelta(stopWatchController.getStart(), xTaskGetTickCount());
     stopWatchController.pushLap(currentTime);
 
     updateLaps();

src/main.cpp

@@ -159,7 +159,7 @@ Pinetime::System::SystemTask systemTask(spi,
                                         fs,
                                         touchHandler);
 
-/* Variable Declarations for variables in noinit SRAM 
+/* Variable Declarations for variables in noinit SRAM
    Increment NoInit_MagicValue upon adding variables to this area
 */
 extern uint32_t __start_noinit_data;
@@ -168,7 +168,6 @@ static constexpr uint32_t NoInit_MagicValue = 0xDEAD0000;
 uint32_t NoInit_MagicWord __attribute__((section(".noinit")));
 std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> NoInit_BackUpTime __attribute__((section(".noinit")));
 
-
 void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
   if (pin == Pinetime::PinMap::Cst816sIrq) {
     systemTask.OnTouchEvent();
@@ -329,12 +328,11 @@ int main(void) {
   // retrieve version stored by bootloader
   Pinetime::BootloaderVersion::SetVersion(NRF_TIMER2->CC[0]);
 
-  
   if (NoInit_MagicWord == NoInit_MagicValue) {
     dateTimeController.SetCurrentTime(NoInit_BackUpTime);
   } else {
-    //Clear Memory to known state
-    memset(&__start_noinit_data,0,(uintptr_t)&__stop_noinit_data-(uintptr_t)&__start_noinit_data);
+    // Clear Memory to known state
+    memset(&__start_noinit_data, 0, (uintptr_t) &__stop_noinit_data - (uintptr_t) &__start_noinit_data);
     NoInit_MagicWord = NoInit_MagicValue;
   }
 

src/systemtask/SystemTask.cpp

@@ -25,7 +25,6 @@
 #include "main.h"
 #include "BootErrors.h"
 
-
 #include <memory>
 
 using namespace Pinetime::System;
@@ -179,7 +178,8 @@ void SystemTask::Work() {
   nrfx_gpiote_in_event_enable(PinMap::Button, true);
 
   // Touchscreen
-  nrf_gpio_cfg_sense_input(PinMap::Cst816sIrq, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pullup, (nrf_gpio_pin_sense_t) GPIO_PIN_CNF_SENSE_Low);
+  nrf_gpio_cfg_sense_input(
+    PinMap::Cst816sIrq, (nrf_gpio_pin_pull_t) GPIO_PIN_CNF_PULL_Pullup, (nrf_gpio_pin_sense_t) GPIO_PIN_CNF_SENSE_Low);
 
   pinConfig.skip_gpio_setup = true;
   pinConfig.hi_accuracy = false;