X-Git-Url: http://git.tdb.fi/?p=model-railway-devices.git;a=blobdiff_plain;f=arducontrol%2Fmonitor.c;h=9b5154dddfcf1d2209b3253436ac9b0ee2289421;hp=de00fc1645b9ddc1258326eadcb2a880aaeb23d9;hb=3fb9da57664c39827f687d664343488b0136f4e1;hpb=4150740d3a5c2384289865923cef08c5852cb520 diff --git a/arducontrol/monitor.c b/arducontrol/monitor.c index de00fc1..9b5154d 100644 --- a/arducontrol/monitor.c +++ b/arducontrol/monitor.c @@ -7,7 +7,7 @@ static uint16_t track_current_samples[16] = { 0 }; static uint8_t track_current_head = 0; static volatile uint16_t track_current_sum = 0; -static uint16_t overcurrent_limit = 8796; +static uint16_t overcurrent_limit = 9707; static uint8_t overcurrent_sent = 0; static uint16_t input_voltage_samples[16] = { 0 }; @@ -22,6 +22,7 @@ static uint16_t input_voltage_millivolts(void); void monitor_init(void) { + DDRB |= 0x02; adc_init(); } @@ -42,14 +43,18 @@ void monitor_check(void) if(track_current_sum>overcurrent_limit) { output_set_power(0); + PORTB |= 0x02; if(!overcurrent_sent) { overcurrent_sent = 1; interface_send1(OVERCURRENT); } } - else + else if(overcurrent_sent && output_is_power_on()) + { + PORTB &= ~0x02; overcurrent_sent = 0; + } } else if(adc_state==4) {