succd: factor out safety status to separate struct

succbone/succd/http.go

@@ -60,7 +60,7 @@ func (d *daemon) httpIndex(w http.ResponseWriter, r *http.Request) {
 	volts, mbar := d.pirani()
 	rp := d.rpGet()
 	dp := d.dpGet()
-  failsafe, highpressure := d.safetyStatusGet()
+	safety := d.safetyStatusGet()
 
 	loadB, err := os.ReadFile("/proc/loadavg")
 	load := "unknown"
@@ -75,8 +75,8 @@ func (d *daemon) httpIndex(w http.ResponseWriter, r *http.Request) {
 	}
 
 	templateIndex.Execute(w, map[string]any{
-		"failsafe":     failsafe,
-		"highpressure": highpressure,
+		"failsafe":     safety.failsafe,
+		"highpressure": safety.highPressure,
 		"volts":        formatVolts(volts),
 		"mbar":         formatMbar(mbar),
 		"rp":           rp,
@@ -110,10 +110,10 @@ func (d *daemon) httpStream(w http.ResponseWriter, r *http.Request) {
 			rp := d.rpGet()
 			dp := d.dpGet()
 			rough, high := d.vacuumStatusGet()
-      failsafe, highpressure := d.safetyStatusGet()
+			safety := d.safetyStatusGet()
 			v := struct {
-        Failsafe     bool
-        HighPressure bool
+				Failsafe     bool
+				HighPressure bool
 				Volts        string
 				Mbar         string
 				MbarFloat    float32
@@ -122,8 +122,8 @@ func (d *daemon) httpStream(w http.ResponseWriter, r *http.Request) {
 				RoughReached bool
 				HighReached  bool
 			}{
-        Failsafe:     failsafe,
-        HighPressure: highpressure,
+				Failsafe:     safety.failsafe,
+				HighPressure: safety.highPressure,
 				Volts:        formatVolts(volts),
 				Mbar:         string(formatMbar(mbar)),
 				MbarFloat:    mbar,