diff --git a/AVCLan_mini/AVCLanDrv.cpp b/AVCLan_mini/AVCLanDrv.cpp index 4a2077d..bccb104 100644 --- a/AVCLan_mini/AVCLanDrv.cpp +++ b/AVCLan_mini/AVCLanDrv.cpp @@ -99,6 +99,7 @@ byte AVCLanDrv::_readMessage () if (t < AVC_START_BIT_HOLD_ON_MIN_LENGTH) { //if (t < 0x16){ + avclanBT.print("-->t=", true); avclanBT.printDec(t); avclanBT.println(); SREG = oldSREG; return 2; } diff --git a/AVCLan_mini/AVCLanHonda.cpp b/AVCLan_mini/AVCLanHonda.cpp index 427c57a..3d27c02 100644 --- a/AVCLan_mini/AVCLanHonda.cpp +++ b/AVCLan_mini/AVCLanHonda.cpp @@ -102,7 +102,7 @@ void AVCLanHonda::processAction( AvcActionID ActionID ) if ( bPrepareCamOff && (ACT_B_DISPOFF == ActionID) ) { ActionID = ACT_CAM_OFF; - avclanBT.print("CAMOFF+DISPOFF"); + avclanBT.println("[CAMOFF+DISPOFF]"); } else bPrepareCamOff = false; switch ( ActionID ) { diff --git a/AVCLan_mini/AVCLan_BT.cpp b/AVCLan_mini/AVCLan_BT.cpp index a194f4d..0a452f8 100644 --- a/AVCLan_mini/AVCLan_BT.cpp +++ b/AVCLan_mini/AVCLan_BT.cpp @@ -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"); } //-------------------------------------------------------------------------------- diff --git a/AVCLan_mini/AVCLan_BT.h b/AVCLan_mini/AVCLan_BT.h index 124d488..ee9e2bd 100644 --- a/AVCLan_mini/AVCLan_BT.h +++ b/AVCLan_mini/AVCLan_BT.h @@ -16,12 +16,12 @@ class AVCLanBT public: void begin (); // initialisation, obligatory method - void println( char*); - void print(const char*); + void println( char*, bool bLogging = false ); + void print(const char*, bool bLogging = false ); void printHex4(uint8_t); void printHex8(uint8_t); void printDec(uint8_t); - void println(void); + void println( bool bLogging = false ); void sendByte(uint8_t); char read(); diff --git a/AVCLan_mini/AVCLan_mini.ino b/AVCLan_mini/AVCLan_mini.ino index 94ad7c2..25bb8cd 100644 --- a/AVCLan_mini/AVCLan_mini.ino +++ b/AVCLan_mini/AVCLan_mini.ino @@ -41,9 +41,9 @@ void setup() // waitErrorTime = 0; avclanBT.begin(); - avclanBT.print("Start HONDA avclan.#"); + avclanBT.print("Start HONDA avclan.#", true ); 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()) ) { + avclanBT.print("[setHondaDis = false]"); avclanHonda.setHondaDis( false ); //Show GVN screen } @@ -65,6 +66,7 @@ void loop() if ( avclanHonda.freezeTime < millis() ) { avclanHonda.bFreeze = false; avclanHonda.freezeTime = 0L; + avclanBT.print("[reset freezeTime]"); } } @@ -78,20 +80,25 @@ void loop() avclan.printMessage(true); avclanHonda.getActionID(); - if ( (INIT2_TIME > millis()) && (avclan.actionID == ACT_CAM_ON) ) + if ( avclan.actionID != ACT_NONE ) { - avclanBT.printAction( (AvcActionID)avclan.actionID ); - avclanHonda.processAction( (AvcActionID)avclan.actionID ); - } - else if ( (avclan.actionID != ACT_NONE) && ( INIT2_TIME < millis() ) && (!avclanHonda.bFreeze) ) - { - avclanBT.printAction((AvcActionID)avclan.actionID); - avclanHonda.processAction( (AvcActionID)avclan.actionID ); - } - else // first 20 sek we should react only on rear cam on/off - { - // if ( avclanHonda.bFirstStart_20 ) avclanBT.println(">>FIRST_SKIP<<"); - // else if ( avclanHonda.bFreeze ) avclanBT.println(">>FREEZE_SKIP<<"); + if ( (INIT2_TIME > millis()) && (avclan.actionID == ACT_CAM_ON) ) + { + avclanBT.println("[Time < INIT2_TIME]"); + avclanBT.printAction( (AvcActionID)avclan.actionID ); + avclanHonda.processAction( (AvcActionID)avclan.actionID ); + } + else if ( ( INIT2_TIME < millis() ) && (!avclanHonda.bFreeze) ) + { + avclanBT.printAction((AvcActionID)avclan.actionID); + avclanHonda.processAction( (AvcActionID)avclan.actionID ); + } + 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; @@ -117,17 +124,22 @@ void loop() if ( avclanHonda.isWait() ) { avclanHonda.checkWait(); - if ( !avclanHonda.isWait() ) avclanHonda.tryToShowHondaDisp(); + if ( !avclanHonda.isWait() ) { + avclanBT.println("[reset isWait]"); + avclanHonda.tryToShowHondaDisp(); + } } else { if ( avclanHonda.getCommute() ) { HONDA_DIS_ON; + avclanBT.println("[HONDA_DIS_ON]"); } else { HONDA_DIS_OFF; + avclanBT.println("[HONDA_DIS_OFF]"); } } @@ -141,9 +153,10 @@ void loop() LED_OFF; HONDA_DIS_ON; + avclanBT.println("[HONDA_DIS_ON]"); sprintf(BUFFF, "Error: %d", errorID ); - avclanBT.println( BUFFF ); + avclanBT.println( BUFFF, true ); } }