Rewrite of passive gate, updates air injector

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -1,22 +1,38 @@
+#define REGULATE_NONE	0
+#define REGULATE_INPUT	1	//shuts off when input side is below the target pressure
+#define REGULATE_OUTPUT	2	//shuts off when output side is above the target pressure
+
+#undefine
+
 /obj/machinery/atmospherics/binary/passive_gate
-	//Tries to achieve target pressure at output (like a normal pump) except
-	//	Uses no power but can not transfer gases from a low pressure area to a high pressure area
 	icon = 'icons/atmos/passive_gate.dmi'
 	icon_state = "map"
 	level = 1
 
-	name = "Passive gate"
+	name = "pressure regulator"
-	desc = "A one-way air valve that does not require power"
+	desc = "A one-way air valve that can be used to regulate input or output pressure, and flow rate. Does not require power."
 
-	var/on = 0
+	use_power = 0
+	
+	var/on = 0	//doesn't actually use power. this is just whether the valve is open or not
 	var/target_pressure = ONE_ATMOSPHERE
-
+	var/max_pressure_setting = 15000	//kPa
+	var/set_flow_rate = ATMOS_DEFAULT_VOLUME_PUMP * 2.5
+	var/regulate_mode = REGULATE_OUTPUT
+	
+	var/flowing = 0	//for icons - becomes zero if the valve closes itself due to regulation mode
+	
 	var/frequency = 0
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+/obj/machinery/atmospherics/binary/passive_gate/New()
+	..()
+	air1.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5
+	air2.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5
+
 /obj/machinery/atmospherics/binary/passive_gate/update_icon()
-	icon_state = "[on ? "on" : "off"]"
+	icon_state = (on && flowing)? "on" : "off"
 
 /obj/machinery/atmospherics/binary/passive_gate/update_underlays()
 	if(..())
@@ -33,32 +49,54 @@
 /obj/machinery/atmospherics/binary/passive_gate/process()
 	..()
 	if(!on)
+		last_flow_rate = 0
 		return 0
 
 	var/output_starting_pressure = air2.return_pressure()
 	var/input_starting_pressure = air1.return_pressure()
 
-	if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
+	var/pressure_delta
-		//No need to pump gas if target is already reached or input pressure is too low
+	switch (regulate_mode)
-		//Need at least 10 KPa difference to overcome friction in the mechanism
+		if (REGULATE_INPUT)
-		return 1
+			pressure_delta = input_starting_pressure - target_pressure
+		if (REGULATE_OUTPUT)
+			pressure_delta = target_pressure - output_starting_pressure
+	
+	var/flowing_old = flowing
+	if((REGULATE_NONE || pressure_delta > 0.01) && (air1.temperature > 0 || air2.temperature > 0))	//since it's basically a valve, it makes sense to check both temperatures
+		flowing = 1
+		
+		//flow rate limit
+		var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles
+		
+		//Figure out how much gas to transfer to meet the target pressure.
+		switch (regulate_mode)
+			if (REGULATE_INPUT)
+				var/air_temperature = (air1.temperature > 0)? air1.temperature : air2.temperature
+				var/input_volume = air1.volume + (network1? network1.volume : 0)
+				transfer_moles = min(transfer_moles, pressure_delta*input_volume/(air_temperature * R_IDEAL_GAS_EQUATION))
+			if (REGULATE_OUTPUT)
+				var/air_temperature = (air2.temperature > 0)? air2.temperature : air1.temperature
+				var/output_volume = air2.volume + (network2? network2.volume : 0)
+				
+				transfer_moles = min(transfer_moles, pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION))	
+		
+		//pump_gas() will return a negative number if no flow occurred
+		var/flow = pump_gas(air1, air2, transfer_moles, available_power=0)	//available_power=0 means we only move gas if it would flow naturally
+		
+		if (flow >= 0)
+			if(network1)
+				network1.update = 1
 
-	//Calculate necessary moles to transfer using PV = nRT
+			if(network2)
-	if((air1.total_moles > 0) && (air1.temperature>0))
+				network2.update = 1
-		var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
+	else
-		//Can not have a pressure delta that would cause output_pressure > input_pressure
+		flowing = 0
+		last_flow_rate = 0
+	
+	if (flowing != flowing_old)
+		update_icon()
 
-		var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
-
-		//Actually transfer the gas
-		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-		air2.merge(removed)
-
-		if(network1)
-			network1.update = 1
-
-		if(network2)
-			network2.update = 1
 
 //Radio remote control
 
@@ -81,6 +119,8 @@
 		"device" = "AGP",
 		"power" = on,
 		"target_output" = target_pressure,
+		"regulate_mode" = regulate_mode,
+		"set_flow_rate" = set_flow_rate,
 		"sigtype" = "status"
 	)
 
@@ -88,15 +128,6 @@
 
 	return 1
 
-/obj/machinery/atmospherics/binary/passive_gate/interact(mob/user as mob)
-	var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
-				<b>Desirable output pressure: </b>
-				[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
-				"}
-
-	user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
-	onclose(user, "atmo_pump")
-
 /obj/machinery/atmospherics/binary/passive_gate/initialize()
 	..()
 	if(frequency)
@@ -112,13 +143,19 @@
 	if("power_toggle" in signal.data)
 		on = !on
 
-	if("set_output_pressure" in signal.data)
+	if("set_target_pressure" in signal.data)
 		target_pressure = between(
 			0,
-			text2num(signal.data["set_output_pressure"]),
+			text2num(signal.data["set_target_pressure"]),
-			ONE_ATMOSPHERE*50
+			max_pressure_setting
 		)
 
+	if("set_regulate_mode" in signal.data)
+		regulate_mode = text2num(signal.data["set_regulate_mode"])
+
+	if("set_flow_rate" in signal.data)
+		regulate_mode = text2num(signal.data["set_flow_rate"])
+
 	if("status" in signal.data)
 		spawn(2)
 			broadcast_status()
@@ -137,19 +174,71 @@
 		user << "\red Access denied."
 		return
 	usr.set_machine(src)
-	interact(user)
+	ui_interact(user)
 	return
 
+/obj/machinery/atmospherics/binary/passive_gate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	if(stat & (BROKEN|NOPOWER))
+		return
+
+	// this is the data which will be sent to the ui
+	var/data[0]
+	
+	data = list(
+		"on" = on,
+		"pressure_set" = round(target_pressure*100),	//Nano UI can't handle rounded non-integers, apparently.
+		"max_pressure" = max_pressure_setting,
+		"input_pressure" = round(air1.return_pressure()*100),
+		"output_pressure" = round(air2.return_pressure()*100),
+		"regulate_mode" = regulate_mode,
+		"set_flow_rate" = round(set_flow_rate*10),
+		"last_flow_rate" = round(last_flow_rate*10),
+	)
+
+	// update the ui if it exists, returns null if no ui is passed/found
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		// the ui does not exist, so we'll create a new() one
+		// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "pressure_regulator.tmpl", name, 470, 370)
+		ui.set_initial_data(data)	// when the ui is first opened this is the data it will use
+		ui.open()					// open the new ui window
+		ui.set_auto_update(1)		// auto update every Master Controller tick
+
+
 /obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list)
 	if(..()) return
-	if(href_list["power"])
+	
+	if(href_list["toggle_valve"])
 		on = !on
-	if(href_list["set_press"])
+	
-		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+	if(href_list["regulate_mode"])
-		src.target_pressure = max(0, min(4500, new_pressure))
+		switch(href_list["regulate_mode"])
-	usr.set_machine(src)
+			if ("off") regulate_mode = REGULATE_NONE
+			if ("input") regulate_mode = REGULATE_INPUT
+			if ("output") regulate_mode = REGULATE_OUTPUT
+	
+	switch(href_list["set_press"])
+		if ("min")
+			target_pressure = 0
+		if ("max")
+			target_pressure = max_pressure_setting
+		if ("set")
+			var/new_pressure = input(usr,"Enter new output pressure (0-[max_pressure_setting]kPa)","Pressure Control",src.target_pressure) as num
+			src.target_pressure = between(0, new_pressure, max_pressure_setting)
+	
+	switch(href_list["set_flow_rate"])
+		if ("min")
+			set_flow_rate = 0
+		if ("max")
+			set_flow_rate = air1.volume
+		if ("set")
+			var/new_flow_rate = input(usr,"Enter new flow rate limit (0-[air1.volume]kPa)","Flow Rate Control",src.set_flow_rate) as num
+			src.set_flow_rate = between(0, new_flow_rate, air1.volume)
+	
+	usr.set_machine(src)	//Is this even needed with NanoUI?
 	src.update_icon()
-	src.updateUsrDialog()
+	src.add_fingerprint(usr)
 	return
 
 /obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -1,16 +1,24 @@
+//Basically a one way passive valve. If the pressure inside is greater than the environment then gas will flow passively, 
+//but it does not permit gas to flow back from the environment into the injector. Can be turned off to prevent any gas flow.
+//When it recieves the "inject" signal, it will try to pump it's entire contents into the environment regardless of pressure, using power.
+
 /obj/machinery/atmospherics/unary/outlet_injector
 	icon = 'icons/atmos/injector.dmi'
 	icon_state = "map_injector"
 	use_power = 1
 	layer = 3
 
-	name = "Air Injector"
+	name = "air injector"
-	desc = "Has a valve and pump attached to it"
+	desc = "Passively injects air into its surroundings. Has a valve attached to it that can control flow rate."
 
+	use_power = 1
+	idle_power_usage = 5	//internal circuitry
+	var/inject_power = 15000	//15000 kW ~ 20 HP
+	
 	var/on = 0
 	var/injecting = 0
 
-	var/volume_rate = 50
+	var/volume_rate = 50	//flow rate limit
 
 	var/frequency = 0
 	var/id = null
@@ -18,6 +26,10 @@
 
 	level = 1
 
+/obj/machinery/atmospherics/unary/outlet_injector/New()
+	..()
+	air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500	//Give it a small reservoir for injecting. Also allows it to have a higher flow rate limit than vent pumps, to differentiate injectors a bit more. 
+
 /obj/machinery/atmospherics/unary/outlet_injector/update_icon()
 	if(!powered())
 		icon_state = "off"
@@ -44,31 +56,39 @@
 
 	if(!on || stat & NOPOWER)
 		return 0
+	
+	var/datum/gas_mixture/environment = loc.return_air()
 
-	if(air_contents.temperature > 0)
+	if(environment && air_contents.temperature > 0)
-		var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+		var/air_temperature = environment.temperature? environment.temperature : air_contents.temperature
+		var/pressure_delta = air_contents.return_pressure() - environment.return_pressure()
+		var/output_volume = environment.volume * environment.group_multiplier
 
-		var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+		if (pressure_delta > 0.01)
+			var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
+			transfer_moles = min(transfer_moles, (volume_rate/air_contents.volume)*air_contents.total_moles) //apply flow rate limit
 
-		loc.assume_air(removed)
+			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+			loc.assume_air(removed)
 
-		if(network)
+			if(network)
-			network.update = 1
+				network.update = 1
 
 	return 1
 
 /obj/machinery/atmospherics/unary/outlet_injector/proc/inject()
-	if(on || injecting)
+	if(on || injecting || (stat & NOPOWER))
 		return 0
 
+	var/datum/gas_mixture/environment = loc.return_air()
+	if (!environment)
+		return 0
+	
 	injecting = 1
 
 	if(air_contents.temperature > 0)
-		var/transfer_moles = (air_contents.return_pressure())*volume_rate/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
+		var/power_used = pump_gas(air_contents, environment, air_contents.total_moles, inject_power)
-
+		use_power(power_used)
-		var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
-		loc.assume_air(removed)
 
 		if(network)
 			network.update = 1
@@ -112,9 +132,11 @@
 
 	if(signal.data["power"])
 		on = text2num(signal.data["power"])
+		update_use_power(on)
 
 	if(signal.data["power_toggle"])
 		on = !on
+		update_use_power(on)
 
 	if(signal.data["inject"])
 		spawn inject()
@@ -129,8 +151,6 @@
 			broadcast_status()
 		return //do not update_icon
 
-		//log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
-		//return
 	spawn(2)
 		broadcast_status()
 	update_icon()

nano/templates/pressure_regulator.tmpl

@@ -0,0 +1,76 @@
+<div class="item">
+	<div class="itemLabel">
+		Input Pressure:
+	</div>
+	<div class="itemContent">
+		{{:(data.input_pressure/100)}} kPa
+	</div>
+</div>
+
+<div class="item">
+	<div class="itemLabel">
+		Output Pressure:
+	</div>
+	<div class="itemContent">
+		{{:(data.output_pressure/100)}} kPa
+	</div>
+</div>
+
+<div class="item">
+	<div class="itemLabel">
+		Flow Rate:
+	</div>
+	<div class="itemContent">
+		<div class="statusValue">
+			{{:(data.last_flow_rate/10)}} L/s
+		</div>
+	</div>
+</div>
+
+<hr>
+
+<div class="item">
+	<div class="itemLabel">
+		Valve:
+	</div>
+	<div class="itemContent">
+		{{:helper.link(data.on? 'Open' : 'Closed', null, {'toggle_valve' : 1})}}
+	</div>
+</div>
+
+<div class="item">
+	<div class="itemLabel">
+		Pressure Regulation:
+	</div>
+	<div class="itemContent">
+		{{:helper.link('Off', null, {'regulate_mode' : 'off'}, data.regulate_mode == 0? 'selected' : null)}}
+		{{:helper.link('Input', null, {'regulate_mode' : 'input'}, data.regulate_mode == 1? 'selected' : null)}}
+		{{:helper.link('Output', null, {'regulate_mode' : 'output'}, data.regulate_mode == 2? 'selected' : null)}}
+	</div>
+</div>
+
+<div class="item">
+	<div class="itemLabel">
+		Target Pressure:
+	</div>
+	<div class="itemContent">
+		<div style="clear: both; padding-top: 4px;">
+			{{:helper.link('MAX', null, {'set_press' : 'max'}, null)}}
+			{{:helper.link('SET', null, {'set_press' : 'set'}, null)}}
+			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.pressure_set/100)}} kPa&nbsp;</div>
+		</div>
+	</div>
+</div>
+
+<div class="item">
+	<div class="itemLabel">
+		Flow Rate Limit:
+	</div>
+	<div class="itemContent">
+		<div style="clear: both; padding-top: 4px;">
+			{{:helper.link('MAX', null, {'set_flow_rate' : 'max'}, null)}}
+			{{:helper.link('SET', null, {'set_flow_rate' : 'set'}, null)}}
+			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:(data.set_flow_rate/10)}} L/s&nbsp;</div>
+		</div>
+	</div>
+</div>