Major Update & Bug fixes:

- FileCore:
  - Replace dlNone -> dlLow
  - Remove temporary code used by CBaslerCamera
- Function Core:
  - Add method SetDebugLevel()
  - Remove global parameter BaseMember;
- JSONparse:
  - Print Bool parameters as true/false, not 1/0
- SelectCore:
  - Add method SetDebugLevel()
- SignalCore:
  - Replace dlNone -> dlLow

FileCore.cpp

@@ -31,11 +31,6 @@ CFileCore::CFileCore( const char * Name, CLogCore * pLog, EDebugLevel pDebugLeve
            CFunctionCore( Name, pLog, pDebugLevel, pOuputDisplay )
 {
     FirstFile = NULL;
-
-    // temp
-    count = 0;
-    x = 0;
-    // temp
 }
 //---------------------------------------------------------------------------
 
@@ -140,12 +135,6 @@ bool CFileCore::OpenFile( TFileHandle * FileHandle )
     // Open file if not already open
     if (!isOpen( FileHandle ))
     {
-// temp
-//char FilePath[50];
-//sprintf( FilePath, "%s%03d", FileHandle->Path, x++ );
-//if (Log)  Log->Message( DebugLevel, dlNone, "f: %s", FilePath );
-// temp
-
         // GEt file handle
         (FileHandle)->FD = open( FileHandle->Path, O_WRONLY | O_CREAT | ((FileHandle->Append)? O_APPEND : O_TRUNC), 0664 );
 
@@ -155,10 +144,6 @@ bool CFileCore::OpenFile( TFileHandle * FileHandle )
             // Set timer
             SetStartTime( &(FileHandle->PersistTime) );
 
-            // temp
-            count = 0;
-            // temp
-
             // Report result
             if (Log)  Log->Message( DebugLevel, dlHigh, "%s: File '%s' - Opened", Name, FileHandle->Name );
         }
@@ -196,11 +181,6 @@ bool CFileCore::CloseFile( TFileHandle * FileHandle )
         } else {
             if (Log)  Log->Message( DebugLevel, dlHigh, "%s: File '%s' - Could not close", Name, FileHandle->Name );
         }
-
-        // temp
-        if (Log)  Log->Message( DebugLevel, dlNone, "%s: File '%s' - Bytes written %d (%d)", Name, FileHandle->Name, count, (count-5038848) );
-        // temp
-
     }
     return true;
 }
@@ -287,7 +267,7 @@ int CFileCore::Input( const char * ChannelName, const char * Data, int MaxLen )
     }
 
     // Log event
-    //ShowOutput( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Channel '%s' - IN:", Name, ChannelName );
+    Log->Output( DebugLevel, dlHigh, OutputDisplay, Data, MaxLen, "%s: Channel '%s' - IN:", Name, ChannelName );
 
     // Open file
     if (!OpenFile( FileHandle )) {
@@ -298,10 +278,6 @@ int CFileCore::Input( const char * ChannelName, const char * Data, int MaxLen )
     BytesWritten = WriteToFD( FileHandle->FD, Data, MaxLen );
     SetStartTime( &(FileHandle->PersistTime) );
 
-    // temp
-    count += BytesWritten;
-    // temp
-
     // Return processed bytes
     return BytesWritten;
 }

FileCore.h

@@ -41,11 +41,6 @@ private:
     // File
     TFileHandle   * FirstFile;
 
-    // temp
-    int count;
-    int x;
-    // temp
-
     // Manage File
     virtual bool OpenFile( TFileHandle * FileHandle );
     virtual bool CloseFile( TFileHandle * FileHandle );

FunctionCore.cpp

@@ -35,7 +35,6 @@ CFunctionCore::CFunctionCore( const char * FunctionName, CLogCore * pLog, EDebug
 
     // Data Tree
     DataTree        = NULL;
-    BaseMember      = NULL;
 
     // Channels
     FirstChannel    = NULL;
@@ -101,15 +100,24 @@ CFunctionCore::~CFunctionCore()
 
 bool  CFunctionCore::LoadConfig( CDataTree * pDataTree, const char * pBasePath )
 {
-    if (!(DataTree = pDataTree))
+    TDataMember     * BaseMember;
-        return false;
+
-    if (!(BaseMember = DataTree->GetMember( NULL, pBasePath, true )))
+    // Validate
+    if (!(DataTree = pDataTree) ||
+        !(BaseMember = DataTree->GetMember( NULL, pBasePath, true )))
         return false;
 
     return true;
 }
 //---------------------------------------------------------------------------
 
+bool  CFunctionCore::SetDebugLevel( EDebugLevel pDebugLevel )
+{
+    DebugLevel      = pDebugLevel;
+    return true;
+}
+//---------------------------------------------------------------------------
+
 TChannel * CFunctionCore::AddChannel( const char * ChannelName, const bool pInputEnable, const bool pOutputEnable )
 {
     TChannel    ** Channel  = NULL;

FunctionCore.h

@@ -58,7 +58,6 @@ protected:
 
     // Configuration
     CDataTree   * DataTree;
-    TDataMember * BaseMember;
 
     // Channels
     TChannel     * FirstChannel;
@@ -85,7 +84,9 @@ public:
     CFunctionCore( const char * FunctionName, CLogCore * pLog, EDebugLevel pDebugLevel, int pOuputDisplay );
     virtual ~CFunctionCore();
 
+    // Configuration
     virtual bool  LoadConfig( CDataTree * DataTree, const char * BasePath );
+    bool    SetDebugLevel( EDebugLevel pDebugLevel );
 
     // Miscellaneous
     inline const char * GetName()   { return Name; };

JSONparseCore.cpp

@@ -841,6 +841,12 @@ bool CJSONparse::PrintObject( TDataMember * Object, const int Indent )
                 break;
 
             case jtBool :
+                if (!strcmp( Member->Value, "0" ))
+                    write( OutputHandle, "false", 5 );
+                else
+                    write( OutputHandle, "true", 4 );
+                break;
+
             case jtInt :
             case jtFloat :
                 write( OutputHandle, Member->Value, Member->Len );

SelectCore.cpp

@@ -66,6 +66,13 @@ CSelect::~CSelect()
 }
 //---------------------------------------------------------------------------
 
+bool  CSelect::SetDebugLevel( EDebugLevel pDebugLevel )
+{
+    DebugLevel      = pDebugLevel;
+    return true;
+}
+//---------------------------------------------------------------------------
+
 // Clear Select File Descriptors
 void CSelect::Clear()
 {

SelectableCore.h

@@ -141,6 +141,9 @@ public:
     CSelect( long SelectTimeout, CLogCore * pLog, EDebugLevel DebugLevel );
     ~CSelect();
 
+    // Parameters
+    bool SetDebugLevel( EDebugLevel pDebugLevel );
+
     // Manage FDs
     void Clear();
     void Add( int FD, bool Read, bool Write, CSelectableCore * Function = NULL);

SignalCore.cpp

@@ -88,12 +88,12 @@ void SignalTerminate( int sig )
     // Create Log Entry
     if (Log)
     {
-        Log->Message( dlNone, dlNone, "%s:  ** %s signal received [%d]   **", ProcessName, SigName, TermCount );
+        Log->Message( dlLow, dlLow, "%s:  ** %s signal received [%d]   **", ProcessName, SigName, TermCount );
         // Check for Terminate Limit
         if (TermCount < MaxTermCount) {
-            Log->Message( dlNone, dlNone, "%s:  ** Terminating normally...       **", ProcessName );
+            Log->Message( dlLow, dlLow, "%s:  ** Terminating normally...       **", ProcessName );
         } else {
-            Log->Message( dlNone, dlNone, "%s:  ** Terminating immediately!      **", ProcessName );
+            Log->Message( dlLow, dlLow, "%s:  ** Terminating immediately!      **", ProcessName );
         }
     }
     else
@@ -138,8 +138,8 @@ void SignalAbort( int sig )
 
     // Create Log Entry - but don't post
     if (Log) {
-        Log->Message( dlNone, dlNone, "%s:  ** %s signal received    **", ProcessName, SigName );
+        Log->Message( dlLow, dlLow, "%s:  ** %s signal received    **", ProcessName, SigName );
-        Log->Message( dlNone, dlNone, "%s:  ** Terminating immediately!   **", ProcessName );
+        Log->Message( dlLow, dlLow, "%s:  ** Terminating immediately!   **", ProcessName );
     }
     else {
         std::cerr << ProcessName << ":  ** " << SigName << " signal received    **" << std::endl;