From 9db7d14814ce04a1ed46b99b608cf75d38f676d0 Mon Sep 17 00:00:00 2001 From: Ivan Safonov Date: Sat, 28 Sep 2024 11:27:12 +0700 Subject: [PATCH] Fix config levels priority --- build-deb.sh | 2 +- internal/service/fan.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-deb.sh b/build-deb.sh index 2a395ce..44ee077 100755 --- a/build-deb.sh +++ b/build-deb.sh @@ -1,7 +1,7 @@ set -e -x NAME=fanctl -VERSION=0.1.1 +VERSION=0.1.2 TMP_PACKAGE_DIR=.debian TMP_PACKAGE_DEB_DIR=$TMP_PACKAGE_DIR/DEBIAN diff --git a/internal/service/fan.go b/internal/service/fan.go index 971e44f..2f88626 100644 --- a/internal/service/fan.go +++ b/internal/service/fan.go @@ -143,8 +143,8 @@ func NewFanDefaults(driver FanDriver, conf config.Fan) FanDefaults { } return FanDefaults{ - Level: cmp.Or(drvDefaults.Level, conf.Level), - SuspendLevel: cmp.Or(drvDefaults.Level, conf.SuspendLevel), + Level: cmp.Or(conf.Level, drvDefaults.Level), + SuspendLevel: cmp.Or(conf.SuspendLevel, drvDefaults.Level), Repeat: drvDefaults.Repeat, DelayUp: cmp.Or(conf.DelayUp, conf.Delay), DelayDown: cmp.Or(conf.DelayDown, conf.Delay),