Merge pull request #11 from SnorreSelmer/filtration
Fixed a comment, removed some redundant code
This commit is contained in:
commit
a8fb402ef2
@ -15,6 +15,7 @@ define liquid_wall_coolers -1369060582 # Wall Coolers (Liquid)
|
|||||||
define temp_convert 273
|
define temp_convert 273
|
||||||
|
|
||||||
start:
|
start:
|
||||||
|
yield
|
||||||
# establish min- and max-temps to registry
|
# establish min- and max-temps to registry
|
||||||
l variance temp_variance Setting
|
l variance temp_variance Setting
|
||||||
l min_temp thermostat Setting
|
l min_temp thermostat Setting
|
||||||
@ -34,12 +35,11 @@ sub curr_temp curr_temp temp_convert
|
|||||||
bgt curr_temp max_temp cooling
|
bgt curr_temp max_temp cooling
|
||||||
blt curr_temp min_temp heating
|
blt curr_temp min_temp heating
|
||||||
|
|
||||||
yield
|
|
||||||
|
|
||||||
# Go to start again
|
# Go to start again
|
||||||
j start
|
j start
|
||||||
|
|
||||||
cooling:
|
cooling:
|
||||||
|
yield
|
||||||
# read ambient temp from sensor and convert to C
|
# read ambient temp from sensor and convert to C
|
||||||
l curr_temp gas_sensor Temperature
|
l curr_temp gas_sensor Temperature
|
||||||
sub curr_temp curr_temp temp_convert
|
sub curr_temp curr_temp temp_convert
|
||||||
@ -50,15 +50,15 @@ sgt cooling_active curr_temp target_temp
|
|||||||
# send state to coolers
|
# send state to coolers
|
||||||
sb wall_coolers On cooling_active
|
sb wall_coolers On cooling_active
|
||||||
sb liquid_wall_coolers On cooling_active
|
sb liquid_wall_coolers On cooling_active
|
||||||
yield
|
|
||||||
|
|
||||||
# if curr_temp is lower than target, keep cooling
|
# if curr_temp is higher than target, keep cooling
|
||||||
bgt curr_temp target_temp cooling
|
bgt curr_temp target_temp cooling
|
||||||
|
|
||||||
# ...if not, go to start again
|
# ...if not, go to start again
|
||||||
j start
|
j start
|
||||||
|
|
||||||
heating:
|
heating:
|
||||||
|
yield
|
||||||
# read ambient temp from sensor and convert to C
|
# read ambient temp from sensor and convert to C
|
||||||
l curr_temp gas_sensor Temperature
|
l curr_temp gas_sensor Temperature
|
||||||
sub curr_temp curr_temp temp_convert
|
sub curr_temp curr_temp temp_convert
|
||||||
@ -68,7 +68,6 @@ slt heating_active curr_temp target_temp
|
|||||||
|
|
||||||
# send state to heaters
|
# send state to heaters
|
||||||
sb wall_heaters On heating_active
|
sb wall_heaters On heating_active
|
||||||
yield
|
|
||||||
|
|
||||||
# if curr_temp is lower than target, keep heating
|
# if curr_temp is lower than target, keep heating
|
||||||
blt curr_temp target_temp heating
|
blt curr_temp target_temp heating
|
||||||
|
@ -6,7 +6,6 @@ alias sensor d0
|
|||||||
alias v_angle r0
|
alias v_angle r0
|
||||||
alias h_angle r1
|
alias h_angle r1
|
||||||
|
|
||||||
define sunrise -90
|
|
||||||
define solar_panel_hash -539224550
|
define solar_panel_hash -539224550
|
||||||
define heavy_solar_panel_hash -1545574413
|
define heavy_solar_panel_hash -1545574413
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user