mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Adds power draw.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
var/on = 0
|
||||
var/direction_out = 0 //0 = siphoning, 1 = releasing
|
||||
var/target_pressure = 100
|
||||
var/target_pressure = ONE_ATMOSPHERE
|
||||
|
||||
var/pressuremin = 0
|
||||
var/pressuremax = 10 * ONE_ATMOSPHERE
|
||||
@@ -127,6 +127,7 @@
|
||||
data["pump_dir"] = direction_out
|
||||
data["minpressure"] = round(pressuremin)
|
||||
data["maxpressure"] = round(pressuremax)
|
||||
data["powerDraw"] = round(last_power_draw)
|
||||
data["cellCharge"] = cell ? cell.charge : 0
|
||||
data["cellMaxCharge"] = cell ? cell.maxcharge : 1
|
||||
data["on"] = on ? 1 : 0
|
||||
@@ -137,7 +138,7 @@
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
|
||||
if (!ui)
|
||||
ui = new(user, src, ui_key, "portpump.tmpl", "Portable Pump", 480, 400, state = physical_state)
|
||||
ui = new(user, src, ui_key, "portpump.tmpl", "Portable Pump", 480, 410, state = physical_state)
|
||||
ui.set_initial_data(data)
|
||||
ui.open()
|
||||
ui.set_auto_update(1)
|
||||
|
||||
@@ -103,6 +103,7 @@
|
||||
data["rate"] = round(volume_rate)
|
||||
data["minrate"] = round(minrate)
|
||||
data["maxrate"] = round(maxrate)
|
||||
data["powerDraw"] = round(last_power_draw)
|
||||
data["cellCharge"] = cell ? cell.charge : 0
|
||||
data["cellMaxCharge"] = cell ? cell.maxcharge : 1
|
||||
data["on"] = on ? 1 : 0
|
||||
|
||||
@@ -17,6 +17,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="itemLabel">
|
||||
Load:
|
||||
</div>
|
||||
<div class="itemContent">
|
||||
{{:data.powerDraw}} W
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="itemLabel">
|
||||
Cell Charge:
|
||||
@@ -54,7 +63,7 @@
|
||||
<h3>Power Regulator Status</h3>
|
||||
<div class="item">
|
||||
<div class="itemLabel">
|
||||
Volume Rate:
|
||||
Target Pressure:
|
||||
</div>
|
||||
<div class="itemContent">
|
||||
{{:helper.displayBar(data.targetpressure, data.minpressure, data.maxpressure)}}
|
||||
@@ -63,7 +72,7 @@
|
||||
{{:helper.link('-', null, {'pressure_adj' : -100}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
|
||||
{{:helper.link('-', null, {'pressure_adj' : -10}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
|
||||
{{:helper.link('-', null, {'pressure_adj' : -1}, (data.targetpressure > data.minpressure) ? null : 'disabled')}}
|
||||
<div style="float: left; width: 80px; text-align: center;"> {{:data.targetpressure}} L/s </div>
|
||||
<div style="float: left; width: 80px; text-align: center;"> {{:data.targetpressure}} kPa </div>
|
||||
{{:helper.link('+', null, {'pressure_adj' : 1}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
|
||||
{{:helper.link('+', null, {'pressure_adj' : 10}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
|
||||
{{:helper.link('+', null, {'pressure_adj' : 100}, (data.targetpressure < data.maxpressure) ? null : 'disabled')}}
|
||||
|
||||
@@ -17,6 +17,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="itemLabel">
|
||||
Load:
|
||||
</div>
|
||||
<div class="itemContent">
|
||||
{{:data.powerDraw}} W
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div class="itemLabel">
|
||||
Cell Charge:
|
||||
|
||||
Reference in New Issue
Block a user