diff --git a/config.py.EXAMPLE b/config.py.EXAMPLE index 304a12f..a963b4e 100644 --- a/config.py.EXAMPLE +++ b/config.py.EXAMPLE @@ -1,33 +1,58 @@ import logging -#Logging +######################################################################## +# +# General options + +### Logging log_level = logging.INFO log_format = '%(asctime)s %(levelname)s %(name)s: %(message)s' -#Server +### Server listening_ip = "0.0.0.0" listening_port = 8080 -#GPIOs -gpio_heat = 11 -gpio_cool = 10 -gpio_air = 9 +######################################################################## +# +# GPIO Setup (BCM SoC Numbering Schema) +# +# Check the RasPi docs to see where these GPIOs are +# connected on the P1 header for your board type/rev. +# These were tested on a Pi B Rev2 but of course you +# can use whichever GPIO you prefer/have available. + +### Outputs +gpio_heat = 11 # Switches zero-cross solid-state-relay +gpio_cool = 10 # Regulates PWM for 12V DC Blower +gpio_air = 9 # Switches 0-phase det. solid-state-relay + +### Inputs gpio_door = 18 + +### MAX31855 K-Type Thermocouple I2C gpio_sensor_cs = 27 gpio_sensor_clock = 22 gpio_sensor_data = 17 -#PID parameters -pid_ki = 0.1 #Integration -pid_kd = 0.4 #Derivative -pid_kp = 0.5 #Proportional -#Simulation parameters -sim_t_env = 25.0 #deg C -sim_c_heat = 100.0 #J/K heat capacity of heat element -sim_c_oven = 2000.0 #J/K heat capacity of oven -sim_p_heat = 3500.0 #W heating power of oven -sim_R_o_nocool = 1.0 #K/W thermal resistance oven -> environment -sim_R_o_cool = 0.05 #K/W " with cooling -sim_R_ho_noair = 0.1 #K/W thermal resistance heat element -> oven -sim_R_ho_air = 0.05 #K/W " with internal air circulation +######################################################################## +# +# PID parameters + +pid_ki = 0.1 # Integration +pid_kd = 0.4 # Derivative +pid_kp = 0.5 # Proportional + + +######################################################################## +# +# Simulation parameters + +sim_t_env = 25.0 # deg C +sim_c_heat = 100.0 # J/K heat capacity of heat element +sim_c_oven = 2000.0 # J/K heat capacity of oven +sim_p_heat = 3500.0 # W heating power of oven +sim_R_o_nocool = 1.0 # K/W thermal resistance oven -> environment +sim_R_o_cool = 0.05 # K/W " with cooling +sim_R_ho_noair = 0.1 # K/W thermal resistance heat element -> oven +sim_R_ho_air = 0.05 # K/W " with internal air circulation diff --git a/public/assets/js/jquery.flot.draggable.js b/public/assets/js/jquery.flot.draggable.js index f6cd1a5..f5a0357 100644 --- a/public/assets/js/jquery.flot.draggable.js +++ b/public/assets/js/jquery.flot.draggable.js @@ -77,6 +77,8 @@ } plot.draw(); + + // hack to update the profile points after dragging graph in edit mode updateProfileTable(); var retx = points[didx*ps];