diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..ee49bb82b
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,39 @@
+Language: Cpp
+BasedOnStyle: LLVM
+UseTab: Never
+IndentWidth: 4
+ColumnLimit: 140
+TabWidth: 4
+#BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterControlStatement: false
+  AfterFunction: false
+  AfterClass: true
+  AfterEnum: true
+  BeforeElse: false
+ReflowComments: false
+AlignAfterOpenBracket: Align # If true, horizontally aligns arguments after an open bracket.
+AlignConsecutiveAssignments: true #  This will align the assignment operators of consecutive lines
+AlignConsecutiveDeclarations: true # This will align the declaration names of consecutive lines
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+#AlwaysBreakAfterReturnType: TopLevel
+AlwaysBreakTemplateDeclarations: true #  If true, always break after the template<...> of a template declaration
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakConstructorInitializersBeforeComma: true # Always break constructor initializers before commas and align the commas with the colon.
+ExperimentalAutoDetectBinPacking: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 4
+PenaltyBreakBeforeFirstCallParameter: 200
+PenaltyExcessCharacter: 10
+PointerAlignment: Middle
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9b5047dff..9025edaa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,9 @@
-.pioenvs
-.piolibdeps
+.pio*
 .clang_complete
 .gcc-flags.json
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*.db
-.vscode/.browse.c_cpp.db*
+.vscode
+.env
 platformio.ini
 lib/readme.txt
-.vscode/settings.json
-.vscode/extensions.json
-.vscode/BROWSE.VC.DB-wal
-.vscode/BROWSE.VC.DB-shm
-lib/readme.txt
-extra_script.py
 .travis.yml
-.clang-format
+*.py
\ No newline at end of file