summaryrefslogtreecommitdiff
path: root/ferment.c
diff options
context:
space:
mode:
Diffstat (limited to 'ferment.c')
-rw-r--r--ferment.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/ferment.c b/ferment.c
index b0d9a65..1d282d2 100644
--- a/ferment.c
+++ b/ferment.c
@@ -41,7 +41,7 @@ static void bridge_off(void)
}
/* Turns the H-bridge on, setting 1+ 2- */
-static void bridge_on_a(void)
+static void bridge_on_heat(void)
{
bridge_off();
_delay_ms(100);
@@ -50,7 +50,7 @@ static void bridge_on_a(void)
}
/* Turns the H-bridge on, setting 1- 2+ */
-static void bridge_on_b(void)
+static void bridge_on_cool(void)
{
bridge_off();
_delay_ms(100);
@@ -94,16 +94,16 @@ int adc_to_centigrade(uint16_t adc_val) {
}
/* Initializes TIMER1 */
-static void timer_init(void)
+static void timer_init(void)
{
- TCCR1B = (1 << WGM12) | (1 << CS11);
- OCR1A = 1000;
+ TCCR1B = (1 << WGM12) | (1 << CS12) | (1 << CS10);
+ OCR1A = 7200;
TIMSK|=(1<<OCIE1A);
}
ISR(TIMER1_COMPA_vect)
{
- serial_send("*\n", 2, 1);
+ serial_send("*\r\n", 3, 1);
start_temp_conv();
}
@@ -118,10 +118,13 @@ int main(void)
sei();
+ bridge_on_cool();
while (1) {
- sprintf(params, "%u\n", adc_res);
- serial_send(params, strlen(params), 1);
- //bridge_on_a();
- _delay_ms(1000);
+ if (adc_new) {
+ sprintf(params, "%u\r\n", adc_res);
+ serial_send(params, strlen(params), 1);
+ adc_new = 0;
+ }
+ _delay_ms(100);
}
}