X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=arducontrol%2Foutput.c;h=38d1045476438cea33da205d0ecebf67ef9d8957;hb=9106943c465894bd1a8862b0a6d7ffdd89f8b643;hp=b862ac3f75520c9051fddb90961c511436448e61;hpb=24b07fc36c607d726cce7bfd8574cf2cb66715dc;p=model-railway-devices.git

diff --git a/arducontrol/output.c b/arducontrol/output.c
index b862ac3..38d1045 100644
--- a/arducontrol/output.c
+++ b/arducontrol/output.c
@@ -1,5 +1,5 @@
 #include <avr/io.h>
-#include "commands.h"
+#include "interface.h"
 #include "output.h"
 #include "timer.h"
 
@@ -8,10 +8,10 @@
 #define BIT(x) (1<<(x))
 
 OutputPacket packet;
-uint8_t out_bit;
-uint8_t out_time;
-uint8_t out_data;
-uint8_t delay_time;
+static uint8_t out_bit;
+static uint8_t out_time;
+static uint8_t out_data;
+static uint8_t delay_time;
 
 void output_init(void)
 {
@@ -36,6 +36,11 @@ void output_set_power(uint8_t p)
 		PORTD &= ~BIT(ENABLE);
 }
 
+uint8_t output_is_power_on()
+{
+	return (PORTD&BIT(ENABLE))!=0;
+}
+
 uint8_t output_command(const uint8_t *cmd_buf, uint8_t cmd_length)
 {
 	if(cmd_buf[0]==POWER_ON || cmd_buf[0]==POWER_OFF)
@@ -45,6 +50,16 @@ uint8_t output_command(const uint8_t *cmd_buf, uint8_t cmd_length)
 
 		output_set_power(cmd_buf[0]==POWER_ON);
 	}
+	else if(cmd_buf[0]==READ_POWER_STATE)
+	{
+		if(cmd_length!=1)
+			return LENGTH_ERROR;
+
+		uint8_t reply[2];
+		reply[0] = POWER_STATE;
+		reply[1] = output_is_power_on();
+		interface_send(reply, 2);
+	}
 	else
 		return INVALID_COMMAND;