From a76abe63db52ed5c95324fdc5bf3d8078490edbd Mon Sep 17 00:00:00 2001 From: klemek Date: Wed, 4 Nov 2026 01:42:24 +0100 Subject: [PATCH] feat: multiple output modes and less logs at boot (fixes) --- Makefile | 4 ++-- README.md | 3 ++- src/forge_invar/forge_data.py | 6 +++--- system/hdmi/cmdline.txt | 2 +- system/hdmi/config.ini | 4 ++++ system/ntsc/cmdline.txt | 2 +- system/ntsc/config.ini | 6 ++++-- system/pal/cmdline.txt | 2 +- system/pal/config.ini | 4 ++++ 9 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index beec35d..8a41afb 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,11 @@ build: $(BUILD_DIR)/$(TARGET) .PHONY: run run: $(BUILD_DIR)/$(TARGET) - @$(BUILD_DIR)/$(TARGET) $(RUN_ARGS) 2>&1 >> $(PROJECT_DIR)/forge.log + @$(BUILD_DIR)/$(TARGET) $(RUN_ARGS) 2>&1 | tee -ai $(PROJECT_DIR)/forge.log 2>&1 > /dev/null .PHONY: start-bg start-bg: - @python3 $(PROJECT_DIR)/__main__.py 2>&1 >> $(PROJECT_DIR)/python.log 2>&1 + @python3 $(PROJECT_DIR)/__main__.py 2>&1 | tee -ai $(PROJECT_DIR)/python.log 2>&1 > /dev/null & .PHONY: start-fg start-fg: diff --git a/README.md b/README.md index ba14446..1d162e3 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,8 @@ make -f Makefile.dev rasp-install * https://linuxvox.com/blog/linux-autologin/ * https://www.exploding-shed.com/synth-diy-guides/standards-of-eurorack/eurorack-dimensions/ * https://electricalflux.com/mcu-raspberry/i2c-oled-display-raspberry-pi-5-wiring-code -* https://www.raspberrypi.com/documentation/computers/configuration.html +* https://www.raspberrypi.com/documentation/computers/config_txt.html +* https://www.raspberrypi.com/documentation/computers/configuration.html#cmdline * https://int10h.org/oldschool-pc-fonts/fontlist/font?ibm_bios * https://raspberrypihq.com/use-a-push-button-with-raspberry-pi-gpio/ diff --git a/src/forge_invar/forge_data.py b/src/forge_invar/forge_data.py index 4997ac8..cfe9242 100644 --- a/src/forge_invar/forge_data.py +++ b/src/forge_invar/forge_data.py @@ -32,11 +32,11 @@ class ForgeRawData: def read(self, file: pathlib.Path = FORGE_SAVE_PATH) -> bool: try: content = file.read_text() + for line in content.splitlines(): + key, value = line.split("=", maxsplit=2) + self.__data[key] = float(value) except: # noqa: E722 return False - for line in content.splitlines(): - key, value = line.split("=", maxsplit=2) - self.__data[key] = float(value) if "time" in self.__data: FORGE_SAVE_BACKUP_PATH.write_text(content) return True diff --git a/system/hdmi/cmdline.txt b/system/hdmi/cmdline.txt index 689422d..4d80689 100644 --- a/system/hdmi/cmdline.txt +++ b/system/hdmi/cmdline.txt @@ -1 +1 @@ -quiet loglevel=3 quiet logo.nologo vt.global_cursor_default=0 +loglevel=0 logo.nologo vt.global_cursor_default=0 diff --git a/system/hdmi/config.ini b/system/hdmi/config.ini index 85d4e80..e0cb3f2 100644 --- a/system/hdmi/config.ini +++ b/system/hdmi/config.ini @@ -20,3 +20,7 @@ enable_tvout=0 # --- I2C --- dtparam=i2c_arm=on + +# --- other --- +disable_splash=1 +avoid_warnings=1 diff --git a/system/ntsc/cmdline.txt b/system/ntsc/cmdline.txt index 62a2b7c..ce374a2 100644 --- a/system/ntsc/cmdline.txt +++ b/system/ntsc/cmdline.txt @@ -1,2 +1,2 @@ vc4.tv_norm=NTSC video=Composite-1:720x480ie,tv_mode=NTSC -quiet loglevel=0 quiet logo.nologo vt.global_cursor_default=0 +loglevel=0 logo.nologo vt.global_cursor_default=0 diff --git a/system/ntsc/config.ini b/system/ntsc/config.ini index ead2069..314ef2a 100644 --- a/system/ntsc/config.ini +++ b/system/ntsc/config.ini @@ -17,8 +17,10 @@ gpu_mem=64 # --- composite --- enable_tvout=1 -sdtv_mode=0 -sdtv_aspect=1 # --- I2C --- dtparam=i2c_arm=on + +# --- other --- +disable_splash=1 +avoid_warnings=1 diff --git a/system/pal/cmdline.txt b/system/pal/cmdline.txt index 00c4cf6..3a78b7e 100644 --- a/system/pal/cmdline.txt +++ b/system/pal/cmdline.txt @@ -1,2 +1,2 @@ vc4.tv_norm=PAL video=Composite-1:720x576ie,tv_mode=PAL -quiet loglevel=0 quiet logo.nologo vt.global_cursor_default=0 +loglevel=0 logo.nologo vt.global_cursor_default=0 diff --git a/system/pal/config.ini b/system/pal/config.ini index 59b0d2f..314ef2a 100644 --- a/system/pal/config.ini +++ b/system/pal/config.ini @@ -20,3 +20,7 @@ enable_tvout=1 # --- I2C --- dtparam=i2c_arm=on + +# --- other --- +disable_splash=1 +avoid_warnings=1