diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..3ff2e02
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,18 @@
+# Clang format based on https://github.com/mls-m5/matgui/blob/master/.clang-format
+
+Language: Cpp
+BasedOnStyle: LLVM
+IndentWidth: 4
+SortIncludes: true
+AccessModifierOffset: -4
+AlwaysBreakTemplateDeclarations: true
+AllowShortFunctionsOnASingleLine: None
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  BeforeCatch: true
+  BeforeElse: true
+  
+AlwaysBreakAfterReturnType: None
+PenaltyReturnTypeOnItsOwnLine: 1000000
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index e80666b..0f0d740 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,7 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f1bdcfc..8509a12 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
+    "editor.formatOnSave": true,
     "files.associations": {
         "array": "cpp",
         "deque": "cpp",