Fix some more unused-but-set-variable warnings

And autoformat some of the examples
This commit is contained in:
Kristian Sloth Lauszus 2016-04-19 17:12:10 +02:00
parent 938880b71d
commit 14021813ef
2 changed files with 62 additions and 46 deletions

View file

@ -10,25 +10,25 @@
USB Usb; USB Usb;
//USBHub Hub(&Usb); //USBHub Hub(&Usb);
ADK adk(&Usb,"Circuits@Home, ltd.", ADK adk(&Usb, "Circuits@Home, ltd.",
"USB Host Shield", "USB Host Shield",
"Arduino Terminal for Android", "Arduino Terminal for Android",
"1.0", "1.0",
"http://www.circuitsathome.com", "http://www.circuitsathome.com",
"0000000000000001"); "0000000000000001");
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
#if !defined(__MIPSEL__) #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 while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
#endif #endif
Serial.println("\r\nADK demo start"); Serial.println("\r\nADK demo start");
if (Usb.Init() == -1) { if (Usb.Init() == -1) {
Serial.println("OSCOKIRQ failed to assert"); Serial.println("OSCOKIRQ failed to assert");
while(1); //halt while (1); //halt
}//if (Usb.Init() == -1... }//if (Usb.Init() == -1...
} }
void loop() void loop()
@ -37,29 +37,37 @@ void loop()
uint8_t msg[64] = { 0x00 }; uint8_t msg[64] = { 0x00 };
const char* recv = "Received: "; const char* recv = "Received: ";
Usb.Task(); Usb.Task();
if( adk.isReady() == false ) { if ( adk.isReady() == false ) {
return; return;
} }
uint16_t len = 64; uint16_t len = 64;
rcode = adk.RcvData(&len, msg); rcode = adk.RcvData(&len, msg);
if( rcode & ( rcode != hrNAK )) { if ( rcode & ( rcode != hrNAK )) {
USBTRACE2("Data rcv. :", rcode ); USBTRACE2("Data rcv. :", rcode );
} }
if(len > 0) { if (len > 0) {
USBTRACE("\r\nData Packet."); 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]); Serial.print((char)msg[i]);
} }
/* sending back what was received */ /* sending back what was received */
rcode = adk.SndData( strlen( recv ), (uint8_t *)recv ); 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 ); 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 );
} }

View file

@ -9,25 +9,25 @@
USB Usb; USB Usb;
ADK adk(&Usb,"Circuits@Home, ltd.", ADK adk(&Usb, "Circuits@Home, ltd.",
"USB Host Shield", "USB Host Shield",
"Arduino Terminal for Android", "Arduino Terminal for Android",
"1.0", "1.0",
"http://www.circuitsathome.com", "http://www.circuitsathome.com",
"0000000000000001"); "0000000000000001");
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
#if !defined(__MIPSEL__) #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 while (!Serial); // Wait for serial port to connect - used on Leonardo, Teensy and other boards with built-in USB CDC serial connection
#endif #endif
Serial.println("\r\nADK demo start"); Serial.println("\r\nADK demo start");
if (Usb.Init() == -1) { if (Usb.Init() == -1) {
Serial.println("OSCOKIRQ failed to assert"); Serial.println("OSCOKIRQ failed to assert");
while(1); //halt while (1); //halt
}//if (Usb.Init() == -1... }//if (Usb.Init() == -1...
} }
void loop() void loop()
@ -36,15 +36,23 @@ void loop()
const char* sec_ela = " seconds elapsed\r"; const char* sec_ela = " seconds elapsed\r";
uint8_t rcode; uint8_t rcode;
Usb.Task(); Usb.Task();
if( adk.isReady() == false ) { if ( adk.isReady() == false ) {
return; return;
} }
ultoa( millis()/1000, (char *)buf, 10 ); ultoa( millis() / 1000, (char *)buf, 10 );
rcode = adk.SndData( strlen((char *)buf), buf ); rcode = adk.SndData( strlen((char *)buf), buf );
rcode = adk.SndData( strlen( sec_ela), (uint8_t *)sec_ela ); 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 );
} }