X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=arducontrol%2Foutput.c;h=673f23242d0b93aab450ea1eb4129ad3acb531a7;hb=3fb968420f55aedcac23f7bd42da8485fc210c92;hp=748c554d32cc6028347bbcc2d7bc9138f385fee7;hpb=5ee5a22903f8059bf38bc8b2041eb18dfc58bcf0;p=model-railway-devices.git

diff --git a/arducontrol/output.c b/arducontrol/output.c
index 748c554..673f232 100644
--- a/arducontrol/output.c
+++ b/arducontrol/output.c
@@ -7,25 +7,40 @@
 #define ENABLE PORTD3
 #define BIT(x) (1<<(x))
 
+enum State
+{
+	IDLE,
+	READY,
+	SENDING
+};
+
 OutputPacket packet;
-uint8_t out_bit;
-uint8_t out_time;
-uint8_t out_data;
-uint8_t delay_time;
+volatile uint8_t packet_state = IDLE;
+static uint8_t out_bit;
+static uint8_t out_time;
+static uint8_t out_data;
+static uint8_t delay_time;
 
 void output_init(void)
 {
 	DDRD = (DDRD&0xF3)|0x0C;
 	PORTD &= ~BIT(ENABLE);
 
-	timer_start_hz(0, 80000, 1);
+	timer_start_hz(2, 80000, 1);
+}
+
+OutputPacket *output_create_packet(void)
+{
+	while(packet_state!=IDLE) ;
+	return &packet;
 }
 
-void clear_packet(void)
+void output_send_packet(void)
 {
-	packet.ready = 0;
-	packet.sending = 0;
-	packet.done = 0;
+	if(packet_state!=IDLE)
+		return;
+
+	packet_state = READY;
 }
 
 void output_set_power(uint8_t p)
@@ -36,7 +51,12 @@ void output_set_power(uint8_t p)
 		PORTD &= ~BIT(ENABLE);
 }
 
-uint8_t output_command(void)
+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 +65,16 @@ uint8_t output_command(void)
 
 		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;
 
@@ -67,12 +97,12 @@ static inline void output_tick(void)
 				if(packet.repeat_count<0xFF)
 					--packet.repeat_count;
 				delay_time = packet.repeat_delay;
-				packet.sending = 0;
+				packet_state = READY;
 			}
 			else
 			{
 				delay_time = packet.final_delay;
-				packet.done = 1;
+				packet_state = IDLE;
 			}
 		}
 		else
@@ -93,9 +123,9 @@ static inline void output_tick(void)
 		return;
 	}
 
-	if(packet.ready && !packet.sending)
+	if(packet_state==READY)
 	{
-		packet.sending = 1;
+		packet_state = SENDING;
 		out_bit = 0;
 		out_time = packet.bit_duration;
 		out_data = packet.data[0];
@@ -106,4 +136,4 @@ static inline void output_tick(void)
 	}
 }
 
-TIMER_SET_CALLBACK(0, output_tick)
+TIMER_SET_CALLBACK(2, output_tick)