Add support for Märklin MFX protocol in arducontrol

[model-railway-devices.git] / arducontrol / interface.c

diff --git a/arducontrol/interface.c b/arducontrol/interface.c
index 2c55e2af634eca747a7d207db38235a037c24cd3..63b1ebd1700b0c11d1e193ed1b0c1c3ef4eb0a91 100644 (file)
--- 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"
@@ -22,11 +23,10 @@ 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;
@@ -47,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)
@@ -77,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
@@ -85,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]);
 }