Update .clang-format

.clang-format

@@ -1,56 +1,59 @@
-AlignAfterOpenBracket: BlockIndent
-AlignConsecutiveMacros: false
-AlignEscapedNewlines: DontAlign
-AlignOperands: Align
-AlignTrailingComments: false
-AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Empty
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortEnumsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeInheritanceComma: false
-BreakConstructorInitializers: AfterColon
-BreakConstructorInitializersBeforeComma: false
-BreakInheritanceList: AfterColon
-BreakStringLiterals: false
-ColumnLimit: 100
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
-DeriveLineEnding: true
-FixNamespaceComments: false
-IncludeBlocks: Merge
-IndentCaseLabels: true
-IndentWidth: 4
-LambdaBodyIndentation: OuterScope
-Language: Cpp
-NamespaceIndentation: All
-PackConstructorInitializers: CurrentLine
-PointerAlignment: Right
-QualifierAlignment: Left
-ReferenceAlignment: Right
-ReflowComments: true
-SeparateDefinitionBlocks: Always
-SortIncludes: true
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex:           '"[[:alnum:]._-]+"'
-    Priority:        1
-    SortPriority:    1
-  - Regex:           '^((<|").*/)'
-    Priority:        2
-    SortPriority:    2
-  - Regex:           '<[[:alnum:]._-]+>'
-    Priority:        3
-    SortPriority:    3
-SortUsingDeclarations: false
-SpaceBeforeCtorInitializerColon: true
-SpacesInContainerLiterals: false
-TabWidth: 4
-UseTab: Never
+DisableFormat: false
+AlignAfterOpenBracket: BlockIndent
+AlignArrayOfStructures: Left
+AlignConsecutiveMacros: false
+AlignEscapedNewlines: DontAlign
+AlignOperands: Align
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeInheritanceComma: false
+BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializersBeforeComma: false
+BreakInheritanceList: AfterComma
+BreakStringLiterals: false
+ColumnLimit: 100
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DeriveLineEnding: true
+FixNamespaceComments: false
+IncludeBlocks: Merge
+IndentCaseLabels: true
+IndentWidth: 4
+LambdaBodyIndentation: OuterScope
+Language: Cpp
+NamespaceIndentation: All
+PackConstructorInitializers: CurrentLine
+PointerAlignment: Right
+QualifierAlignment: Custom
+QualifierOrder: ['inline', 'static', 'const', 'constexpr', 'restrict', 'volatile', 'type']
+ReferenceAlignment: Right
+ReflowComments: true
+SeparateDefinitionBlocks: Always
+SortIncludes: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '".*"'
+    Priority:        1
+    SortPriority:    1
+  - Regex:           '<.*>'
+    Priority:        2
+    SortPriority:    2
+SortUsingDeclarations: false
+SpaceBeforeCtorInitializerColon: true
+SpacesInContainerLiterals: false
+TabWidth: 4
+UseTab: Never

include/joybus.h

@@ -1,5 +1,5 @@
-#ifndef _JOYBUS_H
-#define _JOYBUS_H
+#ifndef _JOYBUS_JOYBUS_H
+#define _JOYBUS_JOYBUS_H
 
 #include "hardware/pio.h"
 #include "pico/stdlib.h"