flaneth

@@ -62,7 +62,7 @@ SRC = $(TARGET).c

 # uncomment the following:

 SRC += app_bbm.c app_cfg.c apps.c apps_tools.c \

        arp.c bus.c cf.c checksum.c config.c dhcp.c dosfs.c dosfs_user.c \

-       eeprom.c ethernet.c http.c icmp.c ip.c random.c rtl8019.c \

+       eeprom.c ethernet.c http.c icmp.c ip.c mcuf_in.c random.c rtl8019.c \

        ser115200.c ser62500.c status.c tasks.c tcp.c timing.c uart.c udp.c \

        xtea.c

@@ -10,6 +10,7 @@

 #include "app_bbm.h"

 #include "debug.h"

 #include "dosfs.h"

+#include "mcuf_in.h"

 #include "nethelp.h"

 #include "udp.h"

 #include "ser115200.h"

@@ -244,9 +245,10 @@ static void AppBbmProcFrame(AppBbmState *state)

     UdpSend((unsigned char *)&pack, sizeof(pack));

   }

-  // serial output 115200 8N1

-  if (state->ser115k2)

+  // serial output 115200 8N1 (if MCUF input is not active)

+  if (state->ser115k2 && ! McufInIsActive()) {

     Ser115200Send((unsigned char *)&pack.mcuf, sizeof(pack.mcuf));

+  }

   // frame duration not more than one second

   if (duration <= 1000) {

@@ -0,0 +1,34 @@

+/* flaneth - flash and ethernet

+   Copyright (C) 2007-2012 Stefan Schuermans <stefan@blinkenarea.org>

+   Copyleft: GNU public license V2 - http://www.gnu.org/copyleft/gpl.html

+   a BlinkenArea project - http://www.blinkenarea.org/ */

+

+#include "mcuf_in.h"

+#include "ser115200.h"

+

+#define MCUF_IN_TIMEOUT 25 // 25 * 200ms = 5s

+

+static unsigned int McufInTimeout = 0;

+

+// check if MCUF input is active

+int McufInIsActive(void)

+{

+  return McufInTimeout > 0; // MCUF input active if timeout is greater zero

+}

+

+// tick procedure - call every 200ms

+void McufInTick200(void)

+{

+  // time out active MCUF input after 5s

+  if (McufInTimeout > 0) {

+    --McufInTimeout;

+  }

+}

+

+// process a received MCUF packet

+void McufInRecv(unsigned char *pData, unsigned short Length)

+{

+  McufInTimeout = MCUF_IN_TIMEOUT; // MCUF input is active now

+  Ser115200Send(pData, Length);

+}

+

@@ -0,0 +1,18 @@

+/* flaneth - flash and ethernet

+   Copyright (C) 2007-2012 Stefan Schuermans <stefan@blinkenarea.org>

+   Copyleft: GNU public license V2 - http://www.gnu.org/copyleft/gpl.html

+   a BlinkenArea project - http://www.blinkenarea.org/ */

+

+#ifndef INC_mcuf_in

+#define INC_mcuf_in

+

+// check if MCUF input is active

+extern int McufInIsActive(void);

+

+// tick procedure - call every 200ms

+extern void McufInTick200(void);

+

+// process a received MCUF packet

+extern void McufInRecv(unsigned char *pData, unsigned short Length);

+

+#endif // #ifdef INC_mcuf_in

@@ -11,6 +11,7 @@

 #include "cf.h"

 #include "dhcp.h"

 #include "ip.h"

+#include "mcuf_in.h"

 #include "random.h"

 #include "rtl8019.h"

 #include "status.h"

@@ -111,6 +112,8 @@ void TimingTask(void)   // (extern)

   case 3:

     IpTick200();

     break;

+  case 4:

+    McufInTick200();

   case 5:

     //RtlTick200();

     break;

@@ -10,6 +10,7 @@

 #include "ethernet.h"

 #include "ip.h"

 #include "macros.h"

+#include "mcuf_in.h"

 #include "nethelp.h"

 #include "ser62500.h"

 #include "udp.h"

@@ -124,6 +125,11 @@ void UdpRecv(unsigned char *pData, unsigned short Length)       // (extern)

   case 68:

     DhcpRecv(pData, Length);

     break;

+    // MCUF -> to serial port

+  case 2323:

+    McufInRecv(pData + sizeof(struct UdpPacket),

+               Length - sizeof(struct UdpPacket));

+    break;

     // serial output with 62500 baud in 9N2 protocol

   case 62500:

     Ser62500Send9N2(pData + sizeof(struct UdpPacket),