CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes: add commit of config changes

Browse Source
This commit is contained in:
alfrix 2024-01-26 13:53:43 -03:00
parent 9d0e4b841f
commit 051a53ec22
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Changelog.md
View File

@ -2,7 +2,7 @@
Breaking changes will be listed here.
#### [2024_01_26]()
#### [2024_01_26](https://github.com/KlipperScreen/KlipperScreen/commit/9d0e4b841f905f0034a7c6fefefcf041e38b90a3)
* Deprecated old ~/klipper_config folder users need to place the configfile
in ~/printer_data/config, ~/.config/KlipperScreen, or directly in the repo

8
ks_includes/config.py
View File

@ -23,7 +23,7 @@ SCREEN_BLANKING_OPTIONS = [
klipperscreendir = pathlib.Path(__file__).parent.resolve().parent
home = os.path.expanduser("~/")
klipper_config = os.path.join(home, "printer_data", "config")
printer_data_config = os.path.join(home, "printer_data", "config")
xdg_config = os.path.join(home, ".config", "KlipperScreen")
@ -407,7 +407,7 @@ class KlipperScreenConfig:
return file
# List of directories to search for the config file
directories = [klipper_config, xdg_config, klipperscreendir]
directories = [printer_data_config, xdg_config, klipperscreendir]
for directory in directories:
path = self.check_path_exists(directory, self.configfile_name)
@ -512,8 +512,8 @@ class KlipperScreenConfig:
if self.config_path != self.default_config_path:
filepath = self.config_path
else:
if os.path.exists(klipper_config):
filepath = os.path.join(klipper_config, self.configfile_name)
if os.path.exists(printer_data_config):
filepath = os.path.join(printer_data_config, self.configfile_name)
else:
try:
if not os.path.exists(xdg_config):