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
This commit is contained in:
Charl Wentzel
2017-07-09 16:31:47 +02:00
parent b900d735b9
commit b7ed169730
8 changed files with 36 additions and 40 deletions

View File

@@ -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;
}