From 1d8b2484daaa37c4daa55bbdadd361e9a65d9c3a Mon Sep 17 00:00:00 2001
From: JonasS <jonass@dev.jsje.de>
Date: Sun, 19 Nov 2017 09:36:16 +0100
Subject: [PATCH 1/2] Added coding style configuration - .editorconfig for
 cross-editor support   - 4 spaces instead of tabs   - LF eol   - final new
 line   - continuation indent 8   - no trailing whitespace - formatted
 existing code accordingly - changed gitignore to allow project-specific IDEA
 code style settings - added .gitattributes to ensure LF checkout even on
 Windows (a fresh checkout might be required)

---
 .editorconfig                | 14 ++++++++++
 .gitattributes               |  1 +
 .gitignore                   | 28 +++++---------------
 .idea/codeStyleSettings.xml  | 50 ++++++++++++++++++++++++++++++++++++
 cmake/Platform/Arduino.cmake | 42 +++++++++++++++---------------
 5 files changed, 92 insertions(+), 43 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .gitattributes
 create mode 100644 .idea/codeStyleSettings.xml

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..3e8ea6b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+
+end_of_line = lf
+insert_final_newline = true
+
+indent_style = space
+indent_size = 4
+# Editor support is limited. Make your you align multiline statements accordingly, should your editor not honour this attribute
+continuation_indent_size = 8
+
+trim_trailing_whitespace = true
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..fcadb2c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/.gitignore b/.gitignore
index 8141a78..e0ec4a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,27 +82,9 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
+### JetBrains (modified)
+.idea/**
+!.idea/codeStyleSettings.xml
 
 # CMake
 cmake-build-debug/
@@ -132,3 +114,7 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+# Ignore stuff generated by the example
+build/
+cmake-build-debug/
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..b599eb5
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="RIGHT_MARGIN" value="160" />
+        <Objective-C>
+          <option name="FUNCTION_BRACE_PLACEMENT" value="2" />
+          <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" />
+          <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" />
+          <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" />
+          <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" />
+        </Objective-C>
+        <Objective-C-extensions>
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="hpp" />
+            <pair source="c" header="h" />
+            <pair source="cpp" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+        <codeStyleSettings language="ObjectiveC">
+          <option name="BRACE_STYLE" value="2" />
+          <option name="CLASS_BRACE_STYLE" value="2" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/cmake/Platform/Arduino.cmake b/cmake/Platform/Arduino.cmake
index 25626e6..6840c12 100644
--- a/cmake/Platform/Arduino.cmake
+++ b/cmake/Platform/Arduino.cmake
@@ -1169,8 +1169,8 @@ set(SD_RECURSE True)
 
 function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLAGS)
 
-    set(ARDUINO_CMAKE_RECURSION_DEFAULT FALSE CACHE BOOL 
-"The default recursion behavior during library setup")
+    set(ARDUINO_CMAKE_RECURSION_DEFAULT FALSE CACHE BOOL
+            "The default recursion behavior during library setup")
 
     string(REGEX REPLACE "/src/?$" "" LIB_PATH_STRIPPED ${LIB_PATH})
     get_filename_component(LIB_NAME ${LIB_PATH_STRIPPED} NAME)
@@ -1214,7 +1214,7 @@ function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLA
                 list(REMOVE_ITEM LIB_TARGETS ${TARGET_LIB_NAME})
             endif ()
             target_link_libraries(${TARGET_LIB_NAME} ${BOARD_ID}_CORE ${LIB_TARGETS})
-            
+
             list(APPEND LIB_TARGETS ${TARGET_LIB_NAME})
 
         endif ()
@@ -2091,31 +2091,29 @@ function(find_arduino_libraries VAR_NAME SRCS ARDLIBS)
     if (ARDUINO_LIBS)
         list(REMOVE_DUPLICATES ARDUINO_LIBS)
     endif ()
-    
+
     remove_blacklisted_arduino_libs(ARDUINO_LIBS)
-    
+
     set(${VAR_NAME} ${ARDUINO_LIBS} PARENT_SCOPE)
 endfunction()
 
-function(remove_blacklisted_arduino_libs
-   arduino_libs_var_
-)
-   set(ARDUINO_CMAKE_BLACKLISTED_ARDUINO_LIBS "" CACHE STRING
-"A list of absolute paths to Arduino libraries that are meant to be ignored \
+function(remove_blacklisted_arduino_libs arduino_libs_var_)
+    set(ARDUINO_CMAKE_BLACKLISTED_ARDUINO_LIBS "" CACHE STRING
+            "A list of absolute paths to Arduino libraries that are meant to be ignored \
 during library search")
 
-   set(old_libs "${${arduino_libs_var_}}")
-   set(new_libs)
-   foreach(lib ${old_libs})
-      list (FIND ARDUINO_CMAKE_BLACKLISTED_ARDUINO_LIBS "${lib}" _index)
-      if(NOT ${_index} GREATER -1)
-         list(APPEND new_libs "${lib}")
-      else()
-         ARDUINO_DEBUG_MSG("Suppressing blacklisted library ${lib}")
-      endif()
-   endforeach()
-
-   set("${arduino_libs_var_}" "${new_libs}" PARENT_SCOPE)
+    set(old_libs "${${arduino_libs_var_}}")
+    set(new_libs)
+    foreach (lib ${old_libs})
+        list(FIND ARDUINO_CMAKE_BLACKLISTED_ARDUINO_LIBS "${lib}" _index)
+        if (NOT ${_index} GREATER -1)
+            list(APPEND new_libs "${lib}")
+        else ()
+            ARDUINO_DEBUG_MSG("Suppressing blacklisted library ${lib}")
+        endif ()
+    endforeach ()
+
+    set("${arduino_libs_var_}" "${new_libs}" PARENT_SCOPE)
 endfunction()
 #=============================================================================#
 # find_sources

From 73dada2875e5de2edab6d2d3b88b863850af0f1c Mon Sep 17 00:00:00 2001
From: JonasS <jonass@dev.jsje.de>
Date: Fri, 1 Dec 2017 22:56:04 +0100
Subject: [PATCH 2/2] Fixed errornous gitignore; added new IDEA code style
 format

---
 .gitignore                           |  7 ++---
 .idea/codeStyles/Project.xml         | 44 ++++++++++++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml |  5 ++++
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.gitignore b/.gitignore
index e0ec4a1..c8dfe5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,8 +83,9 @@ Mkfile.old
 dkms.conf
 
 ### JetBrains (modified)
-.idea/**
+.idea/*
 !.idea/codeStyleSettings.xml
+!.idea/codeStyles/
 
 # CMake
 cmake-build-debug/
@@ -114,7 +115,3 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
-
-# Ignore stuff generated by the example
-build/
-cmake-build-debug/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..0dc3aa5
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,44 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="160" />
+    <Objective-C>
+      <option name="FUNCTION_BRACE_PLACEMENT" value="2" />
+      <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" />
+      <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" />
+      <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" />
+      <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" />
+    </Objective-C>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="hpp" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <codeStyleSettings language="ObjectiveC">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="CLASS_BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file