diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 09:08:45 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 09:08:45 +0100 |
| commit | c083916f335a74b310243ea3c3ebabeac3959a9f (patch) | |
| tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c | |
| parent | 15484d0b34099b50c300b6f76e23f70f171bb409 (diff) | |
Revert "Add submodule again..."
This reverts commit 15484d0b34099b50c300b6f76e23f70f171bb409.
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .idea/codeStyles/Project.xml | 25 | ||||
| m--------- | lvgl | 0 |
3 files changed, 1 insertions, 27 deletions
diff --git a/.gitmodules b/.gitmodules index 65db97f9..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "lvgl"] - path = lvgl - url = https://github.com/joaquimorg/lvgl.git diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 60a86f76..7bdfbcb1 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -8,30 +8,10 @@ <option name="INDENT_DIRECTIVE_AS_CODE" value="true" /> <option name="SPACE_BEFORE_TEMPLATE_DECLARATION_LT" value="true" /> <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" /> - <!-- Disabled until clang-format can do it <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" /> --> + <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> - <rules> - <rule entity="NAMESPACE" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="MACRO" visibility="ANY" specifier="ANY" prefix="" style="SCREAMING_SNAKE_CASE" suffix="" /> - <rule entity="CLASS" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="STRUCT" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="ENUM" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="ENUMERATOR" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="TYPEDEF" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="UNION" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="CLASS_MEMBER_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="STRUCT_MEMBER_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="CLASS_MEMBER_FIELD" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="STRUCT_MEMBER_FIELD" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="GLOBAL_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="GLOBAL_VARIABLE" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="PARAMETER" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="LOCAL_VARIABLE" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - </rules> - </Objective-C-extensions> <codeStyleSettings language="ObjectiveC"> <option name="RIGHT_MARGIN" value="140" /> <option name="IF_BRACE_FORCE" value="3" /> @@ -47,8 +27,5 @@ <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" /> </indentOptions> </codeStyleSettings> - <clangFormatSettings> - <option name="ENABLED" value="true" /> - </clangFormatSettings> </code_scheme> </component>
\ No newline at end of file diff --git a/lvgl b/lvgl deleted file mode 160000 -Subproject 69a50b97dafffddd212e4b006776b473951be7a |