File tree 3 files changed +6
-7
lines changed
3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
Language : Cpp
3
3
BasedOnStyle : Google
4
- AccessModifierOffset : -1
4
+ AccessModifierOffset : -4
5
5
AlignAfterOpenBracket : Align
6
6
AlignConsecutiveMacros : true
7
7
AlignConsecutiveAssignments : true
@@ -29,7 +29,7 @@ BraceWrapping:
29
29
AfterClass : false
30
30
AfterControlStatement : false
31
31
AfterEnum : false
32
- AfterFunction : false
32
+ AfterFunction : true
33
33
AfterNamespace : false
34
34
AfterObjCDeclaration : false
35
35
AfterStruct : false
@@ -42,15 +42,15 @@ BraceWrapping:
42
42
SplitEmptyRecord : true
43
43
SplitEmptyNamespace : true
44
44
BreakBeforeBinaryOperators : None
45
- BreakBeforeBraces : Attach
45
+ BreakBeforeBraces : Custom
46
46
BreakBeforeInheritanceComma : false
47
47
BreakInheritanceList : BeforeColon
48
48
BreakBeforeTernaryOperators : true
49
49
BreakConstructorInitializersBeforeComma : false
50
50
BreakConstructorInitializers : BeforeColon
51
51
BreakAfterJavaFieldAnnotations : false
52
52
BreakStringLiterals : true
53
- ColumnLimit : 80
53
+ ColumnLimit : 120
54
54
CommentPragmas : ' ^ IWYU pragma:'
55
55
CompactNamespaces : false
56
56
ConstructorInitializerAllOnOneLineOrOnePerLine : true
@@ -165,4 +165,3 @@ TabWidth: 4
165
165
UseCRLF : false
166
166
UseTab : Never
167
167
...
168
-
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ Additional optional include files:
35
35
36
36
* ** [ Buy Basic] ( https://shop.m5stack.com/products/esp32-basic-core-iot-development-kit-v2-7 ) **
37
37
38
- * [ Comparison of M5Stack controllers] ( https://docs.m5stack.com/en/products_selector ) *
38
+ * [ Comparison of M5Stack controllers] ( https://docs.m5stack.com/en/products_selector/m5core_compare ) *
39
39
40
40
### M-BUS
41
41
<img src =" docs/M-BUS.jpg " width =" 300 " />
Original file line number Diff line number Diff line change 12
12
13
13
* ** 如果想要购买 Basic 的话,[ 点击这里] ( https://item.taobao.com/item.htm?spm=a1z10.5-c-s.w4002-22404213529.11.6b2349d8feN5U0&id=610634829528 ) **
14
14
15
- * 我们有几款不同配置的主控 M5Cores,这是他们之间的[ 对比] ( https://docs.m5stack.com/zh_CN/products_selector ) .*
15
+ * 我们有几款不同配置的主控 M5Cores,这是他们之间的[ 对比] ( https://docs.m5stack.com/zh_CN/products_selector/m5core_compare ) .*
16
16
17
17
18
18
### M-BUS
You can’t perform that action at this time.
0 commit comments