Skip to content

Commit 39d7e88

Browse files
hpsaturnhpsaturn
authored
Merge pull request #199 from kike-canaries/devel
Devel
2 parents 681d542 + c2c0f4a commit 39d7e88

File tree

12 files changed

+1951
-1818
lines changed

12 files changed

+1951
-1818
lines changed

‎.clang-format‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: Google
4+
AccessModifierOffset: -1
5+
AlignAfterOpenBracket: Align
6+
AlignConsecutiveMacros: false
7+
AlignConsecutiveAssignments: false
8+
AlignConsecutiveBitFields: false
9+
AlignConsecutiveDeclarations: false
10+
AlignEscapedNewlines: Left
11+
AlignOperands: Align
12+
AlignTrailingComments: true
13+
AllowAllArgumentsOnNextLine: true
14+
AllowAllConstructorInitializersOnNextLine: true
15+
AllowAllParametersOfDeclarationOnNextLine: true
16+
AllowShortEnumsOnASingleLine: true
17+
AllowShortBlocksOnASingleLine: Never
18+
AllowShortCaseLabelsOnASingleLine: false
19+
AllowShortFunctionsOnASingleLine: All
20+
AllowShortLambdasOnASingleLine: All
21+
AllowShortIfStatementsOnASingleLine: WithoutElse
22+
AllowShortLoopsOnASingleLine: true
23+
AlwaysBreakAfterDefinitionReturnType: None
24+
AlwaysBreakAfterReturnType: None
25+
AlwaysBreakBeforeMultilineStrings: true
26+
AlwaysBreakTemplateDeclarations: Yes
27+
BinPackArguments: true
28+
BinPackParameters: true
29+
BraceWrapping:
30+
AfterCaseLabel: false
31+
AfterClass: false
32+
AfterControlStatement: Never
33+
AfterEnum: false
34+
AfterFunction: false
35+
AfterNamespace: false
36+
AfterObjCDeclaration: false
37+
AfterStruct: false
38+
AfterUnion: false
39+
AfterExternBlock: false
40+
BeforeCatch: false
41+
BeforeElse: false
42+
BeforeLambdaBody: false
43+
BeforeWhile: false
44+
IndentBraces: false
45+
SplitEmptyFunction: true
46+
SplitEmptyRecord: true
47+
SplitEmptyNamespace: true
48+
BreakBeforeBinaryOperators: None
49+
BreakBeforeBraces: Attach
50+
BreakBeforeInheritanceComma: false
51+
BreakInheritanceList: BeforeColon
52+
BreakBeforeTernaryOperators: true
53+
BreakConstructorInitializersBeforeComma: false
54+
BreakConstructorInitializers: BeforeColon
55+
BreakAfterJavaFieldAnnotations: false
56+
BreakStringLiterals: true
57+
ColumnLimit: 100
58+
CommentPragmas: '^ IWYU pragma:'
59+
CompactNamespaces: false
60+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
61+
ConstructorInitializerIndentWidth: 4
62+
ContinuationIndentWidth: 4
63+
Cpp11BracedListStyle: true
64+
DeriveLineEnding: true
65+
DerivePointerAlignment: true
66+
DisableFormat: false
67+
ExperimentalAutoDetectBinPacking: false
68+
FixNamespaceComments: true
69+
ForEachMacros:
70+
- foreach
71+
- Q_FOREACH
72+
- BOOST_FOREACH
73+
IncludeBlocks: Regroup
74+
IncludeCategories:
75+
- Regex: '^<ext/.*\.h>'
76+
Priority: 2
77+
SortPriority: 0
78+
- Regex: '^<.*\.h>'
79+
Priority: 1
80+
SortPriority: 0
81+
- Regex: '^<.*'
82+
Priority: 2
83+
SortPriority: 0
84+
- Regex: '.*'
85+
Priority: 3
86+
SortPriority: 0
87+
IncludeIsMainRegex: '([-_](test|unittest))?$'
88+
IncludeIsMainSourceRegex: ''
89+
IndentCaseLabels: true
90+
IndentCaseBlocks: false
91+
IndentGotoLabels: true
92+
IndentPPDirectives: None
93+
IndentExternBlock: AfterExternBlock
94+
IndentWidth: 2
95+
IndentWrappedFunctionNames: false
96+
InsertTrailingCommas: None
97+
JavaScriptQuotes: Leave
98+
JavaScriptWrapImports: true
99+
KeepEmptyLinesAtTheStartOfBlocks: false
100+
MacroBlockBegin: ''
101+
MacroBlockEnd: ''
102+
MaxEmptyLinesToKeep: 1
103+
NamespaceIndentation: None
104+
ObjCBinPackProtocolList: Never
105+
ObjCBlockIndentWidth: 2
106+
ObjCBreakBeforeNestedBlockParam: true
107+
ObjCSpaceAfterProperty: false
108+
ObjCSpaceBeforeProtocolList: true
109+
PenaltyBreakAssignment: 2
110+
PenaltyBreakBeforeFirstCallParameter: 1
111+
PenaltyBreakComment: 300
112+
PenaltyBreakFirstLessLess: 120
113+
PenaltyBreakString: 1000
114+
PenaltyBreakTemplateDeclaration: 10
115+
PenaltyExcessCharacter: 1000000
116+
PenaltyReturnTypeOnItsOwnLine: 200
117+
PointerAlignment: Left
118+
RawStringFormats:
119+
- Language: Cpp
120+
Delimiters:
121+
- cc
122+
- CC
123+
- cpp
124+
- Cpp
125+
- CPP
126+
- 'c++'
127+
- 'C++'
128+
CanonicalDelimiter: ''
129+
BasedOnStyle: google
130+
- Language: TextProto
131+
Delimiters:
132+
- pb
133+
- PB
134+
- proto
135+
- PROTO
136+
EnclosingFunctions:
137+
- EqualsProto
138+
- EquivToProto
139+
- PARSE_PARTIAL_TEXT_PROTO
140+
- PARSE_TEST_PROTO
141+
- PARSE_TEXT_PROTO
142+
- ParseTextOrDie
143+
- ParseTextProtoOrDie
144+
- ParseTestProto
145+
- ParsePartialTestProto
146+
CanonicalDelimiter: ''
147+
BasedOnStyle: google
148+
ReflowComments: true
149+
SortIncludes: true
150+
SortUsingDeclarations: true
151+
SpaceAfterCStyleCast: false
152+
SpaceAfterLogicalNot: false
153+
SpaceAfterTemplateKeyword: true
154+
SpaceBeforeAssignmentOperators: true
155+
SpaceBeforeCpp11BracedList: false
156+
SpaceBeforeCtorInitializerColon: true
157+
SpaceBeforeInheritanceColon: true
158+
SpaceBeforeParens: ControlStatements
159+
SpaceBeforeRangeBasedForLoopColon: true
160+
SpaceInEmptyBlock: false
161+
SpaceInEmptyParentheses: false
162+
SpacesBeforeTrailingComments: 2
163+
SpacesInAngles: false
164+
SpacesInConditionalStatement: false
165+
SpacesInContainerLiterals: true
166+
SpacesInCStyleCastParentheses: false
167+
SpacesInParentheses: false
168+
SpacesInSquareBrackets: false
169+
SpaceBeforeSquareBrackets: false
170+
Standard: Auto
171+
StatementMacros:
172+
- Q_UNUSED
173+
- QT_REQUIRE_VERSION
174+
TabWidth: 8
175+
UseCRLF: false
176+
UseTab: Never
177+
WhitespaceSensitiveMacros:
178+
- STRINGIZE
179+
- PP_STRINGIZE
180+
- BOOST_PP_STRINGIZE
181+
...
182+

‎.github/workflows/clang_format.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: clang-format Check
2+
on: [pull_request]
3+
jobs:
4+
formatting-check:
5+
name: Formatting Check
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v3
9+
- name: Run clang-format style check for C/C++/Protobuf programs.
10+
uses: jidicula/clang-format-action@v4.11.0
11+
with:
12+
clang-format-version: '11'
13+
check-path: 'src'
14+
fallback-style: 'Google' # optional

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ Also you can make a donation, be a patreon or buy a device:
374374
# Projects using this Library
375375

376376
- [CanAirIO Device](https://github.com/kike-canaries/canairio_firmware): ESP32 Air quality device for mobile and fixed stations. (PM2.5 and CO2)
377-
- [Medidor de CO2](https://emariete.com/medidor-co2-display-tft-color-ttgo-t-display-sensirion-scd30): Un medidor de CO2 de alta calidad con pantalla en color. (CO2)
377+
- [CO2 Gadget](https://emariete.com/medidor-co2-display-tft-color-ttgo-t-display-sensirion-scd30): Un medidor de CO2 de alta calidad con pantalla en color. (CO2)
378378
- [M5CoreInk Multi Sensor](https://github.com/hpsaturn/co2_m5coreink#readme): Wall CO2, T, H, P, Alt, sensor with low consumption (30 days)
379379

380380
# Credits

‎library.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CanAirIO Air Quality Sensors Library",
3-
"version": "0.7.3",
3+
"version": "0.7.4",
44
"homepage":"https://canair.io",
55
"keywords":
66
[

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=CanAirIO Air Quality Sensors Library
2-
version=0.7.3
2+
version=0.7.4
33
author=@hpsaturn, CanAirIO project <info@canair.io>
44
maintainer=Antonio Vanegas <hpsaturn@gmail.com>
55
url=https://github.com/kike-canaries/canairio_sensorlib

0 commit comments

Comments
 (0)