From cf4ebc0200681de117b5d0a19d1ae4ae5870d291 Mon Sep 17 00:00:00 2001
From: Snorre Selmer <snorre.selmer@gmail.com>
Date: Sun, 25 Sep 2022 13:46:15 +0200
Subject: [PATCH] Fixed pressure-defines

---
 gas_mixer.ic10 | 70 ++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/gas_mixer.ic10 b/gas_mixer.ic10
index a6d6911..48c65ca 100644
--- a/gas_mixer.ic10
+++ b/gas_mixer.ic10
@@ -3,61 +3,59 @@
 # and a Kit (Button, moment type) to trigger purge.
 # Gas mixer ratio is manually set!
 
-alias TankA d0
-alias TankB d1
-alias TankOut d2
-alias Mixer d3
-alias Pump d4
-alias Button d5
+alias tank_a d0
+alias tank_b d1
+alias tank_out d2
+alias mixer d3
+alias pump d4
+alias button d5
 
-alias TankAPress r0
-alias TankBPress r1
-alias TankOutPress r2
-alias TankAOK r3
-alias TankBOK r4
-alias TankOutOK r5
-alias MixerRun r6
-alias PurgeActivate r7
+alias tank_a_press r0
+alias tank_b_press r1
+alias tank_out_press r2
+alias tank_a_ok r3
+alias tank_b_ok r4
+alias tank_out_ok r5
+alias mixer_run r6
+alias purge_activate r7
 
-# Stops mixing if either input-gas is below 500kPa
-define PRESSINMIN 500
-# Stops mixing if output-tank is "full"
-define PRESSOUTMAX 58000
+define PRESS_IN_MIN 500 # 500kPa
+define PRESS_OUT_MAX 2000 # 2MPa
 
 # Sets purge pump to max output
-l TankAPress Pump Maximum
-s Pump Setting TankAPress
+l tank_a_press pump Maximum
+s pump Setting tank_a_press
 
 start:
 yield
-s Pump On 0 # Ensures purge pump is off
+s pump On 0 # Ensures purge pump is off
 # Checks is purge is activated
-l PurgeActivate Button Setting
-bgtz PurgeActivate purge
+l purge_activate button Setting
+bgtz purge_activate purge
 
 # Loads tank pressures
-l TankAPress TankA Pressure
-l TankBPress TankB Pressure
-l TankOutPress TankOut Pressure
+l tank_a_press tank_a Pressure
+l tank_b_press tank_b Pressure
+l tank_out_press tank_out Pressure
 
 # Checks if pressures are within tolerances
-sgt TankAOK TankAPress PRESSINMIN
-sgt TankBOK TankBPress PRESSINMIN
-slt TankOutOK TankOutPress PRESSOUTMAX
+sgt tank_a_ok tank_a_press PRESS_IN_MIN
+sgt tank_b_ok tank_b_press PRESS_IN_MIN
+slt tank_out_ok tank_out_press PRESS_OUT_MAX
 
-and MixerRun TankAOK TankBOK
-and MixerRun TankOutOK MixerRun
+and mixer_run tank_a_ok tank_b_ok
+and mixer_run tank_out_ok mixer_run
 
 # Activates mixer if all is ok
-s Mixer On MixerRun
+s mixer On mixer_run
 j start
 
 purge:
 yield
-s Mixer On 0 # Turns mixer off
+s mixer On 0 # Turns mixer off
 # Gets output tank pressure
-l TankOutPress TankOut Pressure
-s Pump On 1 # Activates purge pump
+l tank_out_press tank_out Pressure
+s pump On 1 # Activates purge pump
 # Runs pump until tank is empty
-bgtz TankOutPress purge
+bgtz tank_out_press purge
 j start
\ No newline at end of file