core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gMerge branch 'JoaneTelemetry'

Browse Source
This commit is contained in:
Charl Wentzel
2017-03-04 21:44:53 +02:00
parent e35ba3f024 ae95602f64
commit e50ef57b47
5 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DateTimeCore.cpp
View File

@@ -1,7 +1,7 @@
/*
* DateTimeCore.cpp
*
* Created on: 3 Mar 2017
* Created on: 3 March 2017
* Author: wentzelc
*/
@@ -13,14 +13,12 @@
#include <stdio.h>
#include <cstdlib>
#include <string.h>
//#include <stdlib.h>
//#include <unistd.h>
#include <time.h>
//---------------------------------------------------------------------------
// Variable used to temp values with
char ReturnStr[20];
static char ReturnStr[20];
//---------------------------------------------------------------------------

2
DateTimeCore.h
View File

@@ -12,7 +12,7 @@
/* none */
// Standard C/C++ Libraries
#include <time.h>
#include <cstdlib>
//---------------------------------------------------------------------------

49
LogCore.cpp
View File

@@ -7,6 +7,7 @@
// redA Libraries
#include "LogCore.h"
#include "DateTimeCore.h"
// Standard C/C++ Libraries
#include <stdio.h>
@@ -22,9 +23,9 @@ char LogStr[1000]; // Temporary var to create log messages,
//---------------------------------------------------------------------------
CLogCore::CLogCore( FILE * pFileOutput )
CLogCore::CLogCore( FILE * pOutputFile )
{
FileOutput = pFileOutput;
OutputFile = pOutputFile;
}
//---------------------------------------------------------------------------
@@ -37,14 +38,19 @@ bool CLogCore::Message( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const char
return false;
// Check debug level
if (!FileOutput || (MsgLevel > DebugLevel)) {
if (!OutputFile || (MsgLevel > DebugLevel)) {
return true;
}
// Show normal output
// Show Date & Time
if (OutputFile->_fileno > 3) {
fprintf( OutputFile, "%s", GetDateTimeStr( "/", ":" ));
}
// Print formated message
va_start( ArgPtr, Format );
vfprintf( FileOutput, Format, ArgPtr );
fprintf( FileOutput, "\r\n" );
vfprintf( OutputFile, Format, ArgPtr );
fprintf( OutputFile, "\r\n" );
va_end( ArgPtr );
return true;
}
@@ -59,7 +65,7 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
return false;
// Check debug level
if (!FileOutput || (MsgLevel > DebugLevel)) {
if (!OutputFile || (MsgLevel > DebugLevel)) {
return true;
}
@@ -67,10 +73,15 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
if (Len == -1)
Len = strlen( Buffer );
// Show date & time
if (OutputFile->_fileno > 3) {
fprintf( OutputFile, "%s", GetDateTimeStr( "/", ":" ));
}
// Show Lead
if (Format && *Format) {
va_start( ArgPtr, Format );
vfprintf( FileOutput, Format, ArgPtr );
vfprintf( OutputFile, Format, ArgPtr );
va_end( ArgPtr );
}
@@ -78,11 +89,11 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
if (Show & OUT_COUNT)
{
// Print byte count
fprintf( FileOutput, " [%d] ", Len );
fprintf( OutputFile, " [%d] ", Len );
// EOL if only count wanted
if (Show & OUT_COUNT) {
fprintf( FileOutput, "\n" );
fprintf( OutputFile, "\n" );
}
}
@@ -91,25 +102,25 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
{
if (Show & OUT_ASIS) {
// Print entire buffer as is (line feeds included)
fprintf( FileOutput, "%s", Buffer );
fprintf( OutputFile, "%s", Buffer );
}
else {
// Ignore \r\n
for (int i=0; i<Len; i++) {
if ((Buffer[i] < 32) || (Buffer[i] > 126)) {
if ((Show & OUT_CRLF) && ((Buffer[i] == '\r') || (Buffer[i] == '\n')))
fprintf( FileOutput, "%c", Buffer[i] );
fprintf( OutputFile, "%c", Buffer[i] );
else
fprintf( FileOutput, "." );
fprintf( OutputFile, "." );
}
else {
fprintf( FileOutput, "%c", Buffer[i] );
fprintf( OutputFile, "%c", Buffer[i] );
}
}
}
// Add EOL if not present or ignored
if (!(Show & (OUT_ASIS | OUT_CRLF)) || (Buffer[Len-1] != '\n')) {
fprintf( FileOutput, "\n" );
fprintf( OutputFile, "\n" );
}
}
@@ -118,9 +129,9 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
{
// Print Hex values of individual bytes
for (int i=0; i<Len; i++) {
fprintf( FileOutput, "%02X ", (unsigned char)Buffer[i] );
fprintf( OutputFile, "%02X ", (unsigned char)Buffer[i] );
}
fprintf( FileOutput, "\n" );
fprintf( OutputFile, "\n" );
}
// Show Binary output
@@ -128,10 +139,10 @@ bool CLogCore::Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short
// Print each byte as 8-bit binary
for (int i=0; i<Len; i++) {
for (int j=0; j<8; j++) {
fprintf( FileOutput, "%d", (bool)((Buffer[i] << j) & 0x80) );
fprintf( OutputFile, "%d", (bool)((Buffer[i] << j) & 0x80) );
}
}
fprintf( FileOutput, "\n" );
fprintf( OutputFile, "\n" );
}
return true;
}

4
LogCore.h
View File

@@ -34,10 +34,10 @@ typedef enum { dlNone = 0, dlLow = 1, dlMedium = 2, dlHigh = 3 } EDebugLevel;
class CLogCore
{
private:
FILE * FileOutput;
FILE * OutputFile;
public:
CLogCore( FILE * pFileOutput );
CLogCore( FILE * pOutputFile );
bool Message( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const char * Format, ... );
bool Output( EDebugLevel DebugLevel, EDebugLevel MsgLevel, const short Show, const char * Buffer, int Len, const char * Format, ... );

3
TimingCore.cpp
View File

@@ -5,7 +5,7 @@
* Author: wentzelc
*/
// redA Librarie
// redA Libraries
#include "TimingCore.h"
// Standard C/C++ Libraries
@@ -64,3 +64,4 @@ bool Timeout( timeval StartTime, long MilliSeconds )
return ((TimePassed(StartTime) > MilliSeconds)? true : false);
}
//---------------------------------------------------------------------------