From 9e2c44009716ccc401ec52632f36cb2a1bb3ecc3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 15:36:10 +0200 Subject: [PATCH] Fix false warnings on setting formulas We also need to consider the extruder settings when looking into formulas for existing values. --- printer-linter/src/printerlinter/linters/formulas.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/printer-linter/src/printerlinter/linters/formulas.py b/printer-linter/src/printerlinter/linters/formulas.py index aa31619678..07f1bc24a8 100644 --- a/printer-linter/src/printerlinter/linters/formulas.py +++ b/printer-linter/src/printerlinter/linters/formulas.py @@ -51,9 +51,17 @@ class Formulas(Linter): self._definition = {} def getCuraSettingList(self) -> list: + settings_list = [] + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmprinter.def.json")) as data: json_data = json.load(data) - return self.extractKeys(json_data) + settings_list += self.extractKeys(json_data) + + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmextruder.def.json")) as data: + json_data = json.load(data) + settings_list += self.extractKeys(json_data) + + return settings_list def extractKeys(self, json_obj, parent_key=''): keys_with_value = []