X-Git-Url: http://git.tdb.fi/?p=model-railway-devices.git;a=blobdiff_plain;f=arducontrol%2Fmonitor.c;h=9b5154dddfcf1d2209b3253436ac9b0ee2289421;hp=112e1ac56486c2317dce74d189e815de0f6afe83;hb=3fb9da57664c39827f687d664343488b0136f4e1;hpb=5ee5a22903f8059bf38bc8b2041eb18dfc58bcf0

diff --git a/arducontrol/monitor.c b/arducontrol/monitor.c
index 112e1ac..9b5154d 100644
--- a/arducontrol/monitor.c
+++ b/arducontrol/monitor.c
@@ -4,24 +4,25 @@
 #include "output.h"
 #include "serial.h"
 
-uint16_t track_current_samples[16] = { 0 };
-uint8_t track_current_head = 0;
-volatile uint16_t track_current_sum = 0;
-uint16_t overcurrent_limit = 8796;
-uint8_t overcurrent_sent = 0;
+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 = 9707;
+static uint8_t overcurrent_sent = 0;
 
-uint16_t input_voltage_samples[16] = { 0 };
-uint8_t input_voltage_head = 0;
-volatile uint16_t input_voltage_sum = 0;
+static uint16_t input_voltage_samples[16] = { 0 };
+static uint8_t input_voltage_head = 0;
+static volatile uint16_t input_voltage_sum = 0;
 
-volatile uint8_t adc_state = 0;
-volatile uint16_t adc_value = 0;
+static volatile uint8_t adc_state = 0;
+static volatile uint16_t adc_value = 0;
 
-uint16_t track_current_milliamps(void);
-uint16_t input_voltage_millivolts(void);
+static uint16_t track_current_milliamps(void);
+static uint16_t input_voltage_millivolts(void);
 
 void monitor_init(void)
 {
+	DDRB |= 0x02;
 	adc_init();
 }
 
@@ -42,15 +43,18 @@ void monitor_check(void)
 			if(track_current_sum>overcurrent_limit)
 			{
 				output_set_power(0);
+				PORTB |= 0x02;
 				if(!overcurrent_sent)
 				{
 					overcurrent_sent = 1;
-					serial_write(0xFE);
-					serial_write(OVERCURRENT);
+					interface_send1(OVERCURRENT);
 				}
 			}
-			else
+			else if(overcurrent_sent && output_is_power_on())
+			{
+				PORTB &= ~0x02;
 				overcurrent_sent = 0;
+			}
 		}
 		else if(adc_state==4)
 		{
@@ -66,18 +70,20 @@ void monitor_check(void)
 	}
 }
 
-uint8_t monitor_command(void)
+uint8_t monitor_command(const uint8_t *cmd_buf, uint8_t cmd_length)
 {
 	if(cmd_buf[0]==READ_TRACK_CURRENT)
 	{
+		uint8_t reply[3];
+
 		if(cmd_length!=1)
 			return LENGTH_ERROR;
 
-		serial_write(0xFC);
-		serial_write(TRACK_CURRENT);
 		uint16_t value = track_current_milliamps();
-		serial_write(value>>8);
-		serial_write(value);
+		reply[0] = TRACK_CURRENT;
+		reply[1] = value>>8;
+		reply[2] = value;
+		interface_send(reply, sizeof(reply));
 	}
 	else if(cmd_buf[0]==SET_OVERCURRENT_LIMIT)
 	{
@@ -95,14 +101,16 @@ uint8_t monitor_command(void)
 	}
 	else if(cmd_buf[0]==READ_INPUT_VOLTAGE)
 	{
+		uint8_t reply[3];
+
 		if(cmd_length!=1)
 			return LENGTH_ERROR;
 
-		serial_write(0xFC);
-		serial_write(INPUT_VOLTAGE);
 		uint16_t value = input_voltage_millivolts();
-		serial_write(value>>8);
-		serial_write(value);
+		reply[0] = INPUT_VOLTAGE;
+		reply[1] = value>>8;
+		reply[2] = value;
+		interface_send(reply, sizeof(reply));
 	}
 	else
 		return INVALID_COMMAND;
@@ -110,7 +118,7 @@ uint8_t monitor_command(void)
 	return COMMAND_OK;
 }
 
-uint16_t track_current_milliamps(void)
+static uint16_t track_current_milliamps(void)
 {
 	uint16_t value = track_current_sum;
 
@@ -127,7 +135,7 @@ uint16_t track_current_milliamps(void)
 	}
 }
 
-uint16_t input_voltage_millivolts(void)
+static uint16_t input_voltage_millivolts(void)
 {
 	uint16_t value = input_voltage_sum;