Implement a generic Serve() mode in canformat, and use it generally

openvehicles · Jul 10, 2019 · 7aee155 · 7aee155
1 parent 5d8cb70
commit 7aee155
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 44 deletions.
diff --git a/vehicle/OVMS.V3/components/can/src/canformat.cpp b/vehicle/OVMS.V3/components/can/src/canformat.cpp
@@ -66,6 +66,8 @@ void OvmsCanFormatFactory::RegisterCommandSet(OvmsCommand* base, const char* tit
 canformat::canformat(const char* type)
   {
   m_type = type;
+  m_servemode = Discard;
+  m_servediscarding = false;
   }
 
 canformat::~canformat()
@@ -91,3 +93,67 @@ size_t canformat::put(CAN_log_message_t* message, uint8_t *buffer, size_t len)
   {
   return 0;
   }
+
+size_t canformat::Serve(uint8_t *buffer, size_t len)
+  {
+  if ((m_servediscarding)||(m_servemode == Discard))
+    {
+    return len; // Simply discard...
+    }
+
+  size_t consumed = 0;
+  while(len>0)
+    {
+    CAN_log_message_t msg;
+    memset(&msg,0,sizeof(msg));
+
+    size_t used = put(&msg, buffer, len);
+    if (used > 0)
+      {
+      consumed += used;
+      buffer += used;
+      len -= used;
+      }
+    else
+      {
+      len = 0;
+      }
+
+    if (msg.frame.origin != NULL)
+      {
+      switch (m_servemode)
+        {
+        case Simulate:
+          MyCan.IncomingFrame(&msg.frame);
+          break;
+        case Transmit:
+          msg.frame.origin->Write(&msg.frame);
+          break;
+        default:
+          break;
+        }
+      }
+    }
+
+  return consumed;
+  }
+
+canformat::canformat_serve_mode_t canformat::GetServeMode()
+  {
+  return m_servemode;
+  }
+
+void canformat::SetServeMode(canformat_serve_mode_t mode)
+  {
+  m_servemode = mode;
+  }
+
+bool canformat::GetServeDiscarding()
+  {
+  return m_servediscarding;
+  }
+
+void canformat::SetServeDiscarding(bool discarding)
+  {
+  m_servediscarding = discarding;
+  }
diff --git a/vehicle/OVMS.V3/components/can/src/canformat.h b/vehicle/OVMS.V3/components/can/src/canformat.h
@@ -34,9 +34,11 @@
 #include "can.h"
 #include "ovms_utils.h"
 #include "ovms_command.h"
-
+#include "ovms_buffer.h"
 using namespace std;
 
+#define CANFORMAT_SERVE_BUFFERSIZE 1024
+
 class canformat
   {
   public:
@@ -55,6 +57,18 @@ class canformat
 
   private:
     const char* m_type;
+
+  public:
+    typedef enum { Discard, Simulate, Transmit } canformat_serve_mode_t;
+    canformat_serve_mode_t GetServeMode();
+    void SetServeMode(canformat_serve_mode_t mode);
+    bool GetServeDiscarding();
+    void SetServeDiscarding(bool discarding);
+    virtual size_t Serve(uint8_t *buffer, size_t len);
+
+  protected:
+    canformat_serve_mode_t m_servemode;
+    bool m_servediscarding;
   };
 
 template<typename Type> canformat* CreateCanFormat(const char* type)

diff --git a/vehicle/OVMS.V3/components/can/src/canlog_tcpclient.cpp b/vehicle/OVMS.V3/components/can/src/canlog_tcpclient.cpp
@@ -226,8 +226,19 @@ void canlog_tcpclient::MongooseHandler(struct mg_connection *nc, int ev, void *p
         }
       break;
     case MG_EV_RECV:
+      {
       ESP_LOGV(TAG, "MongooseHandler(MG_EV_RECV)");
+      size_t used = nc->recv_mbuf.len;
+      if (m_formatter != NULL)
+        {
+        used = m_formatter->Serve((uint8_t*)nc->recv_mbuf.buf, used);
+        }
+      if (used > 0)
+        {
+        mbuf_remove(&nc->recv_mbuf, used);
+        }
       break;
+      }
     default:
       break;
     }

diff --git a/vehicle/OVMS.V3/components/can/src/canlog_tcpserver.cpp b/vehicle/OVMS.V3/components/can/src/canlog_tcpserver.cpp
@@ -234,8 +234,15 @@ void canlog_tcpserver::MongooseHandler(struct mg_connection *nc, int ev, void *p
     case MG_EV_RECV:
       {
       // Receive data on the network connection
-      size_t bl = nc->recv_mbuf.len;
-      mbuf_remove(&nc->recv_mbuf, bl);
+      size_t used = nc->recv_mbuf.len;
+      if (m_formatter != NULL)
+        {
+        used = m_formatter->Serve((uint8_t*)nc->recv_mbuf.buf, used);
+        }
+      if (used > 0)
+        {
+        mbuf_remove(&nc->recv_mbuf, used);
+        }
       break;
       }
 

diff --git a/vehicle/OVMS.V3/components/retools/src/retools.cpp b/vehicle/OVMS.V3/components/retools/src/retools.cpp
@@ -109,7 +109,7 @@ static void reMongooseHandler(struct mg_connection *nc, int ev, void *p)
 void re::MongooseHandler(struct mg_connection *nc, int ev, void *p)
   {
   char addr[32];
-  CAN_log_message_t message;
+
   switch (ev)
     {
     case MG_EV_ACCEPT:
@@ -145,53 +145,18 @@ void re::MongooseHandler(struct mg_connection *nc, int ev, void *p)
     case MG_EV_RECV:
       {
       // Receive data on the network connection
-      uint8_t *bp = (uint8_t*)nc->recv_mbuf.buf;
-      size_t bl = nc->recv_mbuf.len;
-      size_t consumed = 0;
-
       if (m_servemode == Ignore)
         {
-        mbuf_remove(&nc->recv_mbuf, bl);
+        mbuf_remove(&nc->recv_mbuf, nc->recv_mbuf.len);
         return;
         }
 
-      //ESP_EARLY_LOGI(TAG,"MG_EV_RECV %d bytes",bl);
-      while(1)
+      size_t used = m_serveformat_out->Serve((uint8_t*)nc->recv_mbuf.buf, nc->recv_mbuf.len);
+      if (used > 0)
         {
-        if (bl == 0)
-          {
-          if (consumed > 0) mbuf_remove(&nc->recv_mbuf, consumed);
-          //ESP_LOGI(TAG,"CRTD complete consumed %d bytes",consumed);
-          return;
-          }
-        size_t used = m_serveformat_out->put(&message, bp, bl);
-        //ESP_EARLY_LOGI(TAG,"CRTD used %d bytes",used);
-        if (used > bl)
-            used = bl;
-        if (used <= 0)
-          {
-          if (consumed > 0) mbuf_remove(&nc->recv_mbuf, consumed);
-          //ESP_EARLY_LOGI(TAG,"CRTD complete consumed %d bytes",consumed);
-          return;
-          }
-        bp += used;
-        bl -= used;
-        consumed += used;
-        if (message.frame.origin != NULL)
-          {
-          switch (m_servemode)
-            {
-            case Simulate:
-              MyCan.IncomingFrame(&message.frame);
-              break;
-            case Transmit:
-              message.frame.origin->Write(&message.frame);
-              break;
-            default:
-              break;
-              }
-          }
+        mbuf_remove(&nc->recv_mbuf, used);
         }
+
       break;
       }