+
| Voltage | @@ -44,6 +49,25 @@ h2 {Pressure | {{.mbar}} |
|---|---|---|
| Roughing Pump | +{{ if .rp }}ON{{ else }}OFF{{ end }} | +|
| Diffusion Pump | +{{ if .dp }}ON{{ else }}OFF{{ end }} | +|
| Evac Control | ++ + + + + + + | +|
| Status | OK | @@ -197,6 +221,12 @@ window.addEventListener("load", (_) => { let volts = document.querySelector("#volts"); let mbar = document.querySelector("#mbar"); let ping = document.querySelector("#ping"); + + // Buttons + let pd = document.querySelector("#pd"); + let vent = document.querySelector("#vent"); + let rpon = document.querySelector("#rpon"); + let rpoff = document.querySelector("#rpoff"); canvas = document.querySelector("#graph").getContext("2d"); // TODO(q3k): unhardcode this. @@ -226,6 +256,18 @@ window.addEventListener("load", (_) => { const data = JSON.parse(event.data); volts.innerHTML = data.Volts; mbar.innerHTML = data.Mbar; + rp.innerHTML = data.RPOn ? "ON" : "OFF"; + if (data.RPOn) { + rp.style = "background-color: #60f060"; + } else { + rp.style = "background-color: #f06060"; + } + dp.innerHTML = data.DPOn ? "ON" : "OFF"; + if (data.DPOn) { + dp.style = "background-color: #60f060"; + } else { + dp.style = "background-color: #f06060"; + } historicalPush(data.MbarFloat); ping.innerHTML = Date.now(); }); @@ -243,5 +285,24 @@ window.addEventListener("load", (_) => { }); }; connect(); + + pd.addEventListener("click", async (event) => { + await fetch("/button/pumpdown"); + }); + vent.addEventListener("click", async (event) => { + await fetch("/button/vent"); + }); + rpon.addEventListener("click", async (event) => { + await fetch("/rp/on"); + }); + rpoff.addEventListener("click", async (event) => { + await fetch("/rp/off"); + }); + dpon.addEventListener("click", async (event) => { + await fetch("/dp/on"); + }); + dpoff.addEventListener("click", async (event) => { + await fetch("/dp/off"); + }); }); \ No newline at end of file diff --git a/succbone/succd/main.go b/succbone/succd/main.go index e5d524a..913f29e 100644 --- a/succbone/succd/main.go +++ b/succbone/succd/main.go @@ -21,11 +21,23 @@ type daemon struct { // Pirani gauge. adcPirani adc + gpioDiffusionPump gpio + gpioRoughingPump gpio + gpioBtnPumpDown gpio + gpioBtnVent gpio + // mu guards state variables below. mu sync.RWMutex // adcPiraniVolts is a moving window of read ADC values, used to calculate a // moving average. adcPiraniVolts []float32 + rpOn bool + dpOn bool + // ventScheduled and pumpdownScheduled are timers which expire when the + // vent/pumpdown relays should be deactivated. This allows these outputs to + // be controlled momentarily. + ventScheduled time.Time + pumpdownScheduled time.Time } // process runs the pain acquisition and control loop of succd. @@ -56,12 +68,24 @@ func (d *daemon) processOnce(_ context.Context) error { return fmt.Errorf("when reading ADC: %w", err) } d.mu.Lock() + defer d.mu.Unlock() d.adcPiraniVolts = append(d.adcPiraniVolts, v) trim := len(d.adcPiraniVolts) - 100 if trim > 0 { d.adcPiraniVolts = d.adcPiraniVolts[trim:] } - d.mu.Unlock() + if err := d.gpioRoughingPump.set(d.rpOn); err != nil { + return fmt.Errorf("when configuring RP: %w", err) + } + if err := d.gpioDiffusionPump.set(!d.dpOn); err != nil { + return fmt.Errorf("when configuring RP: %w", err) + } + if err := d.gpioBtnPumpDown.set(!d.pumpdownScheduled.After(time.Now())); err != nil { + return fmt.Errorf("when configuring pumpdown: %w", err) + } + if err := d.gpioBtnVent.set(!d.ventScheduled.After(time.Now())); err != nil { + return fmt.Errorf("when configuring vent: %w", err) + } return nil } @@ -84,6 +108,52 @@ func (d *daemon) pirani() (volts float32, mbar float32) { return } +// rpSet enables/disables the roughing pump. +func (d *daemon) rpSet(state bool) { + d.mu.Lock() + defer d.mu.Unlock() + d.rpOn = state +} + +// rpGet returns whether the roughing pump is enabled/disabled. +func (d *daemon) rpGet() bool { + d.mu.RLock() + defer d.mu.RUnlock() + return d.rpOn +} + +// dpSet enables/disables the diffusion pump. +func (d *daemon) dpSet(state bool) { + d.mu.Lock() + defer d.mu.Unlock() + d.dpOn = state +} + +// dpGet returns whether the diffusion pump is enabled/disabled. +func (d *daemon) dpGet() bool { + d.mu.RLock() + defer d.mu.RUnlock() + return d.dpOn +} + +// pumpDownPressed toggles the pump down relay for 500ms. +func (d *daemon) pumpDownPress() { + d.mu.Lock() + defer d.mu.Unlock() + if d.pumpdownScheduled.Before(time.Now()) { + d.pumpdownScheduled = time.Now().Add(500 * time.Millisecond) + } +} + +// ventPress toggles the vent relay for 500ms. +func (d *daemon) ventPress() { + d.mu.Lock() + defer d.mu.Unlock() + if d.ventScheduled.Before(time.Now()) { + d.ventScheduled = time.Now().Add(500 * time.Millisecond) + } +} + var ( flagFake bool flagListenHTTP string @@ -96,21 +166,49 @@ func main() { ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt) - d := daemon{} + d := daemon{ + rpOn: true, + } if flagFake { - klog.Infof("Starting with fake Pirani probe") + klog.Infof("Starting with fake peripherals") d.adcPirani = &fakeADC{} + d.gpioRoughingPump = &fakeGPIO{desc: "rp"} + d.gpioDiffusionPump = &fakeGPIO{desc: "~dp"} + d.gpioBtnPumpDown = &fakeGPIO{desc: "~pd"} + d.gpioBtnVent = &fakeGPIO{desc: "~vent"} } else { adc, err := newBBADC(0) if err != nil { klog.Exitf("Failed to setup Pirani ADC: %v", err) } d.adcPirani = adc + + for _, c := range []struct { + out *gpio + num int + }{ + {&d.gpioRoughingPump, 115}, + {&d.gpioDiffusionPump, 49}, + {&d.gpioBtnPumpDown, 48}, + {&d.gpioBtnVent, 60}, + } { + // Relay, active low. + *c.out, err = newBBGPIO(c.num, true) + if err != nil { + klog.Exitf("Failed to setup GPIO: %v", err) + } + } } http.HandleFunc("/", d.httpIndex) http.HandleFunc("/stream", d.httpStream) http.HandleFunc("/metrics", d.httpMetrics) + http.HandleFunc("/button/vent", d.httpButtonVent) + http.HandleFunc("/button/pumpdown", d.httpButtonPumpDown) + http.HandleFunc("/rp/on", d.httpRoughingPumpEnable) + http.HandleFunc("/rp/off", d.httpRoughingPumpDisable) + http.HandleFunc("/dp/on", d.httpDiffusionPumpEnable) + http.HandleFunc("/dp/off", d.httpDiffusionPumpDisable) klog.Infof("Listening for HTTP at %s", flagListenHTTP) go func() {