From 668ca5978df0f2930134b51904dab267bd792e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Severin=20M=C3=BCller?= Date: Fri, 17 Oct 2025 21:03:37 +0200 Subject: [PATCH] Small bug fixes --- jsonrpc.go | 4 ---- serial.go | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/jsonrpc.go b/jsonrpc.go index 22466ef3..0492a8ac 100644 --- a/jsonrpc.go +++ b/jsonrpc.go @@ -775,8 +775,6 @@ func rpcSetActiveExtension(extensionId string) error { _ = unmountATXControl() case "dc-power": _ = unmountDCControl() - case "serial-buttons": - _ = unmountSerialButtons() } config.ActiveExtension = extensionId if err := SaveConfig(); err != nil { @@ -787,8 +785,6 @@ func rpcSetActiveExtension(extensionId string) error { _ = mountATXControl() case "dc-power": _ = mountDCControl() - case "serial-buttons": - _ = mountSerialButtons() } return nil } diff --git a/serial.go b/serial.go index fc7019b7..d61f9108 100644 --- a/serial.go +++ b/serial.go @@ -347,7 +347,7 @@ func getSerialSettings() (SerialSettings, error) { file, err := os.Open(serialSettingsPath) if err != nil { - logger.Info().Msg("SerialButtons config file doesn't exist, using default") + logger.Info().Msg("SerialSettings file doesn't exist, using default") return serialConfig, err } defer file.Close() @@ -355,7 +355,7 @@ func getSerialSettings() (SerialSettings, error) { // load and merge the default config with the user config var loadedConfig SerialSettings if err := json.NewDecoder(file).Decode(&loadedConfig); err != nil { - logger.Warn().Err(err).Msg("SerialButtons config file JSON parsing failed") + logger.Warn().Err(err).Msg("SerialSettings file JSON parsing failed") return serialConfig, nil } @@ -442,14 +442,14 @@ func setSerialSettings(newSettings SerialSettings) error { file, err := os.Create(serialSettingsPath) if err != nil { - return fmt.Errorf("failed to create SerialButtons config file: %w", err) + return fmt.Errorf("failed to create SerialSettings file: %w", err) } defer file.Close() encoder := json.NewEncoder(file) encoder.SetIndent("", " ") if err := encoder.Encode(newSettings); err != nil { - return fmt.Errorf("failed to encode SerialButtons config: %w", err) + return fmt.Errorf("failed to encode SerialSettings: %w", err) } var stopBits serial.StopBits