From e90caeae4251f17ea7c238f4c3aa06e71d304899 Mon Sep 17 00:00:00 2001
From: madsenco <devnull@localhost>
Date: Fri, 25 Feb 2011 14:35:22 +0100
Subject: [PATCH] More infrastructure

---
 nmeamux/root/usr/bin/nmeamux | 56 ++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/nmeamux/root/usr/bin/nmeamux b/nmeamux/root/usr/bin/nmeamux
index bf6415c..d167cd9 100755
--- a/nmeamux/root/usr/bin/nmeamux
+++ b/nmeamux/root/usr/bin/nmeamux
@@ -13,13 +13,13 @@ local NmeaNode = Class("NmeaNode", nil, {
 local NmeaFilter = Class("NmeaFilter", NmeaNode, {
     mInputs = NIL,
     mOutputs = NIL,
-    mDutyIn = NIL,
-    mDutyOut = NIL,
+    mPosList = NIL,
+    mNegList = NIL,
 })
 
 local NmeaPort = Class("NmeaPort", NmeaNode, {
     mPath = NIL,
-    mHispeed = NIL,
+    mSpeed = NIL,
     mDutyIn = NIL,
     mDutyOut = NIL,
 })
@@ -27,19 +27,45 @@ local NmeaPort = Class("NmeaPort", NmeaNode, {
 
 local sampleConf = {
     outputs = {
-        lospeed_1 = { inputs = { "lospeed_1", "bkhousemux" },
-        lospeed_2 = { inputs = { "gps" }, 
-
+        instruments = { inputs = {"p_lospeed_1", "nogps_bkhousemux", "autopilot"}, port=27001,
+                        output = "p_lospeed_1" },
+        --sfeed     = { inputs = { "gps_bkhousemux" },  output = "p_lospeed_2",    port=27002 }, 
+        gpsfeed     = { inputs = { "gps" },             output = "p_lospeed_2",    port=27002 }, 
+        garmin_nmea = { inputs = { "p_lospeed_1", "p_lospeed_2", "p_ais", "p_bkhousemux" },
+                        output = "p_hispeed",                                      port=27003 },
     },
     ports = {
-        lospeed_1  = { path = "/dev/ttyusb/mos7840-9710-7840/0",  speed = 4800 },
-        lospeed_2  = { path = "/dev/ttyusb/mos7840-9710-7840/1",  speed = 4800 },
-        hispeed    = { path = "/dev/ttyusb/mos7840-9710-7840/2",  speed = 38400 },
-        gps        = { path = "/dev/ttyusb/pl2303-067b-2303/0",   speed = 38400 },
-        ais        = { path = "/dev/ttyusb/ftdi_sio-0403-6001/0", speed = 38400 , port=25001},
-        pactor     = { path = "/dev/ttyusb/ftdi_sio-0403-d010/0", speed = 9600  , port=25002},
-        garmin1    = { path = "/dev/ttyusb/mos7840-9710-7840/3",  speed = 9600  , port=25003},
-        garmin2    = { path = "/dev/ttyS0",                       speed = 9600  , port=25004},
-        bkhousemux = { path = "/dev/ttyusb/BROOKHOUSE10-7840/3",  speed = 38400 , port=25005},
+        p_lospeed_1  = { path = "/dev/ttyusb/mos7840-9710-7840/0",  speed=4800  , port=26001},
+        p_lospeed_2  = { path = "/dev/ttyusb/mos7840-9710-7840/1",  speed=4800  , port=26002},
+        p_hispeed    = { path = "/dev/ttyusb/mos7840-9710-7840/2",  speed=38400 , port=26003},
+        p_gps        = { path = "/dev/ttyusb/pl2303-067b-2303/0",   speed=38400 , port=26004},
+        p_ais        = { path = "/dev/ttyusb/ftdi_sio-0403-6001/0", speed=38400 , port=25001},
+        p_pactor     = { path = "/dev/ttyusb/ftdi_sio-0403-d010/0", speed=9600  , port=25002},
+        p_garmin1    = { path = "/dev/ttyusb/mos7840-9710-7840/3",  speed=9600  , port=25003},
+        p_garmin2    = { path = "/dev/ttyS0",                       speed=9600  , port=25004},
+        p_bkhousemux = { path = "/dev/ttyusb/BROOKHOUSE10-7840/3",  speed=38400 , port=25005},
+        p_navtex     = { path = "/dev/ttyusb/NAVTEX-------7840/3",  speed=38400 , port=25006},
+    },
+    filter   = {
+        nogps_bkhousemux = { inputs = { "p_bkhousemux" } , port=28001,
+                             neg = { "^..RMB", "^..VDV" } },
+        gps_bkhousemux   = { inputs = { "p_bkhousemux" } , port=28002,
+                             pos = { "^..RMB", "^..VDV" } },
+        autopilot =        { inputs = { "p_hispeed" },     port=28003, 
+                             pos = { "^..XTE", "^..WPT" } },
     },
 }
+
+
+function NmeaNode:processInput(str)
+    -- Simple relay
+    for _,s in pairs(self.mSinks) do s:processInput(str) end
+end
+
+function NmeaNode:start(str)
+    if not self.mPortNo then return end
+
+    :T Cal  
+end
+
+