iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix boot folder remapping

Browse Source
This commit is contained in:
Ace 2024-07-18 01:43:25 +02:00
parent 1d9bf8e22e
commit f4fee0e31f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inkycal/main.py
View File

@ -6,6 +6,7 @@ Copyright by aceinnolab
import asyncio import asyncio
import glob import glob
import hashlib import hashlib
import os.path
import numpy import numpy
@ -72,13 +73,16 @@ class Inkycal:
f"No settings.json file could be found in the specified location: {settings_path}") f"No settings.json file could be found in the specified location: {settings_path}")
else: else:
logger.info("Looking for settings.json file in /boot folder...") found = False
try: for location in settings.SETTINGS_JSON_PATHS:
with open('/boot/settings.json', mode="r") as settings_file: if os.path.exists(location):
logger.info(f"Found settings.json file in {location}")
with open(location, mode="r") as settings_file:
self.settings = json.load(settings_file) self.settings = json.load(settings_file)
found = True
except FileNotFoundError: break
raise SettingsFileNotFoundError if not found:
raise SettingsFileNotFoundError(f"No settings.json file could be found in {settings.SETTINGS_JSON_PATHS} and no explicit path was specified.")
self.disable_calibration = self.settings.get('disable_calibration', False) self.disable_calibration = self.settings.get('disable_calibration', False)
if self.disable_calibration: if self.disable_calibration:

2
inkycal/settings.py
View File

@ -18,3 +18,5 @@ class Settings:
PARALLEL_DRIVER_PATH = os.path.join(basedir, "display", "drivers", "parallel_drivers") PARALLEL_DRIVER_PATH = os.path.join(basedir, "display", "drivers", "parallel_drivers")
TEMPORARY_FOLDER = os.path.join(basedir, "tmp") TEMPORARY_FOLDER = os.path.join(basedir, "tmp")
VCOM = "2.0" VCOM = "2.0"
# /boot/settings.json is path on older releases, while the latter is more the more recent ones
SETTINGS_JSON_PATHS = ["/boot/settings.json", "/boot/firmware/settings.json"]