From 8b5ada17459a551a2d66218474a1635b99820ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20K=C3=B6gl?= Date: Tue, 23 Oct 2012 19:23:57 +0200 Subject: [PATCH] sync --- reflowctl/reflowctl.ino | 222 ++++++++++++++++++++++++---------------- 1 file changed, 135 insertions(+), 87 deletions(-) diff --git a/reflowctl/reflowctl.ino b/reflowctl/reflowctl.ino index 79770a5..6433ab1 100644 --- a/reflowctl/reflowctl.ino +++ b/reflowctl/reflowctl.ino @@ -3,15 +3,16 @@ #include // states -#define START_STATE 0 -#define PREHEAT_STATE 1 -#define RAMP_UP_STATE 2 -#define TAL_FIRST_STATE 3 -#define PEAK_STATE 4 -#define TAL_SECOND_STATE 5 -#define RAMP_DOWN_STATE 6 -#define END_STATE 7 -#define ERROR_STATE 8 +#define CONFIG_STATE 0 +#define START_STATE 1 +#define PREHEAT_STATE 2 +#define RAMP_UP_STATE 3 +#define TAL_FIRST_STATE 4 +#define PEAK_STATE 5 +#define TAL_SECOND_STATE 6 +#define RAMP_DOWN_STATE 7 +#define END_STATE 8 +#define ERROR_STATE 9 // error conditions #define E_DT_MIN 1 // temperature dt too small @@ -30,26 +31,50 @@ unsigned int temperature = 25; // actual oven temp unsigned int last_temperature = 25; // last oven temp int actual_dt = 0; // actual difference from last to actual temperatur -// profile temperatures -unsigned int Ts_min = 150; // °C -unsigned int Ts_max = 200; // °C -unsigned int Tl = 217; // 217°C -unsigned int Tp = 260; // 245-260°C -unsigned int time_max = 480; // 8*60s max -// profile temp per second rates -unsigned int ramp_up_rate_min = 0; // not used yet -unsigned int ramp_up_rate_max = 50; // 3°C/s -unsigned int ramp_down_max = 6; // 6°C/s max -unsigned int ramp_down_min = 2; // 2°C/s max +typedef struct { + // profile temperatures + unsigned int Ts_min; + unsigned int Ts_max; + unsigned int Tl; + unsigned int Tp; + unsigned int time_max; -// profile temp durations -unsigned int Ts_duration_min = 60; // s -unsigned int Ts_duration_max = 180; // s -unsigned int Tl_duration_min = 60; // 60-150s -unsigned int Tl_duration_max = 150; // 60-150s -unsigned int Tp_duration_min = 20; // 20-40s -unsigned int Tp_duration_max = 40; // 20-40s + // profile temp per second rates + int ramp_up_rate_min; + int ramp_up_rate_max; + int ramp_down_max; + int ramp_down_min; + + // profile temp durations + unsigned int Ts_duration_min; + unsigned int Ts_duration_max; + unsigned int Tl_duration_min; + unsigned int Tl_duration_max; + unsigned int Tp_duration_min; + unsigned int Tp_duration_max; +} Profile; + +struct Profile profile {150, // °C + unsigned int Ts_max = 200; // °C + unsigned int Tl = 217; // 217°C + unsigned int Tp = 260; // 245-260°C + unsigned int time_max = 480; // 8*60s max + + // profile temp per second rates + int ramp_up_rate_min = 0; // not used yet + unsigned int ramp_up_rate_max = 50; // 3°C/s + unsigned int ramp_down_max = 6; // 6°C/s max + unsigned int ramp_down_min = 2; // 2°C/s max + + // profile temp durations + unsigned int Ts_duration_min = 60; // s + unsigned int Ts_duration_max = 180; // s + unsigned int Tl_duration_min = 60; // 60-150s + unsigned int Tl_duration_max = 150; // 60-150s + unsigned int Tp_duration_min = 20; // 20-40s + unsigned int Tp_duration_max = 40; // 20-40s +} Profile; // timestamps of event beginnings/ends unsigned int Ts_time_start = 0; @@ -60,24 +85,24 @@ unsigned int Tp_time_start = 0; unsigned int Tp_time_end = 0; // thermostat -unsigned int set_min = 0; -unsigned int set_max = 0; -int set_dt_min = 0; -int set_dt_max = 0; +static unsigned int set_min = 0; +static unsigned int set_max = 0; +static int set_dt_min = 0; +static int set_dt_max = 0; // state machine -unsigned int error_condition = 0; -byte state = 0; -boolean is_oven_heating = false; +static unsigned int error_condition = 0; +static byte state = 0; +static boolean is_oven_heating = false; // ui stuff -boolean led_on = false; -boolean disable_checks = true; +static boolean led_on = false; +static boolean disable_checks = true; //Pin assignments for SainSmart LCD Keypad Shield -LiquidCrystal lcd(8, 9, 4, 5, 6, 7); -DFR_Key keypad; +static LiquidCrystal lcd(8, 9, 4, 5, 6, 7); +static DFR_Key keypad; void setup() { Serial.begin(9600); @@ -85,7 +110,7 @@ void setup() { pinMode(13, OUTPUT); pinMode(2, INPUT); set_start_state(); - + lcd.begin(16, 2); lcd.clear(); keypad.setRate(10); @@ -93,23 +118,38 @@ void setup() { void print_profile_state() { - String tmp("P: "); + String tmp("Profile: "); tmp += state; tmp += "/"; - tmp += error_condition; + tmp += END_STATE; lcd.setCursor(0, 1); lcd.print(tmp); } void print_status() { - String tmp("s: "); + String tmp("T: "); + if (time < 10) + tmp += "00"; + else if (time < 100) + tmp += "0"; tmp += time; - tmp += " C: "; + tmp += " Tmp: "; + if (temperature < 10) + tmp += "00"; + else if (temperature < 100) + tmp += "0"; tmp += temperature; lcd.setCursor(0, 0); lcd.print(tmp); } +void print_config_state() { + + for (;;) { + + } +} + /* led edit mode procedures * global menu (up/down) -> select * start @@ -118,7 +158,11 @@ void print_status() { * value (up/down) -> select | left * */ -void print_edit() { + + +void get_time() { + if (state>0) + time++; } void control_oven() { @@ -400,52 +444,56 @@ void handle_error_state() { void loop() { - time = millis() / 1000; + get_time(); get_temp(); check_dt(); -// if (!error_condition) { -// print_debug(); -// } -// else { -// set_error_state(); -// } -// -// switch (state) { -// case START_STATE: -// handle_start_state(); -// break; -// case PREHEAT_STATE: -// handle_preheat_state(); -// break; -// case RAMP_UP_STATE: -// handle_ramp_up_state(); -// break; -// case TAL_FIRST_STATE: -// handle_tal_first_state(); -// break; -// case PEAK_STATE: -// handle_peak_state(); -// break; -// case TAL_SECOND_STATE: -// Tl_time_end = time; -// handle_tal_second_state(); -// break; -// case RAMP_DOWN_STATE: -// handle_ramp_down_state(); -// break; -// case END_STATE: -// handle_end_state(); -// break; -// case ERROR_STATE: -// handle_error_state(); -// break; -// default: -// break; -// } -// -// control_oven(); - lcd.clear(); + if (!error_condition) { + print_debug(); + } + else { + set_error_state(); + } + + switch (state) { + case CONFIG_STATE: + handle_config_state(); + print_config_state() + break; + case START_STATE: + handle_start_state(); + break; + case PREHEAT_STATE: + handle_preheat_state(); + break; + case RAMP_UP_STATE: + handle_ramp_up_state(); + break; + case TAL_FIRST_STATE: + handle_tal_first_state(); + break; + case PEAK_STATE: + handle_peak_state(); + break; + case TAL_SECOND_STATE: + Tl_time_end = time; + handle_tal_second_state(); + break; + case RAMP_DOWN_STATE: + handle_ramp_down_state(); + break; + case END_STATE: + handle_end_state(); + break; + case ERROR_STATE: + handle_error_state(); + break; + default: + break; + } + + control_oven(); +// lcd.clear(); print_debug(); print_status(); print_profile_state();