CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

Ignore include sections when validating the config (#720)

Browse Source 
* Don't validate `include` sections.

We need a `continue` here because `include` sections are not 'standard',
and don't have any keys to validate.

`include` sections are tangentially validated later via
`_include_config()`.

* Move checks for non-validated sections to start

Rather than looping through the whole if..elif.. block, fail fast if
we're not actually going to validate the section.
This commit is contained in:
whi-tw 2022-09-06 01:27:09 +01:00 committed by GitHub
parent abe12cca30
commit 5d428e4999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ks_includes/config.py
View File

@ -114,6 +114,10 @@ class KlipperScreenConfig:
valid = True valid = True
bools = strs = numbers = () bools = strs = numbers = ()
for section in self.config: for section in self.config:
if section == 'DEFAULT' or section.startswith('include '):
# Do not validate 'DEFAULT' or 'include*' sections
continue
if section == 'main': if section == 'main':
bools = ( bools = (
'invert_x', 'invert_y', 'invert_z', '24htime', 'only_heaters', 'show_cursor', 'confirm_estop', 'invert_x', 'invert_y', 'invert_z', '24htime', 'only_heaters', 'show_cursor', 'confirm_estop',
@ -153,8 +157,6 @@ class KlipperScreenConfig:
elif section.startswith('z_calibrate_position'): elif section.startswith('z_calibrate_position'):
# This section may be deprecated in favor of moving this options under the printer section # This section may be deprecated in favor of moving this options under the printer section
numbers = ('calibrate_x_position', 'calibrate_y_position') numbers = ('calibrate_x_position', 'calibrate_y_position')
elif section == 'DEFAULT':
continue
else: else:
self.errors.append(f'Section [{section}] not recognized') self.errors.append(f'Section [{section}] not recognized')