diff --git a/succbone/succbone-din-mount.FCStd b/succbone/succbone-din-mount.FCStd index 78adc9b..8deed3d 100644 --- a/succbone/succbone-din-mount.FCStd +++ b/succbone/succbone-din-mount.FCStd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:152cca5f14439f176994a97ab70fbf3eceed8fec340a59be8776ba1670043f3c -size 1024525 +oid sha256:a7f941794ce7b2b521fc5a38d28bc91f028b66e155b0446b5b6fa73d57ae922c +size 888650 diff --git a/succbone/succbone-din-mount.stl b/succbone/succbone-din-mount.stl deleted file mode 100644 index e7a2796..0000000 --- a/succbone/succbone-din-mount.stl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd72552b5685c0a42bf28f89a51ae0eb95d2f0a26644b1839d7f89614d462f7f -size 2102184 diff --git a/succbone/succd/http.go b/succbone/succd/http.go index 9a43281..a0ac21a 100644 --- a/succbone/succd/http.go +++ b/succbone/succd/http.go @@ -179,60 +179,16 @@ func (s *webServer) viewStream(w http.ResponseWriter, r *http.Request) { } } -func boolToFloat(b bool) float32 { - if b { - return 1.0 - } else { - return 0.0 - } -} - // httpMetrics serves minimalistic Prometheus-compatible metrics. func (s *webServer) viewMetrics(w http.ResponseWriter, r *http.Request) { // TODO(q3k): also serve Go stuff using the actual Prometheus metrics client // library. // TODO(q3k): serve the rest of the data model state := s.d.snapshot() - - // sem_pressure_mbar is meant to represent the fused pressure value - // from all data sources once we have more vacuum sensors in the - // system. sem_pirani_mbar is just the reading from the pirani gauge. + mbar := state.piraniMbar100.mbar fmt.Fprintf(w, "# HELP sem_pressure_mbar Pressure in the SEM chamber, in millibar\n") fmt.Fprintf(w, "# TYPE sem_pressure_mbar gauge\n") - fmt.Fprintf(w, "sem_pressure_mbar %f\n", state.piraniMbar100.mbar) - - fmt.Fprintf(w, "# HELP sem_pirani_mbar Pressure reading by the Pirani gauge, in millibar\n") - fmt.Fprintf(w, "# TYPE sem_pirani_mbar gauge\n") - fmt.Fprintf(w, "sem_pirani_mbar %f\n", state.piraniMbar100.mbar) - - fmt.Fprintf(w, "# HELP sem_pirani_volts Voltage output from the Pirani gauge, in volts\n") - fmt.Fprintf(w, "# TYPE sem_pirani_volts gauge\n") - fmt.Fprintf(w, "sem_pirani_volts %f\n", state.piraniVolts100.avg) - - fmt.Fprintf(w, "# HELP sem_pirani_failsafe_active Whether pirani gauge failsafe mode is active (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_pirani_failsafe_active gauge\n") - fmt.Fprintf(w, "sem_pirani_failsafe_active %f\n", boolToFloat(state.safety.failsafe)) - - fmt.Fprintf(w, "# HELP sem_dp_lockout_active Whether diffusion pump lockout is active (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_dp_lockout_active gauge\n") - fmt.Fprintf(w, "sem_dp_lockout_active %f\n", boolToFloat(state.safety.highPressure)) - - fmt.Fprintf(w, "# HELP sem_pump_diffusion_running Whether the diffusion pump is running (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_pump_diffusion_running gauge\n") - fmt.Fprintf(w, "sem_pump_diffusion_running %f\n", boolToFloat(state.dpOn)) - - fmt.Fprintf(w, "# HELP sem_pump_roughing_running Whether the roughing pump is running (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_pump_roughing_running gauge\n") - fmt.Fprintf(w, "sem_pump_roughing_running %f\n", boolToFloat(state.rpOn)) - - rough, high := state.vacuumStatus() - fmt.Fprintf(w, "# HELP sem_vacuum_rough_reached Whether a rough vacuum has been reached (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_vacuum_rough_reached gauge\n") - fmt.Fprintf(w, "sem_vacuum_rough_reached %f\n", boolToFloat(rough)) - - fmt.Fprintf(w, "# HELP sem_vacuum_high_reached Whether a high vacuum has been reached (boolean)\n") - fmt.Fprintf(w, "# TYPE sem_vacuum_high_reached gauge\n") - fmt.Fprintf(w, "sem_vacuum_high_reached %f\n", boolToFloat(high)) + fmt.Fprintf(w, "sem_pressure_mbar %f\n", mbar) } func (s *webServer) viewRoughingPumpEnable(w http.ResponseWriter, r *http.Request) {