disable log in actisense mode

lib/channel/GwChannelList.cpp

@@ -4,39 +4,51 @@
 #include "GwSocketServer.h"
 #include "GwSerial.h"
 #include "GwTcpClient.h"
-class GwSerialLog : public GwLogWriter{
+class GwSerialLog : public GwLogWriter
-  static const size_t bufferSize=4096;
+{
-  char *logBuffer=NULL;
+    static const size_t bufferSize = 4096;
-  int wp=0;
+    char *logBuffer = NULL;
-  GwSerial *writer;
+    int wp = 0;
-  public:
+    GwSerial *writer;
-    GwSerialLog(GwSerial *writer){
+    bool disabled = false;
-        this->writer=writer;
+
-      logBuffer=new char[bufferSize];
+public:
-      wp=0;
+    GwSerialLog(GwSerial *writer, bool disabled)
+    {
+        this->writer = writer;
+        this->disabled = disabled;
+        logBuffer = new char[bufferSize];
+        wp = 0;
     }
-    virtual ~GwSerialLog(){}
+    virtual ~GwSerialLog() {}
-    virtual void write(const char *data){
+    virtual void write(const char *data)
-      int len=strlen(data);
+    {
-      if ((wp+len) >= (bufferSize-1)) return;
+        if (disabled)
-      strncpy(logBuffer+wp,data,len);
+            return;
-      wp+=len;
+        int len = strlen(data);
-      logBuffer[wp]=0;
+        if ((wp + len) >= (bufferSize - 1))
+            return;
+        strncpy(logBuffer + wp, data, len);
+        wp += len;
+        logBuffer[wp] = 0;
     }
-    virtual void flush(){
+    virtual void flush()
-      size_t handled=0;
+    {
-      while (handled < wp){
+        size_t handled = 0;
-        writer->flush();
+        if (!disabled)
-        size_t rt=writer->sendToClients(logBuffer+handled,-1,true);
+        {
-        handled+=rt;
+            while (handled < wp)
+            {
+                writer->flush();
+                size_t rt = writer->sendToClients(logBuffer + handled, -1, true);
+                handled += rt;
+            }
         }
-      wp=0;
+        wp = 0;
-      logBuffer[0]=0;
+        logBuffer[0] = 0;
     }
-
 };
 
-
 GwChannelList::GwChannelList(GwLog *logger, GwConfigHandler *config){
     this->logger=logger;
     this->config=config;
@@ -53,7 +65,7 @@ void GwChannelList::begin(bool fallbackSerial){
     if (! fallbackSerial){
         GwSerial *usb=new GwSerial(NULL,0,USB_CHANNEL_ID);
         usb->setup(config->getInt(config->usbBaud),3,1);
-        logger->setWriter(new GwSerialLog(usb));
+        logger->setWriter(new GwSerialLog(usb,config->getBool(config->usbActisense)));
         logger->prefix="GWSERIAL:";
         channel=new GwChannel(logger,"USB",USB_CHANNEL_ID);
         channel->setImpl(usb);