Squashed commit of the following:

commit f134316 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 22:09:41 2023 +0200 Fix code-doc commit 49311c1 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 22:02:56 2023 +0200 Fix doc commit b19da7d Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 21:54:34 2023 +0200 Doc sortie relais commit 24617b3 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 21:53:00 2023 +0200 Squashed commit of the following: commit dc1a24b Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 20:15:49 2023 +0200 Fix formating commit e356441 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 20:13:10 2023 +0200 Fix first dataset commit 9d2b4e1 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 15:38:48 2023 +0200 Fix commit 95e6994 Author: Frédéric Metrich <[email protected]> Date: Sat May 27 10:34:02 2023 +0200 Fix template commit 0acaabf Author: Frédéric Metrich <[email protected]> Date: Sat May 27 00:06:49 2023 +0200 Add relay cfg during startup commit 368df2c Merge: 7cc4966 70955f4 Author: Frédéric Metrich <[email protected]> Date: Sun May 14 13:44:05 2023 +0200 Merge branch 'f_relay' of https://github.com/FredM67/PVRouter-3-phase into f_relay commit 7cc4966 Author: Frédéric Metrich <[email protected]> Date: Sun May 14 13:41:17 2023 +0200 Fix formating commit 70955f4 Author: Frédéric Metrich <[email protected]> Date: Sun May 14 00:41:36 2023 +0200 Fix formatter and clang config commit a2ce569 Author: Frédéric Metrich <[email protected]> Date: Sat May 13 23:45:59 2023 +0200 Add clang script commit 50e2413 Author: Frédéric Metrich <[email protected]> Date: Sat May 13 23:05:49 2023 +0200 Fix clang format commit 5deae48 Author: Frédéric Metrich <[email protected]> Date: Sat May 13 22:59:11 2023 +0200 Fix links commit 30c27af Author: Frédéric Metrich <[email protected]> Date: Sat May 13 22:51:07 2023 +0200 Fix link commit 366a8d0 Author: Frédéric Metrich <[email protected]> Date: Sat May 13 19:49:30 2023 +0200 Some cleanup commit a084117 Merge: 43c3e10 995b88b Author: Frédéric Metrich <[email protected]> Date: Sat May 13 19:06:55 2023 +0200 Merge branch 'f_relay' of https://github.com/FredM67/PVRouter-3-phase into f_relay commit 43c3e10 Author: Frédéric Metrich <[email protected]> Date: Sat May 13 19:06:51 2023 +0200 Add serial output for sliding average commit 995b88b Author: Frédéric Metrich <[email protected]> Date: Sat May 13 19:05:19 2023 +0200 Reformating commit ca16002 Author: Frédéric Metrich <[email protected]> Date: Sun May 7 19:50:25 2023 +0200 Set limit to duration commit 515cab7 Author: Frédéric Metrich <[email protected]> Date: Fri May 5 22:50:10 2023 +0200 Set some members const commit 9854dd0 Author: Frédéric Metrich <[email protected]> Date: Fri May 5 22:38:58 2023 +0200 More code for relay diversion commit 09a8647 Author: Frédéric Metrich <[email protected]> Date: Tue May 2 22:02:58 2023 +0200 Next step commit 405e9c3 Author: Frédéric Metrich <[email protected]> Date: Mon May 1 20:14:44 2023 +0200 More reorganization commit 52f7f98 Author: Frédéric Metrich <[email protected]> Date: Mon May 1 20:08:03 2023 +0200 Reorganize includes commit 5975daf Author: Frédéric Metrich <[email protected]> Date: Mon May 1 18:10:17 2023 +0200 Add class for relay diversion commit 9dcb9cf Author: Frédéric Metrich <[email protected]> Date: Mon May 1 12:38:47 2023 +0200 Add relay config class commit 37caf6d Merge: 4c69aa2 b7cf3ee Author: Frédéric Metrich <[email protected]> Date: Mon May 1 11:32:26 2023 +0200 Merge branch 'main' into f_relay commit 4c69aa2 Author: Frédéric Metrich <[email protected]> Date: Fri Apr 28 21:35:00 2023 +0200 get average as same type than elements commit 44ac7ca Author: Frédéric Metrich <[email protected]> Date: Fri Apr 28 20:56:35 2023 +0200 Some tuning commit 1f6fb0c Author: Frédéric Metrich <[email protected]> Date: Sat Apr 8 18:09:33 2023 +0200 Sliding avg class added commit 9469dd3 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 14 21:35:25 2023 +0200 Fix eoc commit b0a0b92 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 7 16:30:54 2023 +0200 Remove unused vars commit ad0f5a0 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 7 16:23:59 2023 +0200 Fix typo commit 2643656 Author: Frédéric Metrich <[email protected]> Date: Wed Jun 7 15:45:33 2023 +0200 Tiny fix commit a17e5fa Author: Frédéric Metrich <[email protected]> Date: Tue Jun 6 22:19:43 2023 +0200 Fix test prog commit 6e92f3a Author: Frédéric Metrich <[email protected]> Date: Fri Jun 2 22:01:21 2023 +0200 Init change commit c9d33a4 Author: Frédéric Metrich <[email protected]> Date: Thu May 25 21:27:29 2023 +0200 Fix script commit 14627c1 Author: Frédéric Metrich <[email protected]> Date: Thu May 25 21:21:44 2023 +0200 Fix format
FredM67 · Jun 18, 2023 · da0b31b · da0b31b
1 parent ef23912
commit da0b31b
Show file tree

Hide file tree

Showing 50 changed files with 2,137 additions and 599 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,8 +1,190 @@
-# Format Style Options - Created with Clang Power Tools
+# Source: https://github.com/arduino/tooling-project-assets/tree/main/other/clang-format-configuration
 ---
-BasedOnStyle: Microsoft
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-NamespaceIndentation: All
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: None
+AlignEscapedNewlines: DontAlign
+AlignOperands: Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+AttributeMacros:
+  - __capability
+BasedOnStyle: LLVM
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: true
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAfterJavaFieldAnnotations: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Allman
+BreakBeforeConceptDeclarations: false
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializersBeforeComma: false
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: false
 ColumnLimit: 0
+CommentPragmas: ''
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: false
+DeriveLineEnding: true
+DerivePointerAlignment: true
+DisableFormat: false
+EmptyLineAfterAccessModifier: Leave
+EmptyLineBeforeAccessModifier: Leave
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: '^(<|"(gtest|gmock|isl|json)/)'
+    Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: '.*'
+    Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: ''
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentRequires: true
 IndentWidth: 2
-...
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+Language: Cpp
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 100000
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PPIndentWidth: -1
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 1
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakFirstLessLess: 1
+PenaltyBreakOpenParenthesis: 1
+PenaltyBreakString: 1
+PenaltyBreakTemplateDeclaration: 1
+PenaltyExcessCharacter: 1
+PenaltyIndentedWhitespace: 1
+PenaltyReturnTypeOnItsOwnLine: 1
+PointerAlignment: Right
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments: false
+RemoveBracesLLVM: false
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 0
+SortIncludes: Never
+SortJavaStaticImport: Before
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros: true
+  AfterOverloadedOperator: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: true
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Minimum: 0
+  Maximum: -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Auto
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth: 2
+UseCRLF: false
+UseTab: Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
diff --git a/Mk2_3phase_RFdatalog_temp/.clang-format b/Mk2_3phase_RFdatalog_temp/.clang-format
@@ -1,7 +1,8 @@
-# Format Style Options - Created with Clang Power Tools
+# Source: https://github.com/arduino/tooling-project-assets/tree/main/other/clang-format-configuration
 ---
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
 AlignConsecutiveAssignments: None
 AlignConsecutiveBitFields: None
 AlignConsecutiveDeclarations: None
@@ -12,24 +13,24 @@ AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortLambdasOnASingleLine: Empty
 AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: No
-AttributeMacros: 
+AttributeMacros:
   - __capability
 BasedOnStyle: LLVM
 BinPackArguments: true
 BinPackParameters: true
 BitFieldColonSpacing: Both
-BraceWrapping: 
+BraceWrapping:
   AfterCaseLabel: false
   AfterClass: false
   AfterControlStatement: true
@@ -42,39 +43,44 @@ BraceWrapping:
   AfterExternBlock: false
   BeforeCatch: false
   BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
   IndentBraces: false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-  BeforeLambdaBody: false
-  BeforeWhile: false
+BreakAfterJavaFieldAnnotations: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Allman
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
 BreakBeforeConceptDeclarations: false
+BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
+BreakConstructorInitializersBeforeComma: false
+BreakInheritanceList: BeforeColon
 BreakStringLiterals: false
 ColumnLimit: 0
 CommentPragmas: ''
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth : 2
+ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
 Cpp11BracedListStyle: false
 DeriveLineEnding: true
 DerivePointerAlignment: true
+DisableFormat: false
+EmptyLineAfterAccessModifier: Leave
 EmptyLineBeforeAccessModifier: Leave
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: false
-ForEachMacros: 
+ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
 IncludeBlocks: Preserve
-IncludeCategories: 
+IncludeCategories:
   - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
     Priority: 2
     SortPriority: 0
@@ -89,6 +95,7 @@ IncludeCategories:
     CaseSensitive: false
 IncludeIsMainRegex: ''
 IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
 IndentCaseBlocks: true
 IndentCaseLabels: true
 IndentExternBlock: Indent
@@ -101,6 +108,7 @@ InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
 Language: Cpp
 MacroBlockBegin: ''
 MacroBlockEnd: ''
@@ -111,18 +119,26 @@ ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PPIndentWidth: -1
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 1
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 1
 PenaltyBreakFirstLessLess: 1
+PenaltyBreakOpenParenthesis: 1
 PenaltyBreakString: 1
 PenaltyBreakTemplateDeclaration: 1
 PenaltyExcessCharacter: 1
 PenaltyIndentedWhitespace: 1
 PenaltyReturnTypeOnItsOwnLine: 1
 PointerAlignment: Right
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
 ReflowComments: false
-SortIncludes: true
+RemoveBracesLLVM: false
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 0
+SortIncludes: Never
 SortJavaStaticImport: Before
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: false
@@ -135,30 +151,40 @@ SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros: true
+  AfterOverloadedOperator: false
+  BeforeNonEmptyParentheses: false
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
 SpacesInAngles: true
-SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInLineCommentPrefix:
+  Minimum: 0
+  Maximum: -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Auto
-StatementAttributeLikeMacros: 
+StatementAttributeLikeMacros:
   - Q_EMIT
-StatementMacros: 
+StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth: 2
 UseCRLF: false
 UseTab: Never
-WhitespaceSensitiveMacros: 
+WhitespaceSensitiveMacros:
   - STRINGIZE
   - PP_STRINGIZE
   - BOOST_PP_STRINGIZE
   - NS_SWIFT_NAME
   - CF_SWIFT_NAME
-...
diff --git a/Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino b/Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino
@@ -136,11 +136,16 @@
  * - project can now be used with both Arduino IDE and PlatformIO (Visual Studio Code).
  * - a couple of pre-defined PlatformIO configs added
  *  
+ * __June 2023: changes:__
+ * - heavy refactoring (again)
+ * - stl add-ons
+ * - add relay-output feature
+ *  
  * @author Fred Metrich
  * @copyright Copyright (c) 2023
  *
  */
 static_assert(__cplusplus >= 201703L, "**** Please define 'gnu++17' in 'platform.txt' ! ****");
-static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/Laclare/Mk2_3phase_RFdatalog_temp/Readme.md");
+static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/Mk2_3phase_RFdatalog_temp/Readme.md");
 
 // The active code can be found in the other cpp/h files