瀏覽代碼

fixed the clean recipe path bug.

sangwq 1 年之前
父節點
當前提交
d1ac5fa823
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 1 1
      Venus/Venus_RT/Config/System.sccfg
  2. 3 1
      Venus/Venus_RT/Modules/Schedulers/SchedulerPM.cs

+ 1 - 1
Venus/Venus_RT/Config/System.sccfg

@@ -20,7 +20,7 @@
 		<config default="00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000" name="COMLogFlag" description="Flag for print COM data log" max="" min="" paramter="" tag="" unit="" visible="false" type="String" />
 		<config default="True" name="IsIgnoreSaveDB" nameView="IsIgnoreSaveDB" description="IO实时数据是否保存数据库,2023/09/02暂时加参数设计" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		<config default="10"  name="CheckResourceInterval" nameView="CheckResourceInterval" description="进程资源监视间隔,单位为分钟,0为不监视" max="60" min="0" paramter="" tag="" unit="min" type="Integer"/>
-		<config default="1"  name="SystemType" nameView="SystemType" description="0 = Venus;1 = Kepler 2300;2 = Kepler 2200A;3 = Kepler 2200B;4 = Venus SE;5 = Venus DE;" max="0" min="0" paramter="" tag="" unit="min" type="Integer"/>
+		<config default="1"  name="SystemType" nameView="SystemType" description="0 = Venus;1 = Kepler 2300;2 = Kepler 2200A;3 = Kepler 2200B;4 = Venus SE;5 = Venus DE;" max="9" min="0" paramter="" tag="" unit="min" type="Integer"/>
 		
 		<!--FA-->
 		<configs name="FA" nameView="FA" visible="false">

+ 3 - 1
Venus/Venus_RT/Modules/Schedulers/SchedulerPM.cs

@@ -390,7 +390,9 @@ namespace Venus_RT.Scheduler
             }
 
             // validate the idle clean recipe name
-            string recipeContent = RecipeFileManager.Instance.LoadRecipe(Module.ToString(), _idleCleanRecipe, false);
+            string path = Path.Combine("Recipes", Module.ToString(), "Clean", $"{_idleCleanRecipe}.rcp");
+            string recipeContent = RecipeFileManager.Instance.LoadRecipeByPath(path);
+            
             Recipe recipe = Recipe.Load(recipeContent);
             if (recipe == null)
             {