stklcode/senseo-control
stklcode/senseo-control
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Code reformatted

Browse Source 
Constants for pump times in main.h (more readable code, easier to adjust)

git-svn-id: https://svn.404-net.de/repos/senseoControl/trunk@9 e16d0e86-71da-4a9f-96c8-a2496b660ed8
This commit is contained in:
Stefan Kalscheuer 2014-11-22 15:57:15 +00:00
parent 8bc37cee7d
commit db8dbb52e0
2 changed files with 394 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
main.c
View File

@ -21,7 +21,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "main.h" #include "main.h"
// variables // variables:
volatile unsigned int time_counter, user_time_counter = 0, sec_counter = 0; // global and universal time counter (ms) and second-counter (for AutoOff) volatile unsigned int time_counter, user_time_counter = 0, sec_counter = 0; // global and universal time counter (ms) and second-counter (for AutoOff)
volatile unsigned int button_1_cup_counter = 0, button_2_cup_counter = 0; // button counter volatile unsigned int button_1_cup_counter = 0, button_2_cup_counter = 0; // button counter
volatile unsigned char button_power_counter = 0; volatile unsigned char button_power_counter = 0;
@ -36,7 +36,8 @@ int main(void)
while (1) // main loop while (1) // main loop
{ {
if (sec_counter >= AUTO_OFF_THRESHOLD) button_power_counter = BUTTON_THRESHOLD; // check for AutoOff Timer (generate OnOff-button push) if (sec_counter >= AUTO_OFF_THRESHOLD)
button_power_counter = BUTTON_THRESHOLD; // check for AutoOff Timer (generate OnOff-button push)
water = get_water (); // update water state water = get_water (); // update water state
temperature = get_temperature (); // update temperature temperature = get_temperature (); // update temperature
@ -46,23 +47,27 @@ int main(void)
set_bit(TRIAC_BOILER_w, TRIAC_BOILER_pin); // Boiler off set_bit(TRIAC_BOILER_w, TRIAC_BOILER_pin); // Boiler off
make_coffee = 0; // clear coffee flag make_coffee = 0; // clear coffee flag
while (button_power_counter > 0); // wait until button is releasd (debounce) while (button_power_counter > 0)
; // wait until button is releasd (debounce)
power_off (); // call power off sequence power_off (); // call power off sequence
button_power_counter = BUTTON_THRESHOLD; // debounce again after wake up button_power_counter = BUTTON_THRESHOLD; // debounce again after wake up
while (button_power_counter > 0); while (button_power_counter > 0)
;
} }
if (button_1_cup_counter >= BUTTON_CLEAN_THR
if (button_1_cup_counter >= BUTTON_CLEAN_THR && button_2_cup_counter >= BUTTON_CLEAN_THR ) // both coffee buttons pushed: clean mode: && button_2_cup_counter >= BUTTON_CLEAN_THR) // both coffee buttons pushed: clean mode:
{ {
make_clean = true; // clean flag true make_clean = true; // clean flag true
led = 0b00010000; // set blue LED led = 0b00010000; // set blue LED
while (button_1_cup_counter > 0 && button_2_cup_counter > 0); // debounce buttons while (button_1_cup_counter > 0 && button_2_cup_counter > 0)
; // debounce buttons
} }
else if (button_1_cup_counter >= BUTTON_THRESHOLD && button_2_cup_counter < BUTTON_THRESHOLD) // left coffee button pushed: call espresso else if (button_1_cup_counter >= BUTTON_THRESHOLD
&& button_2_cup_counter < BUTTON_THRESHOLD) // left coffee button pushed: call espresso
{ {
sec_counter = 0; // reset AutoOff counter sec_counter = 0; // reset AutoOff counter
@ -76,12 +81,13 @@ int main(void)
button_1_cup_counter = 0; // clear button counter button_1_cup_counter = 0; // clear button counter
} }
} }
if(make_coffee != 1) make_coffee = 3; // set coffee flag to 3 (1 coffee) else if (make_coffee != 1)
make_coffee = 3; // set coffee flag to 3 (1 coffee) else
} }
} }
else if (button_1_cup_counter < BUTTON_THRESHOLD
else if (button_1_cup_counter < BUTTON_THRESHOLD && button_2_cup_counter >= BUTTON_THRESHOLD) // right coffee button pushed: call coffee && button_2_cup_counter >= BUTTON_THRESHOLD) // right coffee button pushed: call coffee
{ {
sec_counter = 0; // reset AutoOff counter sec_counter = 0; // reset AutoOff counter
@ -95,28 +101,31 @@ int main(void)
button_2_cup_counter = 0; // clear button counter button_2_cup_counter = 0; // clear button counter
} }
} }
if(make_coffee != 2) make_coffee = 4; // set coffee flag to 4 (2 coffee) else if (make_coffee != 2)
make_coffee = 4; // set coffee flag to 4 (2 coffee) else
} }
} }
if (water) // water OK: if (water) // water OK:
{ {
if (make_clean) // if clean-flag is set: if (make_clean) // if clean-flag is set:
{ {
set_bit(TRIAC_BOILER_w, TRIAC_BOILER_pin); // boiler off set_bit(TRIAC_BOILER_w, TRIAC_BOILER_pin); // boiler off
bool escape = false; // init escape-flag bool escape = false; // init escape-flag
while (water && !escape) { // pump until water is empty or escape flag is set while (water && !escape)
{ // pump until water is empty or escape flag is set
unsigned int sense = detect_zero_crossing (); // detect zero crossing unsigned int sense = detect_zero_crossing (); // detect zero crossing
if (sense <= 100) { if (sense <= 100)
{
clear_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin); // generate trigger impulse for pump triac clear_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin); // generate trigger impulse for pump triac
_delay_ms (3); _delay_ms (3);
set_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin); set_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin);
} }
water = get_water (); // update water state water = get_water (); // update water state
if (button_power_counter > BUTTON_THRESHOLD) escape = true; // check for power button counter and set escape flag if (button_power_counter > BUTTON_THRESHOLD)
escape = true; // check for power button counter and set escape flag
} }
make_clean = false; // clear clean flag make_clean = false; // clear clean flag
} }
@ -129,21 +138,29 @@ int main(void)
if (make_coffee > 0) // if coffee flag is set: if (make_coffee > 0) // if coffee flag is set:
{ {
if(make_coffee<3) led = 0b00001010; // set orange LED blink if (make_coffee < 3)
else led = 0b00001000; // set green LED blink led = 0b00001010; // set orange LED blink
else
led = 0b00001000; // set green LED blink
if (make_coffee == 1) pump_time = 15; // 1 cup of espresso (2s preinfusion included) if (make_coffee == 1)
else if (make_coffee == 2) pump_time = 28; // 2 cups of espresso (2s preinfusion included) pump_time = TIME_1_ESPRESSO; // 1 cup of espresso (2s preinfusion included)
else if (make_coffee == 3) pump_time = 26; // 1 cup of coffee else if (make_coffee == 2)
else if (make_coffee == 4) pump_time = 52; // 2 cups of coffee pump_time = TIME_2_ESPRESSO; // 2 cups of espresso (2s preinfusion included)
else make_coffee = 0; else if (make_coffee == 3)
pump_time = TIME_1_COFFEE; // 1 cup of coffee
else if (make_coffee == 4)
pump_time = TIME_2_COFFEE; // 2 cups of coffee
else
make_coffee = 0;
user_time_counter = 0; // reset user time counter user_time_counter = 0; // reset user time counter
bool escape = false; // init escape flag bool escape = false; // init escape flag
while (user_time_counter < (pump_time * 1000) && water && !escape) // loop until pump time is reached or water is empty while (user_time_counter < (pump_time * 1000) && water && !escape)
{ { // loop until pump time is reached or water is empty
if(make_coffee > 2 || if (make_coffee > 2
(user_time_counter < 2000 || user_time_counter > 4000) ) { // check for preinfusion break || (user_time_counter < 2000 || user_time_counter > 4000))
{ // check for preinfusion break
unsigned int sense = detect_zero_crossing (); // detect zero crossing unsigned int sense = detect_zero_crossing (); // detect zero crossing
if (sense <= 100) if (sense <= 100)
{ {
@ -155,7 +172,8 @@ int main(void)
water = get_water (); // update water state water = get_water (); // update water state
if (button_power_counter > BUTTON_THRESHOLD) escape = true; // check for power button counter and set escape flag if (button_power_counter > BUTTON_THRESHOLD)
escape = true; // check for power button counter and set escape flag
} }
set_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin); // pump off set_bit(TRIAC_PUMP_w, TRIAC_PUMP_pin); // pump off
@ -265,7 +283,6 @@ void power_off()
sei (); // enable interrupts sei (); // enable interrupts
} }
/* function: get_water() /* function: get_water()
* return: true water OK * return: true water OK
* false not enough water * false not enough water
@ -278,7 +295,8 @@ bool get_water()
set_bit(ADCSR, ADSC); set_bit(ADCSR, ADSC);
loop_until_bit_is_clear (ADCSR, ADSC); loop_until_bit_is_clear (ADCSR, ADSC);
unsigned char sense = ADCH; unsigned char sense = ADCH;
if ((water && sense > WATER_LOW) || (!water && sense >= WATER_OK)) return true; if ((water && sense > WATER_LOW) || (!water && sense >= WATER_OK))
return true;
return false; return false;
} }
@ -294,7 +312,8 @@ bool get_temperature()
set_bit(ADCSR, ADSC); set_bit(ADCSR, ADSC);
loop_until_bit_is_clear (ADCSR, ADSC); loop_until_bit_is_clear (ADCSR, ADSC);
unsigned char sense = ADCH; unsigned char sense = ADCH;
if (sense >= OPERATING_TEMPERATURE) return true; if (sense >= OPERATING_TEMPERATURE)
return true;
return false; return false;
} }
@ -313,8 +332,6 @@ unsigned int detect_zero_crossing()
return (sense_H << 8) | sense_L; return (sense_H << 8) | sense_L;
} }
/* interrupt function: INT0_vect /* interrupt function: INT0_vect
* *
* Dummy function for wake-up. * Dummy function for wake-up.
@ -323,47 +340,72 @@ ISR(INT0_vect)
{ {
} }
/* interrupt function: TIMER1_OVF1_vect /* interrupt function: TIMER1_OVF1_vect
* *
* Timer interrupt. Increments counters and controls LED. * Timer interrupt. Increments counters and controls LED.
*/ */
// Millisekundenzähler, LED-Steuerung, Tastenzähler
ISR ( TIMER1_OVF1_vect) ISR ( TIMER1_OVF1_vect)
{ {
if (time_counter < 1000) time_counter++; // blobal milliseconds counter und seconds counter (für AutoOff) if (time_counter < 1000)
else { time_counter++; // global milliseconds counter and seconds counter (for AutoOff)
else
{
time_counter = 0; time_counter = 0;
sec_counter++; sec_counter++;
} }
user_time_counter++; // universal counter (for pump time) user_time_counter++; // universal counter (for pump time)
bool leds_blink_on; // status flag for blinking LEDs with 1Hz bool leds_blink_on; // status flag for blinking LEDs with 1Hz
if (time_counter < 499) leds_blink_on = true; if (time_counter < 499)
else leds_blink_on = false; leds_blink_on = true;
else
leds_blink_on = false;
if (led & ( 1 << LED_RED_ON ) || (led & ( 1 << LED_RED_BLINK ) && leds_blink_on)) set_bit(LED_RED_w, LED_RED_pin); if (led & (1 << LED_RED_ON) || (led & (1 << LED_RED_BLINK) && leds_blink_on))
else clear_bit(LED_RED_w, LED_RED_pin); set_bit(LED_RED_w, LED_RED_pin);
if (led & ( 1 << LED_GREEN_ON ) || (led & ( 1 << LED_GREEN_BLINK ) && leds_blink_on)) set_bit(LED_GREEN_w, LED_GREEN_pin); else
else clear_bit(LED_GREEN_w, LED_GREEN_pin); clear_bit(LED_RED_w, LED_RED_pin);
if (led & ( 1 << LED_BLUE_ON ) || (led & ( 1 << LED_BLUE_BLINK ) && leds_blink_on)) set_bit(LED_BLUE_w, LED_BLUE_pin); if (led & (1 << LED_GREEN_ON)
else clear_bit(LED_BLUE_w, LED_BLUE_pin); || (led & (1 << LED_GREEN_BLINK) && leds_blink_on))
set_bit(LED_GREEN_w, LED_GREEN_pin);
else
clear_bit(LED_GREEN_w, LED_GREEN_pin);
if (led & (1 << LED_BLUE_ON)
|| (led & (1 << LED_BLUE_BLINK) && leds_blink_on))
set_bit(LED_BLUE_w, LED_BLUE_pin);
else
clear_bit(LED_BLUE_w, LED_BLUE_pin);
if (bit_is_clear(BUTTON_1_CUP_r, BUTTON_1_CUP_pin)) { // left button counter if (bit_is_clear (BUTTON_1_CUP_r, BUTTON_1_CUP_pin))
if (button_1_cup_counter < 65535) button_1_cup_counter++; { // left button counter
} else { if (button_1_cup_counter < 65535)
if (button_1_cup_counter > 0) button_1_cup_counter--; button_1_cup_counter++;
}
else
{
if (button_1_cup_counter > 0)
button_1_cup_counter--;
} }
if (bit_is_clear(BUTTON_2_CUP_r, BUTTON_2_CUP_pin)) { // right button counter if (bit_is_clear (BUTTON_2_CUP_r, BUTTON_2_CUP_pin))
if (button_2_cup_counter < 65535) button_2_cup_counter++; { // right button counter
} else { if (button_2_cup_counter < 65535)
if (button_2_cup_counter > 0) button_2_cup_counter--; button_2_cup_counter++;
}
else
{
if (button_2_cup_counter > 0)
button_2_cup_counter--;
} }
if (bit_is_clear(BUTTON_POWER_r, BUTTON_POWER_pin)) { // power button counter if (bit_is_clear (BUTTON_POWER_r, BUTTON_POWER_pin))
if (button_power_counter < 255) button_power_counter++; { // power button counter
} else { if (button_power_counter < 255)
if (button_power_counter > 0) button_power_counter--; button_power_counter++;
}
else
{
if (button_power_counter > 0)
button_power_counter--;
} }
} }

15
main.h
View File

@ -7,11 +7,22 @@
* License: GNU GPL v3 (see License.txt) * License: GNU GPL v3 (see License.txt)
*/ */
/*******************
* USER SETTINGS
*/
#define TIME_1_ESPRESSO 15 // pump times in seconds
#define TIME_2_ESPRESSO 28
#define TIME_1_COFFEE 26
#define TIME_2_COFFEE 52
#define OPERATING_TEMPERATURE 125 // ADC threshold for water temperature
/*
*******************
*/
// functions for setting and clearing bits // functions for setting and clearing bits
#define set_bit(var, bit) ((var) |= (1 << (bit))) #define set_bit(var, bit) ((var) |= (1 << (bit)))
#define clear_bit(var, bit) ((var) &= (unsigned)~(1 << (bit))) #define clear_bit(var, bit) ((var) &= (unsigned)~(1 << (bit)))
#define ZERO_CROSSING_w PORTA // zero crossing detection #define ZERO_CROSSING_w PORTA // zero crossing detection
#define ZERO_CROSSING_r PINA #define ZERO_CROSSING_r PINA
#define ZERO_CROSSING_pin 0 #define ZERO_CROSSING_pin 0
@ -69,8 +80,6 @@
#define SENSOR_TEMP_ddr DDRA #define SENSOR_TEMP_ddr DDRA
#define SENSOR_TEMP_adc 3 #define SENSOR_TEMP_adc 3
#define OPERATING_TEMPERATURE 115 // ADC threshold for water temperature
#define TRIAC_BOILER_w PORTA // boiler triac #define TRIAC_BOILER_w PORTA // boiler triac
#define TRIAC_BOILER_r PINA #define TRIAC_BOILER_r PINA
#define TRIAC_BOILER_pin 6 #define TRIAC_BOILER_pin 6