From 4474acf3c5bdfa5c6410c9df43b67995609c5fd0 Mon Sep 17 00:00:00 2001 From: BlitzKrieg Date: Tue, 10 Dec 2024 22:40:51 +0100 Subject: [PATCH] klippy: Fixup dictionary parameter parsing. mcu: Fixup using of multiple controller dictionaries. Uneeded spliting of dictionary parameter value by '=' symbol removed. Wrong naming of additional mcu dictionary file fixed. Signed-off-by: BlitzKrieg --- klippy/klippy.py | 3 --- klippy/mcu.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/klippy/klippy.py b/klippy/klippy.py index 316343cbd112..755fbd9fea25 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -248,9 +248,6 @@ def import_test(): def arg_dictionary(option, opt_str, value, parser): key, fname = "dictionary", value - if '=' in value: - mcu_name, fname = value.split('=', 1) - key = "dictionary_" + mcu_name if parser.values.dictionary is None: parser.values.dictionary = {} parser.values.dictionary[key] = fname diff --git a/klippy/mcu.py b/klippy/mcu.py index eb71e6bc2a97..72c9df32f4a0 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -661,7 +661,7 @@ def _connect_file(self, pace=False): dict_fname = start_args.get('dictionary') else: out_fname = start_args.get('debugoutput') + "-" + self._name - dict_fname = start_args.get('dictionary_' + self._name) + dict_fname = start_args.get('dictionary') + "-" + self._name outfile = open(out_fname, 'wb') dfile = open(dict_fname, 'rb') dict_data = dfile.read()