InfiniTime.git

diff --git a/.clang-format b/.clang-format
index b5c102d5ffb0b3c83760b5a78941212973642736..18f134dc7e19360d7fa5eb07a21d07e9fc43fa38 100644
--- a/.clang-format
+++ b/.clang-format
@@ -20,7 +20,7 @@ AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:




diff --git a/src/StaticStack.h b/src/StaticStack.h
index 64886604ff277bd1b8d5ab65599f543f6508a271..598febce439d237afd8340da8bbe2831b9e1816b 100644
--- a/src/StaticStack.h
+++ b/src/StaticStack.h
@@ -1,7 +1,8 @@
 #include <array>
 #include <cstddef>
 
-template <typename T, size_t N> class StaticStack {
+template <typename T, size_t N>
+class StaticStack {
 public:
   T Pop();
   void Push(T element);
@@ -15,24 +16,28 @@   size_t stackPointer = 0;
 };
 
 // Returns random data when popping from empty array.
-template <typename T, size_t N> T StaticStack<T, N>::Pop() {
+template <typename T, size_t N>
+T StaticStack<T, N>::Pop() {
   if (stackPointer > 0) {
     stackPointer--;
   }
   return elementArray[stackPointer];
 }
 
-template <typename T, size_t N> void StaticStack<T, N>::Push(T element) {
+template <typename T, size_t N>
+void StaticStack<T, N>::Push(T element) {
   if (stackPointer < elementArray.size()) {
     elementArray[stackPointer] = element;
     stackPointer++;
   }
 }
 
-template <typename T, size_t N> void StaticStack<T, N>::Reset() {
+template <typename T, size_t N>
+void StaticStack<T, N>::Reset() {
   stackPointer = 0;
 }
 
-template <typename T, size_t N> T StaticStack<T, N>::Top() {
+template <typename T, size_t N>
+T StaticStack<T, N>::Top() {
   return elementArray[stackPointer - 1];
 }




diff --git a/src/components/utility/LinearApproximation.h b/src/components/utility/LinearApproximation.h
index f7104ced280d57c47226d8454eedeb70e54c55be..1fe58d44f04f2c833ff38049ed19c0cad7dc1317 100644
--- a/src/components/utility/LinearApproximation.h
+++ b/src/components/utility/LinearApproximation.h
@@ -7,7 +7,8 @@ namespace Pinetime {
   namespace Utility {
 
     // based on: https://github.com/SHristov92/LinearApproximation/blob/main/Linear.h
-    template <typename Key, typename Value, std::size_t Size> class LinearApproximation {
+    template <typename Key, typename Value, std::size_t Size>
+    class LinearApproximation {
       using Point = struct {
         Key key;
         Value value;




diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index 4cf134d2ef0631b98e0b3167f9786bd1ffbf70b0..73f801919277581b12034d3bf604683193dde943 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -10,7 +10,8 @@     class DisplayApp;
 
     namespace Screens {
 
-      template <class T> class DirtyValue {
+      template <class T>
+      class DirtyValue {
       public:
         DirtyValue() = default; // Use NSDMI
 




diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index 6c9a221872906ef033b84f5c306905671591437b..255544b697e097583c1d6bf8792c87b8dadd3345 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -12,7 +12,8 @@     namespace Screens {
 
       enum class ScreenListModes { UpDown, RightLeft, LongPress };
 
-      template <size_t N> class ScreenList : public Screen {
+      template <size_t N>
+      class ScreenList : public Screen {
       public:
         ScreenList(DisplayApp* app,
                    uint8_t initScreen,