specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Better print routines

Browse source 
Also added ability to print arrays
This commit is contained in:
Kristian Lauszus 2012-07-31 21:10:25 +02:00
parent 90f477a1c0
commit 2fb8dcf8ae
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
RFCOMM.cpp
View file

@ -1509,13 +1509,18 @@ void RFCOMM::print(const char* data) {
RFCOMM_Command(rfcommbuf,strlen(data)+4); RFCOMM_Command(rfcommbuf,strlen(data)+4);
} }
void RFCOMM::print(uint8_t data) { void RFCOMM::print(uint8_t data) {
print(&data,1);
}
void RFCOMM::print(uint8_t* array, uint8_t length) {
rfcommbuf[0] = rfcommChannelPermanent | 0 | 0 | extendAddress;; // RFCOMM Address rfcommbuf[0] = rfcommChannelPermanent | 0 | 0 | extendAddress;; // RFCOMM Address
rfcommbuf[1] = RFCOMM_UIH; // RFCOMM Control rfcommbuf[1] = RFCOMM_UIH; // RFCOMM Control
rfcommbuf[2] = 1 << 1 | 1; // Length = 1 rfcommbuf[2] = length << 1 | 1; // Length
rfcommbuf[3] = data; uint8_t i = 0;
rfcommbuf[4] = calcFcs(rfcommbuf); for(; i < length; i++)
rfcommbuf[i+3] = array[i];
rfcommbuf[i+3] = calcFcs(rfcommbuf);
RFCOMM_Command(rfcommbuf,5); RFCOMM_Command(rfcommbuf,length+4);
} }
void RFCOMM::println(const char* data) { void RFCOMM::println(const char* data) {
@ -1525,9 +1530,17 @@ void RFCOMM::println(const char* data) {
print(output); print(output);
} }
void RFCOMM::println(uint8_t data) { void RFCOMM::println(uint8_t data) {
print(data); uint8_t buf[3] = {data, '\r', '\n'};
print("\r\n"); print(buf,3);
} }
void RFCOMM::println(uint8_t* array, uint8_t length) {
uint8_t buf[length+2];
memcpy(buf,array,length);
buf[length] = '\r';
buf[length+1] = '\n';
print(buf,length+2);
}
uint8_t RFCOMM::read() { uint8_t RFCOMM::read() {
uint8_t output = rfcommDataBuffer[0]; uint8_t output = rfcommDataBuffer[0];
for(uint8_t i = 1; i < rfcommAvailable; i++) for(uint8_t i = 1; i < rfcommAvailable; i++)

2
RFCOMM.h
View file

@ -202,8 +202,10 @@ public:
/* Serial commands currently supported */ /* Serial commands currently supported */
void print(const char* data); // Used to send strings void print(const char* data); // Used to send strings
void print(uint8_t data); // Used to send single bytes void print(uint8_t data); // Used to send single bytes
void print(uint8_t* array, uint8_t length); // Used to send arrays
void println(const char* data); // Include newline and carriage return void println(const char* data); // Include newline and carriage return
void println(uint8_t data); // Include newline and carriage return void println(uint8_t data); // Include newline and carriage return
void println(uint8_t* array, uint8_t length); // Include newline and carriage return
uint8_t available() { return rfcommAvailable; }; // Get the bytes waiting to be read uint8_t available() { return rfcommAvailable; }; // Get the bytes waiting to be read
uint8_t read(); // Used to read the buffer uint8_t read(); // Used to read the buffer