flywithu/Oleg-Stepanenko-owo_IEBUS
1
0
Fork 0
mirror of https://github.com/Oleg-Stepanenko-owo/IEBUS synced 2025-06-29 02:36:47 +00:00
Code Issues Releases Wiki Activity

added extended loging

Browse Source
This commit is contained in:
Oleg Stepanenko 2016-04-13 16:23:29 +03:00
parent 4f208fb733
commit e806f0d3e4
5 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AVCLan_mini/AVCLanDrv.cpp
View File

@ -99,6 +99,7 @@ byte AVCLanDrv::_readMessage ()
if (t < AVC_START_BIT_HOLD_ON_MIN_LENGTH) { if (t < AVC_START_BIT_HOLD_ON_MIN_LENGTH) {
//if (t < 0x16){ //if (t < 0x16){
avclanBT.print("-->t=", true); avclanBT.printDec(t); avclanBT.println();
SREG = oldSREG; SREG = oldSREG;
return 2; return 2;
} }

2
AVCLan_mini/AVCLanHonda.cpp
View File

@ -102,7 +102,7 @@ void AVCLanHonda::processAction( AvcActionID ActionID )
if ( bPrepareCamOff && (ACT_B_DISPOFF == ActionID) ) { if ( bPrepareCamOff && (ACT_B_DISPOFF == ActionID) ) {
ActionID = ACT_CAM_OFF; ActionID = ACT_CAM_OFF;
avclanBT.print("CAMOFF+DISPOFF"); avclanBT.println("[CAMOFF+DISPOFF]");
} else bPrepareCamOff = false; } else bPrepareCamOff = false;
switch ( ActionID ) { switch ( ActionID ) {

15
AVCLan_mini/AVCLan_BT.cpp
View File

@ -29,17 +29,19 @@ void AVCLanBT::begin()
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
void AVCLanBT::println( char* val ) void AVCLanBT::println( char* val, bool bLogging )
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
{ {
mySerial.println( val ); if ( bLogging || logging )
mySerial.println( val );
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
void AVCLanBT::print( const char* val ) void AVCLanBT::print( const char* val, bool bLogging )
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
{ {
mySerial.print( val ); if ( bLogging || logging )
mySerial.print( val );
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
@ -95,10 +97,11 @@ void AVCLanBT::checkCommand( char command )
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
void AVCLanBT::println(void) void AVCLanBT::println( bool bLogging )
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
{ {
print("\r\n"); if ( bLogging || logging )
mySerial.print("\r\n");
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------

6
AVCLan_mini/AVCLan_BT.h
View File

@ -16,12 +16,12 @@ class AVCLanBT
public: public:
void begin (); // initialisation, obligatory method void begin (); // initialisation, obligatory method
void println( char*); void println( char*, bool bLogging = false );
void print(const char*); void print(const char*, bool bLogging = false );
void printHex4(uint8_t); void printHex4(uint8_t);
void printHex8(uint8_t); void printHex8(uint8_t);
void printDec(uint8_t); void printDec(uint8_t);
void println(void); void println( bool bLogging = false );
void sendByte(uint8_t); void sendByte(uint8_t);
char read(); char read();

47
AVCLan_mini/AVCLan_mini.ino
View File

@ -41,9 +41,9 @@ void setup()
// waitErrorTime = 0; // waitErrorTime = 0;
avclanBT.begin(); avclanBT.begin();
avclanBT.print("Start HONDA avclan.#"); avclanBT.print("Start HONDA avclan.#", true );
sprintf( BUFFF, "%s", IEBUS_VERSION ); sprintf( BUFFF, "%s", IEBUS_VERSION );
avclanBT.println( BUFFF ); avclanBT.println( BUFFF, true );
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
@ -58,6 +58,7 @@ void loop()
if ( avclanHonda.bFirstStart_20 && !avclanHonda.isShowRearCam() && (INIT_TIME < millis()) ) if ( avclanHonda.bFirstStart_20 && !avclanHonda.isShowRearCam() && (INIT_TIME < millis()) )
{ {
avclanBT.print("[setHondaDis = false]");
avclanHonda.setHondaDis( false ); //Show GVN screen avclanHonda.setHondaDis( false ); //Show GVN screen
} }
@ -65,6 +66,7 @@ void loop()
if ( avclanHonda.freezeTime < millis() ) { if ( avclanHonda.freezeTime < millis() ) {
avclanHonda.bFreeze = false; avclanHonda.bFreeze = false;
avclanHonda.freezeTime = 0L; avclanHonda.freezeTime = 0L;
avclanBT.print("[reset freezeTime]");
} }
} }
@ -78,20 +80,25 @@ void loop()
avclan.printMessage(true); avclan.printMessage(true);
avclanHonda.getActionID(); avclanHonda.getActionID();
if ( (INIT2_TIME > millis()) && (avclan.actionID == ACT_CAM_ON) ) if ( avclan.actionID != ACT_NONE )
{ {
avclanBT.printAction( (AvcActionID)avclan.actionID ); if ( (INIT2_TIME > millis()) && (avclan.actionID == ACT_CAM_ON) )
avclanHonda.processAction( (AvcActionID)avclan.actionID ); {
} avclanBT.println("[Time < INIT2_TIME]");
else if ( (avclan.actionID != ACT_NONE) && ( INIT2_TIME < millis() ) && (!avclanHonda.bFreeze) ) avclanBT.printAction( (AvcActionID)avclan.actionID );
{ avclanHonda.processAction( (AvcActionID)avclan.actionID );
avclanBT.printAction((AvcActionID)avclan.actionID); }
avclanHonda.processAction( (AvcActionID)avclan.actionID ); else if ( ( INIT2_TIME < millis() ) && (!avclanHonda.bFreeze) )
} {
else // first 20 sek we should react only on rear cam on/off avclanBT.printAction((AvcActionID)avclan.actionID);
{ avclanHonda.processAction( (AvcActionID)avclan.actionID );
// if ( avclanHonda.bFirstStart_20 ) avclanBT.println(">>FIRST_SKIP<<"); }
// else if ( avclanHonda.bFreeze ) avclanBT.println(">>FREEZE_SKIP<<"); else // first 20 sek we should react only on rear cam on/off
{
avclanBT.println("[------SKIP------]");
avclanBT.printAction( (AvcActionID)avclan.actionID );
avclanBT.println("[----------------]");
}
} }
LED_ON; LED_ON;
@ -117,17 +124,22 @@ void loop()
if ( avclanHonda.isWait() ) if ( avclanHonda.isWait() )
{ {
avclanHonda.checkWait(); avclanHonda.checkWait();
if ( !avclanHonda.isWait() ) avclanHonda.tryToShowHondaDisp(); if ( !avclanHonda.isWait() ) {
avclanBT.println("[reset isWait]");
avclanHonda.tryToShowHondaDisp();
}
} }
else else
{ {
if ( avclanHonda.getCommute() ) if ( avclanHonda.getCommute() )
{ {
HONDA_DIS_ON; HONDA_DIS_ON;
avclanBT.println("[HONDA_DIS_ON]");
} }
else else
{ {
HONDA_DIS_OFF; HONDA_DIS_OFF;
avclanBT.println("[HONDA_DIS_OFF]");
} }
} }
@ -141,9 +153,10 @@ void loop()
LED_OFF; LED_OFF;
HONDA_DIS_ON; HONDA_DIS_ON;
avclanBT.println("[HONDA_DIS_ON]");
sprintf(BUFFF, "Error: %d", errorID ); sprintf(BUFFF, "Error: %d", errorID );
avclanBT.println( BUFFF ); avclanBT.println( BUFFF, true );
} }
} }