diff --git a/examples/adk/term_test/term_test.ino b/examples/adk/term_test/term_test.ino index db681c3b..2dea73fd 100644 --- a/examples/adk/term_test/term_test.ino +++ b/examples/adk/term_test/term_test.ino @@ -10,25 +10,25 @@ USB Usb; //USBHub Hub(&Usb); -ADK adk(&Usb,"Circuits@Home, ltd.", - "USB Host Shield", - "Arduino Terminal for Android", - "1.0", - "http://www.circuitsathome.com", - "0000000000000001"); +ADK adk(&Usb, "Circuits@Home, ltd.", + "USB Host Shield", + "Arduino Terminal for Android", + "1.0", + "http://www.circuitsathome.com", + "0000000000000001"); void setup() { - Serial.begin(115200); + Serial.begin(115200); #if !defined(__MIPSEL__) while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection #endif - Serial.println("\r\nADK demo start"); + Serial.println("\r\nADK demo start"); - if (Usb.Init() == -1) { - Serial.println("OSCOKIRQ failed to assert"); - while(1); //halt - }//if (Usb.Init() == -1... + if (Usb.Init() == -1) { + Serial.println("OSCOKIRQ failed to assert"); + while (1); //halt + }//if (Usb.Init() == -1... } void loop() @@ -37,29 +37,37 @@ void loop() uint8_t msg[64] = { 0x00 }; const char* recv = "Received: "; - Usb.Task(); + Usb.Task(); - if( adk.isReady() == false ) { - return; - } - uint16_t len = 64; + if ( adk.isReady() == false ) { + return; + } + uint16_t len = 64; - rcode = adk.RcvData(&len, msg); - if( rcode & ( rcode != hrNAK )) { - USBTRACE2("Data rcv. :", rcode ); - } - if(len > 0) { - USBTRACE("\r\nData Packet."); + rcode = adk.RcvData(&len, msg); + if ( rcode & ( rcode != hrNAK )) { + USBTRACE2("Data rcv. :", rcode ); + } + if (len > 0) { + USBTRACE("\r\nData Packet."); - for( uint8_t i = 0; i < len; i++ ) { + for ( uint8_t i = 0; i < len; i++ ) { Serial.print((char)msg[i]); } /* sending back what was received */ rcode = adk.SndData( strlen( recv ), (uint8_t *)recv ); + if (rcode && rcode != hrNAK) { + Serial.print(F("\r\nData send: ")); + Serial.print(rcode, HEX); + } rcode = adk.SndData( strlen(( char * )msg ), msg ); + if (rcode && rcode != hrNAK) { + Serial.print(F("\r\nData send: ")); + Serial.print(rcode, HEX); + } - }//if( len > 0 )... + }//if( len > 0 )... - delay( 1000 ); + delay( 1000 ); } diff --git a/examples/adk/term_time/term_time.ino b/examples/adk/term_time/term_time.ino index a3f1dbc8..778fb28f 100644 --- a/examples/adk/term_time/term_time.ino +++ b/examples/adk/term_time/term_time.ino @@ -9,25 +9,25 @@ USB Usb; -ADK adk(&Usb,"Circuits@Home, ltd.", - "USB Host Shield", - "Arduino Terminal for Android", - "1.0", - "http://www.circuitsathome.com", - "0000000000000001"); +ADK adk(&Usb, "Circuits@Home, ltd.", + "USB Host Shield", + "Arduino Terminal for Android", + "1.0", + "http://www.circuitsathome.com", + "0000000000000001"); void setup() { - Serial.begin(115200); + Serial.begin(115200); #if !defined(__MIPSEL__) while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection #endif - Serial.println("\r\nADK demo start"); + Serial.println("\r\nADK demo start"); - if (Usb.Init() == -1) { - Serial.println("OSCOKIRQ failed to assert"); - while(1); //halt - }//if (Usb.Init() == -1... + if (Usb.Init() == -1) { + Serial.println("OSCOKIRQ failed to assert"); + while (1); //halt + }//if (Usb.Init() == -1... } void loop() @@ -36,15 +36,23 @@ void loop() const char* sec_ela = " seconds elapsed\r"; uint8_t rcode; - Usb.Task(); - if( adk.isReady() == false ) { - return; - } + Usb.Task(); + if ( adk.isReady() == false ) { + return; + } - ultoa( millis()/1000, (char *)buf, 10 ); + ultoa( millis() / 1000, (char *)buf, 10 ); - rcode = adk.SndData( strlen((char *)buf), buf ); - rcode = adk.SndData( strlen( sec_ela), (uint8_t *)sec_ela ); + rcode = adk.SndData( strlen((char *)buf), buf ); + if (rcode && rcode != hrNAK) { + Serial.print(F("\r\nData send: ")); + Serial.print(rcode, HEX); + } + rcode = adk.SndData( strlen( sec_ela), (uint8_t *)sec_ela ); + if (rcode && rcode != hrNAK) { + Serial.print(F("\r\nData send: ")); + Serial.print(rcode, HEX); + } - delay( 1000 ); + delay( 1000 ); }