Removed feature tree from platform

concordia-fsae · Jan 25, 2025 · 9098ce8 · 9098ce8
1 parent 13035a6
commit 9098ce8
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 20 deletions.
diff --git a/SConstruct b/SConstruct
@@ -57,7 +57,6 @@ if platform:
     if platform in platforms["configs"]:
         PlatformEnv["PLATFORM_ID"] = platform
         PlatformEnv["PLATFORM_ARTIFACTS"] = GlobalEnv["REPO_ROOT_DIR"].Dir(f"platform-artifacts/{platform.upper()}")
-        PlatformEnv["FEATURE_SELECTIONS"] = platforms["configs"][platform]["options"]["feature-selections"]
         if targets:
             for target in targets.split("+"):
                 component = search(COMPONENT_REGEX, target).group()

diff --git a/components/bms_boss/SConscript b/components/bms_boss/SConscript
@@ -272,11 +272,7 @@ for config_id, config in configs.items():
     platform_source_files.extend(
         [(src[0], src[1] + ["-Wno-inline"]) for src in chip_config["sources"]]
     )
-    try:
-        feature_selections = config_env["FEATURE_SELECTIONS"]
-    except:
-        feature_selections = []
-        print(f"No platform feature selections for component {ARTIFACT_NAME.upper()}")
+    feature_selections = []
     feature_selections += config["features"]["selections"]
     feature_selections_files = []
     for file in feature_selections:

diff --git a/components/bms_worker/SConscript b/components/bms_worker/SConscript
@@ -301,7 +301,7 @@ asms = []
 
 for config_id, config in configs.items():
     config_env = env.Clone()
-    feature_selections = config_env["FEATURE_SELECTIONS"]
+    feature_selections = []
     feature_selections += config["features"]["selections"]
     feature_selections_files = []
 

diff --git a/shared/FeatureDefs/Platform_FeatureDefs.yaml b/shared/FeatureDefs/Platform_FeatureDefs.yaml
diff --git a/shared/FeatureSels/CFR24_FeatureSels.yaml b/shared/FeatureSels/CFR24_FeatureSels.yaml
diff --git a/shared/FeatureSels/Default_FeatureSels.yaml b/shared/FeatureSels/Default_FeatureSels.yaml
diff --git a/site_scons/platforms.yaml b/site_scons/platforms.yaml
@@ -1,8 +1,5 @@
 configs:
   cfr24:
-    options:
-      feature-selections:
-        - "#/shared/FeatureSels/CFR24_FeatureSels.yaml"
     ecu:
       bmsw:
         0:
@@ -18,9 +15,6 @@ configs:
         5: # BMS Worker
         10: # BMS Boss
   cfr25:
-    options:
-      feature-selections:
-        - "#/shared/FeatureSels/CFR24_FeatureSels.yaml"
     ecu:
       bmsw:
         0: