Added NVM FeatureDef

concordia-fsae · Jan 26, 2025 · ced0a3a · ced0a3a
1 parent 70eed18
commit ced0a3a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/components/bms_boss/FeatureSels.yaml b/components/bms_boss/FeatureSels.yaml
@@ -1,4 +1,9 @@
-featureDefs: "#/components/bms_boss/FeatureDefs.yaml"
+featureDefs: 
+  - "#/components/bms_boss/FeatureDefs.yaml"
+  - "#/components/shared/FeatureDefs/NVM_FeatureDefs.yaml"
 features:
   feature_cantx_swi:
   feature_canrx_swi:
+  nvm_lib_enabled: true
+  nvm_flash_backed: true
+  nvm_block_size: 2048
diff --git a/components/bms_boss/HW/include/BuildDefines.h b/components/bms_boss/HW/include/BuildDefines.h
@@ -8,10 +8,6 @@
 #include "FeatureDefines_generated.h"
 #include "BuildDefines_generated.h"
 
-#define NVM_LIB_ENABLED FEATURE_ENABLED
-#define NVM_FLASH_BACKED FEATURE_ENABLED
-#define NVM_BLOCK_SIZE 2048 // Multiple of page size
-
 #if MCU_STM32_PN == FDEFS_STM32_PN_STM32F103XB
 #define STM32F1
 #define STM32F103xB

diff --git a/components/bootloaders/STM/stm32f103/variants.yaml b/components/bootloaders/STM/stm32f103/variants.yaml
@@ -242,6 +242,8 @@ configs:
     options:
       udsRequestId: 0x609
       udsResponseId: 0x649
+      nvmLibEnabled:
+      nvmBlockSize: 2048
     features:
       selections:
         - "#/components/shared/FeatureSels/STM32F105_FeatureSels.yaml"
@@ -257,6 +259,8 @@ configs:
     options:
       udsRequestId: 0x609
       udsResponseId: 0x649
+      nvmLibEnabled:
+      nvmBlockSize: 2048
     features:
       selections:
         - "#/components/shared/FeatureSels/STM32F105_FeatureSels.yaml"

diff --git a/components/shared/FeatureDefs/NVM_FeatureDefs.yaml b/components/shared/FeatureDefs/NVM_FeatureDefs.yaml
@@ -0,0 +1,12 @@
+config:
+  prefix: nvm
+  description: General definitions for non voltaile memory
+defs:
+  lib_enabled:
+  block_size:
+    requires:
+      - nvm_lib_enabled
+  flash_backed:
+    requires:
+      - nvm_lib_enabled
+      - nvm_block_size
diff --git a/site_scons/site_tools/variants.py b/site_scons/site_tools/variants.py
@@ -10,7 +10,11 @@ def GenerateFeatures(env, selection_files: List[FS.File], features_dict: List[di
         with open(selection_file.abspath, "r") as fd:
             loaded_selections = safe_load(fd)
             try:
-                features_files += [ File(loaded_selections["featureDefs"]) ]
+                if type(loaded_selections["featureDefs"]) is str:
+                    features_files += [ File(loaded_selections["featureDefs"]) ]
+                else:
+                    features_files.extend([ File(file) for file in loaded_selections["featureDefs"] ])
+
             except KeyError:
                 raise Exception(f"FeatureDefs: Definition file in {selection_file.abspath} not specified in 'featureDefs'.")