Merge branch 'dev' of github.com:felis/USB_Host_Shield_2.0 into dev

This commit is contained in:
Oleg Mazurov 2012-07-26 13:05:13 -06:00
commit f7b967bcfb
2 changed files with 15 additions and 20 deletions

View file

@ -739,7 +739,7 @@ void RFCOMM::ACL_event_task()
Serial.print(l2capinbuf[16],HEX); Serial.print(l2capinbuf[16],HEX);
Serial.print(" "); Serial.print(" ");
Serial.print(l2capinbuf[17],HEX); Serial.print(l2capinbuf[17],HEX);
*/ */
if ((l2capinbuf[16] << 8 | l2capinbuf[17]) == SERIALPORT_UUID) { if ((l2capinbuf[16] << 8 | l2capinbuf[17]) == SERIALPORT_UUID) {
if(firstMessage) { if(firstMessage) {
serialPortResponse1(l2capinbuf[9],l2capinbuf[10]); serialPortResponse1(l2capinbuf[9],l2capinbuf[10]);
@ -1371,9 +1371,9 @@ void RFCOMM::serialPortResponse2(uint8_t transactionIDHigh, uint8_t transactionI
l2capoutbuf[1] = transactionIDHigh; l2capoutbuf[1] = transactionIDHigh;
l2capoutbuf[2] = transactionIDLow; l2capoutbuf[2] = transactionIDLow;
l2capoutbuf[3] = 0x00; // Parameter Length l2capoutbuf[3] = 0x00; // Parameter Length
l2capoutbuf[4] = 0x21; // Parameter Length l2capoutbuf[4] = 0x1C; // Parameter Length
l2capoutbuf[5] = 0x00; // AttributeListsByteCount l2capoutbuf[5] = 0x00; // AttributeListsByteCount
l2capoutbuf[6] = 0x1E; // AttributeListsByteCount l2capoutbuf[6] = 0x19; // AttributeListsByteCount
/* Attribute ID/Value Sequence: */ /* Attribute ID/Value Sequence: */
l2capoutbuf[7] = 0x01; l2capoutbuf[7] = 0x01;
@ -1396,21 +1396,16 @@ void RFCOMM::serialPortResponse2(uint8_t transactionIDHigh, uint8_t transactionI
l2capoutbuf[23] = 0x01; l2capoutbuf[23] = 0x01;
l2capoutbuf[24] = 0x00; l2capoutbuf[24] = 0x00;
l2capoutbuf[25] = 0x25; l2capoutbuf[25] = 0x25;
l2capoutbuf[26] = 0x0A; // Name length l2capoutbuf[26] = 0x05; // Name length
l2capoutbuf[27] = 'S'; l2capoutbuf[27] = 'T';
l2capoutbuf[28] = 'e'; l2capoutbuf[28] = 'K';
l2capoutbuf[29] = 'r'; l2capoutbuf[29] = 'J';
l2capoutbuf[30] = 'i'; l2capoutbuf[30] = 'S';
l2capoutbuf[31] = 'a'; l2capoutbuf[31] = 'P';
l2capoutbuf[32] = 'l'; l2capoutbuf[32] = 0x00;
l2capoutbuf[33] = 'P';
l2capoutbuf[34] = 'o'; SDP_Command(l2capoutbuf,33);
l2capoutbuf[35] = 'r';
l2capoutbuf[36] = 't';
l2capoutbuf[37] = 0x00;
SDP_Command(l2capoutbuf,38);
} }
void RFCOMM::l2capResponse1(uint8_t transactionIDHigh, uint8_t transactionIDLow) { void RFCOMM::l2capResponse1(uint8_t transactionIDHigh, uint8_t transactionIDLow) {
serialPortResponse1(transactionIDHigh,transactionIDLow); // These has to send include all the supported functions, since it only support virtual serialport it just sends the message again serialPortResponse1(transactionIDHigh,transactionIDLow); // These has to send include all the supported functions, since it only support virtual serialport it just sends the message again

View file

@ -7,8 +7,8 @@
#include <RFCOMM.h> #include <RFCOMM.h>
USB Usb; USB Usb;
/* You can create the instance of the class in two ways */ /* You can create the instance of the class in two ways */
RFCOMM SerialBT(&Usb); // This will set the name to the defaults: "Arduino" and the passcode to "1234" RFCOMM SerialBT(&Usb); // This will set the name to the defaults: "Arduino" and the pin to "1234"
//RFCOMM SerialBT(&Usb, "Lauszus' Arduino","0000"); // You can also set the name and passcode like so //RFCOMM SerialBT(&Usb, "Lauszus' Arduino","0000"); // You can also set the name and pin like so
boolean firstMessage = true; boolean firstMessage = true;