add build/debug target for fancontrol, fix fancontrol if stratux.conf…

… doesn't exist yet on first boot
b3nn0 · Nov 20, 2021 · 3d07b46 · 3d07b46
1 parent 75c473c
commit 3d07b46
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,6 +13,18 @@
             //"args": ["-log_dir", "/tmp/", "-logtostderr", "-replay", "-uatlog",  "test-data/cyoung-09062015-noproblem-stratux-uat.log"],
             "preLaunchTask": "Build",
             "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "Launch Fancontrol",
+            "type": "go",
+            "request": "launch",
+            "mode": "exec",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/fancontrol",
+            "env": {"CGO_CFLAGS_ALLOW": "-L${workspaceRoot}"},
+            //"args": ["-log_dir", "/tmp/", "-logtostderr", "-replay", "-uatlog",  "test-data/cyoung-09062015-noproblem-stratux-uat.log"],
+            "preLaunchTask": "Build Fancontrol",
+            "internalConsoleOptions": "openOnSessionStart"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,6 +12,16 @@
                 "kind": "build",
                 "isDefault": true
             }
+        },
+        {
+            "label": "Build Fancontrol",
+            "type": "shell",
+            "command": "make fancontrol debug=true",
+            "problemMatcher": "$go",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
         }
     ]
 }
diff --git a/fancontrol_main/fancontrol.go b/fancontrol_main/fancontrol.go
@@ -312,6 +312,12 @@ func (service *Service) Manage() (string, error) {
 }
 
 func readSettings() {
+	myFanControl.PWMDutyMin = defaultPwmDutyMin
+	myFanControl.TempTarget = defaultTempTarget
+	myFanControl.PWMFrequency = defaultPwmFrequency
+	myFanControl.PWMPin = defaultPin
+	myFanControl.PWMDuty80PStartDelay = PWMDuty80PStartDelay
+
 	fd, err := os.Open(configLocation)
 	if err != nil {
 		log.Printf("can't read settings %s: %s\n", configLocation, err.Error())
@@ -325,11 +331,6 @@ func readSettings() {
 		return
 	}
 
-	myFanControl.PWMDutyMin = defaultPwmDutyMin
-	myFanControl.TempTarget = defaultTempTarget
-	myFanControl.PWMFrequency = defaultPwmFrequency
-	myFanControl.PWMPin = defaultPin
-
 	err = json.Unmarshal(buf[0:count], &myFanControl)
 	if err != nil {
 		log.Printf("can't read settings %s: %s\n", configLocation, err.Error())