From 77458eeeb3b5916255bb74e635c0f29dbd6b5870 Mon Sep 17 00:00:00 2001 From: Nidan Date: Mon, 14 Jan 2013 15:33:39 +0100 Subject: [PATCH 1/3] adjusting timer --- firmware/cup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/firmware/cup.c b/firmware/cup.c index a7ce9a5..c2f0cc5 100644 --- a/firmware/cup.c +++ b/firmware/cup.c @@ -10,7 +10,7 @@ #define FET0_PIN 0 #define FET1_PIN 1 -#define TIMEOUT 255 +#define TIMEOUT 51 /* 2 seconds */ uint8_t led_color = 0; @@ -72,7 +72,7 @@ ISR(PCINT0_vect) // uC ADC pin (with 1.11V reference) uint16_t linearize_temp(uint16_t temp_in) { - static const uint16_t one_point_one_volt = 65472; //2^16-2^6 + static const uint16_t one_point_one_volt = (1 << 16) - (1 << 6);/* max value from 64 adc mesaurements */ uint16_t temp_out = ~0; //burning // made from datasheet by: // for i in 677 740 807 877 951 1029 1111 1196 1286 1378 1475 1575 1679 1786 1896 2003 2103 2189; do calc 5*$i/9860*65472/1.11; done @@ -149,8 +149,9 @@ void adc_init(void) void heat_init(void) { - TCCR1B = (1 << CS12) | (1 << CS10);/* prescaler / 1024 */ + TCCR1B = (1 << WGM12) | (1 << CS10);/* some mode allowing to set timer TOP, no prescaler */ TIMSK1 = (1 << TOIE1);/* interupt on overflow */ + OCR1A = 39063; /* insert loading of heat setting here */ } From 0d2468ea08cc07478a10966e235076c33a342289 Mon Sep 17 00:00:00 2001 From: Nidan Date: Mon, 14 Jan 2013 15:45:13 +0100 Subject: [PATCH 2/3] setting softpwm values --- firmware/cup.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/firmware/cup.c b/firmware/cup.c index dbba047..a19db2c 100644 --- a/firmware/cup.c +++ b/firmware/cup.c @@ -197,7 +197,18 @@ int main(void) adc_sum = 0; adc_pos = 0; temperature = linearize_temp(temperature_adc); - heat_output = control_output(temperature, target); + if(dev_state) + { + heat_output = control_output(temperature, target); + heat_on[0] = 0; + heat_on[1] = 128; + heat_off[0] = heat_output; + heat_off[1] = heat_output + 128; + } + else + { + heat_on[0] = heat_on[1] = heat_off[0] = heat_off[1] = 0; + } } } From f506a085fba9533d81f33de016e88da0348a3eb6 Mon Sep 17 00:00:00 2001 From: Paul Goeser Date: Mon, 14 Jan 2013 15:46:33 +0100 Subject: [PATCH 3/3] alter plan upate --- PLAN | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PLAN b/PLAN index 0df77f6..837659f 100644 --- a/PLAN +++ b/PLAN @@ -1,12 +1,16 @@ Dinge die zu tun sind: +- platte und heizelemente befestigen + +- brett wachsen + +FAST FERTIG +- impulsgeber befestigen + +DONE - Schaltung entwerfen - Schaltung löten - blech sägen - brett sägen - brett aushölen - brett fasen -- innenleben planen -- impulsgeber befestigen -- platte und heizelemente befestigen u. bohren -- brett wachsen