Skip to content

Commit 2f7d75e

Browse files
committed
Minor release of foxBMS 2 (v1.3.0)
* Added master and slave hardware documentation * Added CRC checks in the FRAM driver * Enhanced insulation monitoring driver * Added Bender IR155 driver For a detailed list of changes, please refer to the documentation at https://iisb-foxbms.iisb.fraunhofer.de/foxbms/gen2/docs/html/v1.3.0/general/changelog.html.
1 parent ee57761 commit 2f7d75e

File tree

1,155 files changed

+18887
-9020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,155 files changed

+18887
-9020
lines changed

.clang-format

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
Language: Cpp
22
AccessModifierOffset: -2
33
AlignAfterOpenBracket: AlwaysBreak
4+
AlignArrayOfStructures: None # clang-bug
5+
AlignConsecutiveMacros: Consecutive
46
AlignConsecutiveAssignments: true
7+
AlignConsecutiveBitFields: None # TODO: !573
58
AlignConsecutiveDeclarations: false
6-
AlignConsecutiveMacros: true
79
AlignEscapedNewlines: Left
8-
AlignOperands: true
10+
AlignOperands: Align
911
AlignTrailingComments: true
1012
AllowAllArgumentsOnNextLine: true
1113
AllowAllConstructorInitializersOnNextLine: true
@@ -20,12 +22,13 @@ AlwaysBreakAfterDefinitionReturnType: None
2022
AlwaysBreakAfterReturnType: None
2123
AlwaysBreakBeforeMultilineStrings: false
2224
AlwaysBreakTemplateDeclarations: MultiLine
25+
AttributeMacros: []
2326
BinPackArguments: false
2427
BinPackParameters: false
2528
BraceWrapping:
2629
AfterCaseLabel: false
2730
AfterClass: false
28-
AfterControlStatement: false
31+
AfterControlStatement: Never
2932
AfterEnum: false
3033
AfterFunction: false
3134
AfterNamespace: false
@@ -35,11 +38,14 @@ BraceWrapping:
3538
AfterExternBlock: false
3639
BeforeCatch: false
3740
BeforeElse: false
41+
BeforeLambdaBody: false
42+
BeforeWhile: false
3843
IndentBraces: false
3944
SplitEmptyFunction: true
4045
SplitEmptyRecord: true
4146
SplitEmptyNamespace: true
4247
BreakBeforeBinaryOperators: None
48+
BreakBeforeConceptDeclarations: true
4349
BreakBeforeBraces: Attach
4450
BreakBeforeInheritanceComma: false
4551
BreakInheritanceList: BeforeColon
@@ -58,12 +64,12 @@ Cpp11BracedListStyle: true
5864
DeriveLineEnding: true
5965
DerivePointerAlignment: false
6066
DisableFormat: false
67+
EmptyLineAfterAccessModifier: Never
68+
EmptyLineBeforeAccessModifier: LogicalBlock
6169
ExperimentalAutoDetectBinPacking: false
6270
FixNamespaceComments: true
63-
ForEachMacros:
64-
- foreach
65-
- Q_FOREACH
66-
- BOOST_FOREACH
71+
ForEachMacros: []
72+
IfMacros: []
6773
IncludeBlocks: Regroup
6874
IncludeCategories:
6975
- Regex: '^"(general\.h)"$'
@@ -98,20 +104,27 @@ IncludeCategories:
98104
SortPriority: 20
99105
IncludeIsMainRegex: "(_cfg)?$"
100106
IncludeIsMainSourceRegex: ""
107+
IndentAccessModifiers: false
101108
IndentCaseLabels: true
109+
IndentCaseBlocks: false
102110
IndentGotoLabels: true
103111
IndentPPDirectives: None
112+
IndentExternBlock: AfterExternBlock
113+
IndentRequires: false
104114
IndentWidth: 4
105115
IndentWrappedFunctionNames: true
116+
InsertTrailingCommas: None
106117
JavaScriptQuotes: Leave
107118
JavaScriptWrapImports: true
108119
KeepEmptyLinesAtTheStartOfBlocks: false
120+
LambdaBodyIndentation: Signature
109121
MacroBlockBegin: ""
110122
MacroBlockEnd: ""
111123
MaxEmptyLinesToKeep: 1
112124
NamespaceIndentation: None
113125
ObjCBinPackProtocolList: Auto
114126
ObjCBlockIndentWidth: 2
127+
ObjCBreakBeforeNestedBlockParam: true
115128
ObjCSpaceAfterProperty: false
116129
ObjCSpaceBeforeProtocolList: true
117130
PenaltyBreakAssignment: 20
@@ -122,33 +135,44 @@ PenaltyBreakString: 1000
122135
PenaltyBreakTemplateDeclaration: 10
123136
PenaltyExcessCharacter: 1000000
124137
PenaltyReturnTypeOnItsOwnLine: 100000
138+
PenaltyIndentedWhitespace: 0
125139
PointerAlignment: Right
140+
PPIndentWidth: -1
141+
ReferenceAlignment: Pointer
126142
ReflowComments: false
127-
SortIncludes: true
143+
ShortNamespaceLines: 1
144+
SortIncludes: CaseSensitive
145+
SortJavaStaticImport: Before
128146
SortUsingDeclarations: true
129147
SpaceAfterCStyleCast: false
130148
SpaceAfterLogicalNot: false
131149
SpaceAfterTemplateKeyword: true
132150
SpaceBeforeAssignmentOperators: true
151+
SpaceBeforeCaseColon: false
133152
SpaceBeforeCpp11BracedList: false
134153
SpaceBeforeCtorInitializerColon: true
135154
SpaceBeforeInheritanceColon: true
136155
SpaceBeforeParens: ControlStatements
156+
SpaceAroundPointerQualifiers: Default
137157
SpaceBeforeRangeBasedForLoopColon: true
138158
SpaceInEmptyBlock: false
139159
SpaceInEmptyParentheses: false
140160
SpacesBeforeTrailingComments: 2
141-
SpacesInAngles: false
161+
SpacesInAngles: Never
142162
SpacesInConditionalStatement: false
143163
SpacesInContainerLiterals: true
144164
SpacesInCStyleCastParentheses: false
165+
SpacesInLineCommentPrefix:
166+
Minimum: 1
167+
Maximum: -1
145168
SpacesInParentheses: false
146169
SpacesInSquareBrackets: false
147170
SpaceBeforeSquareBrackets: false
171+
BitFieldColonSpacing: Both
148172
Standard: Latest
149-
StatementMacros:
150-
- Q_UNUSED
151-
- QT_REQUIRE_VERSION
173+
StatementAttributeLikeMacros: []
174+
StatementMacros: []
152175
TabWidth: 4
153176
UseCRLF: true
154177
UseTab: Never
178+
WhitespaceSensitiveMacros: []

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,7 @@ __pycache__
4747
*.~$*
4848

4949
**/foxbms-2_axivion_report.json
50+
51+
*.exe
52+
53+
/races.txt

BSD-3-Clause.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License (BSD 3-Clause "New" or "Revised" License)
22

3-
Copyright (c) 2010 - 2021, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V.
3+
Copyright (c) 2010 - 2022, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V.
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

CITATION.cff

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@ authors:
3737
- family-names: "Bockrath"
3838
given-names: "Steffen"
3939
orcid: "https://orcid.org/0000-0003-4452-532X"
40+
- family-names: "Seebeck"
41+
given-names: "Rolf"
42+
orcid: "https://orcid.org/0000-0002-5981-8128"
4043
cff-version: "1.1.0"
4144
doi: "10.5281/zenodo.4727562"
4245
keywords:
4346
- "BMS"
4447
message: "If the foxBMS project contributes to a project that leads to a scientific publication, please acknowledge this fact by citing."
4548
title: "foxBMS - The Most Advanced Open Source BMS Platform: foxBMS 2"
46-
version: "1.2.1"
47-
date-released: 2021-12-08
49+
version: "1.3.0"
50+
date-released: 2022-05-30
Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
2+
"$id": "/properties/application",
3+
"title": "Configuration of the application",
4+
"required": [
5+
"algorithm",
6+
"insulation-monitoring-device"
7+
],
8+
"additionalProperties": false,
9+
"properties": {
10+
"algorithm": {
11+
"$id": "/properties/application/algorithm",
12+
"title": "Configuration of the algorithm module",
13+
"required": [
14+
"state-estimation"
15+
],
16+
"properties": {
17+
"state-estimation": {
18+
"$id": "/properties/application/algorithm/state-estimation",
19+
"title": "State estimators (must correspond to the directory name)",
20+
"required": [
21+
"soc",
22+
"soe",
23+
"soh"
24+
],
25+
"properties": {
26+
"soc": {
27+
"$id": "/properties/application/algorithm/state-estimation/soc",
28+
"title": "State-of-Charge algorithm (must correspond to the directory name)",
29+
"type": "string",
30+
"enum": [
31+
"counting",
32+
"debug",
33+
"none"
34+
]
35+
},
36+
"soe": {
37+
"$id": "/properties/application/algorithm/state-estimation/soe",
38+
"title": "State-of-Energy algorithm (must correspond to the directory name)",
39+
"type": "string",
40+
"enum": [
41+
"counting",
42+
"debug",
43+
"none"
44+
]
45+
},
46+
"soh": {
47+
"$id": "/properties/application/algorithm/state-estimation/soh",
48+
"title": "State-of-Health algorithm (must correspond to the directory name)",
49+
"type": "string",
50+
"enum": [
51+
"debug",
52+
"none"
53+
]
54+
}
55+
}
56+
}
57+
}
58+
},
59+
"insulation-monitoring-device": {
60+
"$id": "/properties/application/insulation-monitoring-device",
61+
"title": "Configuration of the used insulation measurement device",
62+
"required": [
63+
"manufacturer",
64+
"model"
65+
],
66+
"additionalProperties": false,
67+
"properties": {
68+
"manufacturer": {
69+
"$id": "/properties/application/insulation-monitoring-device/manufacturer",
70+
"title": "Manufacturer of the insulation monitoring device (must correspond to the directory name)",
71+
"type": "string",
72+
"enum": [
73+
"none",
74+
"bender"
75+
]
76+
},
77+
"model": {
78+
"$id": "/properties/application/insulation-monitoring-device/model",
79+
"title": "Name of the insulation monitoring device (must correspond to the directory name)",
80+
"type": "string"
81+
}
82+
},
83+
"if": {
84+
"properties": {
85+
"manufacturer": {
86+
"enum": [
87+
"none"
88+
]
89+
}
90+
}
91+
},
92+
"then": {
93+
"properties": {
94+
"model": {
95+
"enum": [
96+
""
97+
]
98+
}
99+
}
100+
},
101+
"else": {
102+
"if": {
103+
"properties": {
104+
"manufacturer": {
105+
"enum": [
106+
"bender"
107+
]
108+
}
109+
}
110+
},
111+
"then": {
112+
"properties": {
113+
"model": {
114+
"enum": [
115+
"ir155",
116+
"iso165c"
117+
]
118+
}
119+
}
120+
}
121+
}
122+
}
123+
}
124+
}

0 commit comments

Comments
 (0)