mirror of
https://github.com/felis/USB_Host_Shield_2.0.git
synced 2024-03-22 11:31:26 +01:00
Can now print more than 60 bytes
This commit is contained in:
parent
7ceeb2b2f5
commit
813c5192d4
2 changed files with 64 additions and 28 deletions
90
SPP.cpp
90
SPP.cpp
|
@ -729,51 +729,87 @@ uint8_t SPP::calcFcs(uint8_t *data) {
|
||||||
void SPP::print(const String &str) {
|
void SPP::print(const String &str) {
|
||||||
if (!connected)
|
if (!connected)
|
||||||
return;
|
return;
|
||||||
uint8_t length = str.length();
|
int16_t stringLength = str.length(); // This will be used to store the characters that still needs to be sent
|
||||||
if (length > (sizeof (l2capoutbuf) - 4))
|
uint8_t length; // This is the length of the string we are sending
|
||||||
length = sizeof (l2capoutbuf) - 4;
|
uint8_t offset = 0; // This is used to keep track of where we are in the string
|
||||||
|
|
||||||
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
||||||
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
||||||
l2capoutbuf[2] = length << 1 | 1; // Length
|
|
||||||
uint8_t i = 0;
|
|
||||||
for (; i < length; i++)
|
|
||||||
l2capoutbuf[i + 3] = str[i];
|
|
||||||
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf);
|
|
||||||
|
|
||||||
RFCOMM_Command(l2capoutbuf, length + 4);
|
do {
|
||||||
|
if (stringLength > (sizeof (l2capoutbuf) - 4)) // Check if the string is larger that the outgoing puffer
|
||||||
|
length = sizeof (l2capoutbuf) - 4;
|
||||||
|
else
|
||||||
|
length = stringLength;
|
||||||
|
|
||||||
|
l2capoutbuf[2] = length << 1 | 1; // Length
|
||||||
|
uint8_t i = 0;
|
||||||
|
for (; i < length; i++)
|
||||||
|
l2capoutbuf[i + 3] = str[i + offset];
|
||||||
|
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf); // Calculate checksum
|
||||||
|
|
||||||
|
RFCOMM_Command(l2capoutbuf, length + 4);
|
||||||
|
|
||||||
|
stringLength -= length;
|
||||||
|
offset += length; // Increment the offset
|
||||||
|
} while (stringLength); // We will run this loop until this variable is less than 0
|
||||||
}
|
}
|
||||||
|
|
||||||
void SPP::print(const char* str) {
|
void SPP::print(const char* str) {
|
||||||
if (!connected)
|
if (!connected)
|
||||||
return;
|
return;
|
||||||
uint8_t length = strlen(str);
|
int16_t stringLength = strlen(str); // This will be used to store the characters that still needs to be sent
|
||||||
if (length > (sizeof (l2capoutbuf) - 4))
|
uint8_t length; // This is the length of the string we are sending
|
||||||
length = sizeof (l2capoutbuf) - 4;
|
uint8_t offset = 0; // This is used to keep track of where we are in the string
|
||||||
|
|
||||||
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
||||||
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
||||||
l2capoutbuf[2] = length << 1 | 1; // Length
|
|
||||||
uint8_t i = 0;
|
|
||||||
for (; i < length; i++)
|
|
||||||
l2capoutbuf[i + 3] = str[i];
|
|
||||||
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf);
|
|
||||||
|
|
||||||
RFCOMM_Command(l2capoutbuf, length + 4);
|
do {
|
||||||
|
if (stringLength > (sizeof (l2capoutbuf) - 4)) // Check if the string is larger that the outgoing puffer
|
||||||
|
length = sizeof (l2capoutbuf) - 4;
|
||||||
|
else
|
||||||
|
length = stringLength;
|
||||||
|
|
||||||
|
l2capoutbuf[2] = length << 1 | 1; // Length
|
||||||
|
uint8_t i = 0;
|
||||||
|
for (; i < length; i++)
|
||||||
|
l2capoutbuf[i + 3] = str[i + offset];
|
||||||
|
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf); // Calculate checksum
|
||||||
|
|
||||||
|
RFCOMM_Command(l2capoutbuf, length + 4);
|
||||||
|
|
||||||
|
stringLength -= length;
|
||||||
|
offset += length; // Increment the offset
|
||||||
|
} while (stringLength); // We will run this loop until this variable is less than 0
|
||||||
}
|
}
|
||||||
|
|
||||||
void SPP::print(uint8_t* array, uint8_t length) {
|
void SPP::print(uint8_t* array, int16_t stringLength) {
|
||||||
if (!connected)
|
if (!connected)
|
||||||
return;
|
return;
|
||||||
if (length > (sizeof (l2capoutbuf) - 4))
|
uint8_t length; // This is the length of the string we are sending
|
||||||
length = sizeof (l2capoutbuf) - 4;
|
uint8_t offset = 0; // This is used to keep track of where we are in the string
|
||||||
|
|
||||||
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
l2capoutbuf[0] = rfcommChannelConnection | 0 | 0 | extendAddress; // RFCOMM Address
|
||||||
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
l2capoutbuf[1] = RFCOMM_UIH; // RFCOMM Control
|
||||||
l2capoutbuf[2] = length << 1 | 1; // Length
|
|
||||||
uint8_t i = 0;
|
|
||||||
for (; i < length; i++)
|
|
||||||
l2capoutbuf[i + 3] = array[i];
|
|
||||||
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf);
|
|
||||||
|
|
||||||
RFCOMM_Command(l2capoutbuf, length + 4);
|
do {
|
||||||
|
if (stringLength > (sizeof (l2capoutbuf) - 4)) // Check if the string is larger that the outgoing puffer
|
||||||
|
length = sizeof (l2capoutbuf) - 4;
|
||||||
|
else
|
||||||
|
length = stringLength;
|
||||||
|
|
||||||
|
l2capoutbuf[2] = length << 1 | 1; // Length
|
||||||
|
uint8_t i = 0;
|
||||||
|
for (; i < length; i++)
|
||||||
|
l2capoutbuf[i + 3] = array[i + offset];
|
||||||
|
l2capoutbuf[i + 3] = calcFcs(l2capoutbuf); // Calculate checksum
|
||||||
|
|
||||||
|
RFCOMM_Command(l2capoutbuf, length + 4);
|
||||||
|
|
||||||
|
stringLength -= length;
|
||||||
|
offset += length; // Increment the offset
|
||||||
|
} while (stringLength); // We will run this loop until this variable is less than 0
|
||||||
}
|
}
|
||||||
|
|
||||||
void SPP::println(const String &str) {
|
void SPP::println(const String &str) {
|
||||||
|
|
2
SPP.h
2
SPP.h
|
@ -158,7 +158,7 @@ public:
|
||||||
* @param array Array to send.
|
* @param array Array to send.
|
||||||
* @param length Number of bytes to send.
|
* @param length Number of bytes to send.
|
||||||
*/
|
*/
|
||||||
void print(uint8_t* array, uint8_t length);
|
void print(uint8_t* array, int16_t length);
|
||||||
/**
|
/**
|
||||||
* Same as print(uint8_t* array, uint8_t length), but will include newline and carriage return.
|
* Same as print(uint8_t* array, uint8_t length), but will include newline and carriage return.
|
||||||
* @param array Array to send.
|
* @param array Array to send.
|
||||||
|
|
Loading…
Reference in a new issue