X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=arducontrol%2Finterface.c;h=63b1ebd1700b0c11d1e193ed1b0c1c3ef4eb0a91;hb=55f60a37bbeeaa62796e1be8bef062eeb1522a71;hp=a8ae2a28af9a0fce11cd391b5dd80da3634cf38b;hpb=4150740d3a5c2384289865923cef08c5852cb520;p=model-railway-devices.git

diff --git a/arducontrol/interface.c b/arducontrol/interface.c
index a8ae2a2..63b1ebd 100644
--- a/arducontrol/interface.c
+++ b/arducontrol/interface.c
@@ -1,5 +1,6 @@
 #include <avr/io.h>
 #include "interface.h"
+#include "mfx.h"
 #include "monitor.h"
 #include "motorola.h"
 #include "output.h"
@@ -14,6 +15,7 @@ static uint8_t dispatch_command(const uint8_t *, uint8_t);
 
 void interface_init(void)
 {
+	DDRB |= 0x01;
 	DDRD = (DDRD&0xFC)|0x02;
 
 	serial_init(9600);
@@ -21,13 +23,13 @@ void interface_init(void)
 
 void interface_check(void)
 {
-	uint8_t count;
 	if(serial_read_overrun())
 		interface_send1(RECEIVE_OVERRUN);
 
-	count = serial_read_available();
+	uint8_t count = serial_read_available();
 	if(count>0)
 	{
+		PORTB |= 0x01;
 		if(cmd_length==0)
 		{
 			uint8_t l = ~serial_read();
@@ -45,10 +47,9 @@ void interface_check(void)
 
 		if(cmd_read_pos<cmd_length)
 		{
-			uint8_t i;
 			if(cmd_read_pos+count>cmd_length)
 				count = cmd_length-cmd_read_pos;
-			for(i=0; i<count; ++i)
+			for(uint8_t i=0; i<count; ++i)
 				cmd_buffer[cmd_read_pos++] = serial_read();
 
 			if(cmd_read_pos>=cmd_length)
@@ -58,6 +59,7 @@ void interface_check(void)
 				cmd_length = 0;
 			}
 		}
+		PORTB &= ~0x01;
 	}
 }
 
@@ -74,6 +76,8 @@ static uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
 	}
 	else if(type==1)
 		return motorola_command(cmd, length);
+	else if(type==2)
+		return mfx_command(cmd, length);
 	else if(type==3)
 		return s88_command(cmd, length);
 	else
@@ -82,10 +86,8 @@ static uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
 
 void interface_send(const uint8_t *cmd, uint8_t length)
 {
-	uint8_t i;
-
 	serial_write(~length);
-	for(i=0; i<length; ++i)
+	for(uint8_t i=0; i<length; ++i)
 		serial_write(cmd[i]);
 }