Merge pull request #22 from bacnet-stack/feature/bacnet-basic-storage

Author: skarg

zephyr/.clang-format

@@ -1,76 +1,44 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: Apache-2.0
 #
-# clang-format configuration file. Intended for clang-format >= 4.
+# Note: The list of ForEachMacros can be obtained using:
 #
-# For more information, see:
-#
-#   Documentation/process/clang-format.rst
-#   https://clang.llvm.org/docs/ClangFormat.html
-#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#    git grep -h '^#define [^[:space:]]*FOR_EACH[^[:space:]]*(' include/ \
+#    | sed "s,^#define \([^[:space:]]*FOR_EACH[^[:space:]]*\)(.*$,  - '\1'," \
+#    | sort | uniq
 #
+# References:
+#   - https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+
 ---
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-#AlignEscapedNewlines: Left # Unknown to clang-format-4.0
-AlignOperands: true
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+BasedOnStyle: LLVM
+AlignConsecutiveMacros: AcrossComments
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: true
-  AfterObjCDeclaration: false
-  AfterStruct: false
-  AfterUnion: false
-  #AfterExternBlock: false # Unknown to clang-format-5.0
-  BeforeCatch: false
-  BeforeElse: false
-  IndentBraces: false
-  #SplitEmptyFunction: true # Unknown to clang-format-4.0
-  #SplitEmptyRecord: true # Unknown to clang-format-4.0
-  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: false
-ColumnLimit: 80
-CommentPragmas: '^ IWYU pragma:'
-#CompactNamespaces: false # Unknown to clang-format-4.0
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AttributeMacros:
+  - __aligned
+  - __deprecated
+  - __packed
+  - __printf_like
+  - __syscall
+  - __syscall_always_inline
+  - __subsystem
+BitFieldColonSpacing: After
+BreakBeforeBraces: Linux
+ColumnLimit: 100
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-#FixNamespaceComments: false # Unknown to clang-format-4.0
-
-# Taken from:
-#   git grep -h '^#define [^[:space:]]*FOR_EACH[^[:space:]]*(' include/ \
-#   | sed "s,^#define \([^[:space:]]*FOR_EACH[^[:space:]]*\)(.*$,  - '\1'," \
-#   | sort | uniq
 ForEachMacros:
+  - 'ARRAY_FOR_EACH'
+  - 'ARRAY_FOR_EACH_PTR'
   - 'FOR_EACH'
   - 'FOR_EACH_FIXED_ARG'
+  - 'FOR_EACH_IDX'
+  - 'FOR_EACH_IDX_FIXED_ARG'
+  - 'FOR_EACH_NONEMPTY_TERM'
   - 'RB_FOR_EACH'
   - 'RB_FOR_EACH_CONTAINER'
   - 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -85,61 +53,42 @@ ForEachMacros:
   - 'SYS_SLIST_FOR_EACH_CONTAINER_SAFE'
   - 'SYS_SLIST_FOR_EACH_NODE'
   - 'SYS_SLIST_FOR_EACH_NODE_SAFE'
+  - '_WAIT_Q_FOR_EACH'
+  - 'Z_FOR_EACH'
+  - 'Z_FOR_EACH_ENGINE'
+  - 'Z_FOR_EACH_EXEC'
+  - 'Z_FOR_EACH_FIXED_ARG'
+  - 'Z_FOR_EACH_FIXED_ARG_EXEC'
+  - 'Z_FOR_EACH_IDX'
+  - 'Z_FOR_EACH_IDX_EXEC'
+  - 'Z_FOR_EACH_IDX_FIXED_ARG'
+  - 'Z_FOR_EACH_IDX_FIXED_ARG_EXEC'
   - 'Z_GENLIST_FOR_EACH_CONTAINER'
   - 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
   - 'Z_GENLIST_FOR_EACH_NODE'
   - 'Z_GENLIST_FOR_EACH_NODE_SAFE'
-  - '_WAIT_Q_FOR_EACH'
-
-#IncludeBlocks: Preserve # Unknown to clang-format-5.0
+  - 'STRUCT_SECTION_FOREACH'
+  - 'TYPE_SECTION_FOREACH'
+  - 'K_SPINLOCK'
+IfMacros:
+  - 'CHECKIF'
+# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
+#IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '.*'
+  - Regex: '^".*\.h"$'
+    Priority: 0
+  - Regex: '^<(assert|complex|ctype|errno|fenv|float|inttypes|limits|locale|math|setjmp|signal|stdarg|stdbool|stddef|stdint|stdio|stdlib|string|tgmath|time|wchar|wctype)\.h>$'
     Priority: 1
-IncludeIsMainRegex: '(Test)?$'
+  - Regex: '^\<zephyr/.*\.h\>$'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
 IndentCaseLabels: false
-#IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
-#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
-ObjCBlockIndentWidth: 8
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
-#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-
-PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
-#SortUsingDeclarations: false # Unknown to clang-format-4.0
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
-#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
-SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 8
-UseTab: Always
-...
+InsertBraces: true
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SortIncludes: Never
+UseTab: ForContinuationAndIndentation
+WhitespaceSensitiveMacros:
+  - STRINGIFY
+  - Z_STRINGIFY

zephyr/samples/profiles/b-ld/boards/nucleo_f429zi.overlay

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		/* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K
+		 * 	(nvs.h: uint16_t sector_size)
+		 */
+		storage_partition: partition@100000 {
+			label = "storage";
+			reg = <0x000100000 DT_SIZE_K(48)>;
+		};
+	};
+};

zephyr/samples/profiles/b-ld/prj.conf

@@ -24,6 +24,9 @@ CONFIG_INIT_STACKS=y
 CONFIG_BACNETSTACK=y
 CONFIG_BACNETSTACK_LOG_LEVEL=3
 CONFIG_BACNETSTACK_BACNET_BASIC=y
+# BACnet settings subsystem
+CONFIG_BACNETSTACK_BACNET_SETTINGS=y
+CONFIG_BACNET_SETTINGS_SHELL=y
 # BACnet Library - options
 CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
 CONFIG_BACAPP_MINIMAL=y
@@ -34,10 +37,6 @@ CONFIG_BACNET_BASIC_OBJECT_LIGHTING_OUTPUT=y
 CONFIG_BACAPP_LIGHTING_COMMAND=y
 # BACnet Library - shell
 CONFIG_BACNET_BASIC_DEVICE_SHELL=y
-# BACnet settings subsystem
-#CONFIG_BACNETSTACK_BACNET_SETTINGS=y
-#CONFIG_BACNET_SETTINGS=y
-#CONFIG_BACNET_SETTINGS_SHELL=y
 
 # BACnet Datalink Options
 CONFIG_BACDL_BIP=y
@@ -120,19 +119,19 @@ CONFIG_STATS_SHELL=y
 #
 # Storage
 #
-#CONFIG_FLASH=y
-#CONFIG_FLASH_MAP=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
 #CONFIG_FLASH_PAGE_LAYOUT=y
 # native_posix uses a simulated flash
 #CONFIG_FLASH_SIMULATOR=y
 #CONFIG_DISK_ACCESS=y.
 #CONFIG_FILE_SYSTEM=y
 #CONFIG_FILE_SYSTEM_LITTLEFS=y
 #CONFIG_FILE_SYSTEM_SHELL=y
-#CONFIG_NVS=y
-#CONFIG_SETTINGS=y
-#CONFIG_SETTINGS_NVS=y
-#CONFIG_SETTINGS_RUNTIME=y
+CONFIG_NVS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_SETTINGS_RUNTIME=y
 #CONFIG_SETTINGS_FILE=y
 #CONFIG_SETTINGS_SHELL=y
 

zephyr/samples/profiles/b-ld/src/main.c

@@ -29,7 +29,6 @@
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 /* FIXME: get the device instance and name from settings! */
-static const uint32_t Device_Instance = 260125;
 static const char *Device_Name = "BACnet Lighting Device (B-LD)";
 /* object instances */
 static const uint32_t Lighting_Instance = 1;
@@ -39,8 +38,8 @@ static const uint32_t Lighting_Instance = 1;
  * @param object-instance [in] The object-instance number of the object
  * @param old_value [in] The value to track
  */
-void BACnet_Lighting_Output_Tracking_Value_Handler(uint32_t object_instance,
-						   float old_value, float value)
+void BACnet_Lighting_Output_Tracking_Value_Handler(uint32_t object_instance, float old_value,
+						   float value)
 {
 	uint16_t steps = 0;
 
@@ -56,9 +55,8 @@ void BACnet_Lighting_Output_Tracking_Value_Handler(uint32_t object_instance,
 	} else {
 		steps = 0;
 	}
-	LOG_INF("Lighting Output[%lu]: value=%f step=%u/%u",
-		(unsigned long)object_instance, (double)value, (unsigned)steps,
-		(unsigned)UINT16_MAX);
+	LOG_INF("Lighting Output[%lu]: value=%f step=%u/%u", (unsigned long)object_instance,
+		(double)value, (unsigned)steps, (unsigned)UINT16_MAX);
 }
 
 /**
@@ -71,8 +69,6 @@ static void BACnet_Lighting_Device_Init_Handler(void *context)
 	(void)context;
 	LOG_INF("BACnet Stack Initialized");
 	/* initialize objects for this basic sample */
-	Device_Init(NULL);
-	Device_Set_Object_Instance_Number(Device_Instance);
 	Device_Object_Name_ANSI_Init(Device_Name);
 	Lighting_Output_Create(Lighting_Instance);
 	Lighting_Output_Name_Set(Lighting_Instance, "Light-1");
@@ -99,10 +95,8 @@ int main(void)
 	LOG_INF("BACnet Device: %s", Device_Name);
 	LOG_INF("BACnet Stack Version " BACNET_VERSION_TEXT);
 	LOG_INF("BACnet Stack Max APDU: %d", MAX_APDU);
-	bacnet_basic_init_callback_set(BACnet_Lighting_Device_Init_Handler,
-				       NULL);
-	bacnet_basic_task_callback_set(BACnet_Lighting_Device_Task_Handler,
-				       NULL);
+	bacnet_basic_init_callback_set(BACnet_Lighting_Device_Init_Handler, NULL);
+	bacnet_basic_task_callback_set(BACnet_Lighting_Device_Task_Handler, NULL);
 	/* work happens in server module */
 	for (;;) {
 		k_sleep(K_MSEC(1000));

zephyr/samples/profiles/b-ls/boards/nucleo_f429zi.overlay

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 STMicroelectronics
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		/* Set 48KB of storage at the beginning of bank2 in order to have 3 sectors smaller than 32K
+		 * 	(nvs.h: uint16_t sector_size)
+		 */
+		storage_partition: partition@100000 {
+			label = "storage";
+			reg = <0x000100000 DT_SIZE_K(48)>;
+		};
+	};
+};

zephyr/samples/profiles/b-ls/prj.conf

@@ -24,6 +24,9 @@ CONFIG_INIT_STACKS=y
 CONFIG_BACNETSTACK=y
 CONFIG_BACNETSTACK_LOG_LEVEL=3
 CONFIG_BACNETSTACK_BACNET_BASIC=y
+# BACnet settings subsystem
+CONFIG_BACNETSTACK_BACNET_SETTINGS=y
+CONFIG_BACNET_SETTINGS_SHELL=y
 # BACnet Library - options
 CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
 CONFIG_BACAPP_MINIMAL=y
@@ -40,10 +43,6 @@ CONFIG_BACAPP_DOUBLE=y
 CONFIG_BACAPP_COLOR_COMMAND=y
 # BACnet Library - shell
 CONFIG_BACNET_BASIC_DEVICE_SHELL=y
-# BACnet settings subsystem
-#CONFIG_BACNETSTACK_BACNET_SETTINGS=y
-#CONFIG_BACNET_SETTINGS=y
-#CONFIG_BACNET_SETTINGS_SHELL=y
 
 # BACnet Datalink Options
 CONFIG_BACDL_BIP=y
@@ -125,21 +124,21 @@ CONFIG_STATS_SHELL=y
 #
 # Storage
 #
-#CONFIG_FLASH=y
-#CONFIG_FLASH_MAP=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
 #CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_NVS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_SETTINGS_RUNTIME=y
+#CONFIG_SETTINGS_FILE=y
+#CONFIG_SETTINGS_SHELL=y
 # native_posix uses a simulated flash
 #CONFIG_FLASH_SIMULATOR=y
 #CONFIG_DISK_ACCESS=y.
 #CONFIG_FILE_SYSTEM=y
 #CONFIG_FILE_SYSTEM_LITTLEFS=y
 #CONFIG_FILE_SYSTEM_SHELL=y
-#CONFIG_NVS=y
-#CONFIG_SETTINGS=y
-#CONFIG_SETTINGS_NVS=y
-#CONFIG_SETTINGS_RUNTIME=y
-#CONFIG_SETTINGS_FILE=y
-#CONFIG_SETTINGS_SHELL=y
 
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y