Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch 1 - fix pipe errors on write(), fix write() return for println(), turn off BLE_RW_DEBUG #13

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Patch 1 - fix pipe errors on write(), fix write() return for println(), turn off BLE_RW_DEBUG #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b7900
Fix pipe errors on write() -- error 0x91
neilsunw Feb 22, 2015
978d750
fix write(buffer,len) return code calculation
neilsunw Feb 22, 2015
5e9236a
turn off BLE_RW_DEBUG
neilsunw Feb 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions Adafruit_BLE_UART.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ Written by Kevin Townsend/KTOWN for Adafruit Industries.
MIT license, check LICENSE for more information
All text above, and the splash screen below must be included in any redistribution
*********************************************************************/
// NBP (2/21/2015): Modified to fix pipe errors on Adafruit_BLE_UART::write()
// pipe error 0x91 "ACI_STATUS_ERROR_CREDIT_NOT_AVAILABLE"
// * write() added check of aci_state.data_credit_available along with lib_aci_is_pipe_available()
// before calling lib_aci_send_data() -- credit was going below 0 (wrap around to 255)
// * Discovered missing break in pollACI() after case ACI_EVT_CONNECTED block.
// * pollACI() case ACI_EVT_PIPE_ERROR removed credit increment, let ACI_EVT_DATA_CREDIT do it.
// * write() removed delay(35), not needed with credit check fixes.
// Seems to also reduce transmission losses (allows for more pollACI() calls?)

#include <SPI.h>
#include <avr/pgmspace.h>
#include <util/delay.h>
Expand Down Expand Up @@ -249,7 +258,8 @@ size_t Adafruit_BLE_UART::write(uint8_t * buffer, uint8_t len)
if(bytesThisPass > ACI_PIPE_TX_DATA_MAX_LEN)
bytesThisPass = ACI_PIPE_TX_DATA_MAX_LEN;

if(!lib_aci_is_pipe_available(&aci_state, PIPE_UART_OVER_BTLE_UART_TX_TX))
if((!lib_aci_is_pipe_available(&aci_state, PIPE_UART_OVER_BTLE_UART_TX_TX))
|| aci_state.data_credit_available < 1) // NBP (2/21/2015): need to check for available credit
{
pollACI();
continue;
Expand All @@ -259,9 +269,9 @@ size_t Adafruit_BLE_UART::write(uint8_t * buffer, uint8_t len)
bytesThisPass);
aci_state.data_credit_available--;

delay(35); // required delay between sends
//delay(35); // required delay between sends -- NBP (2/21/2015) not needed with credit check fix

if(!(len -= bytesThisPass)) break;
len -= bytesThisPass; // NBP (2/22/2015) fix for return value, no break, also fixes println()
sent += bytesThisPass;
}

Expand All @@ -273,12 +283,13 @@ size_t Adafruit_BLE_UART::write(uint8_t buffer)
#ifdef BLE_RW_DEBUG
Serial.print(F("\tWriting one byte 0x")); Serial.println(buffer, HEX);
#endif
if (lib_aci_is_pipe_available(&aci_state, PIPE_UART_OVER_BTLE_UART_TX_TX))
if (lib_aci_is_pipe_available(&aci_state, PIPE_UART_OVER_BTLE_UART_TX_TX)
&& aci_state.data_credit_available > 0) // NBP (2/21/2015): need to check for available credit
{
lib_aci_send_data(PIPE_UART_OVER_BTLE_UART_TX_TX, &buffer, 1);
aci_state.data_credit_available--;

delay(35); // required delay between sends
//delay(35); // required delay between sends -- NBP (2/21/2015) not needed with credit check fix
return 1;
}

Expand Down Expand Up @@ -383,7 +394,8 @@ void Adafruit_BLE_UART::pollACI()
defaultACICallback(ACI_EVT_CONNECTED);
if (aci_event)
aci_event(ACI_EVT_CONNECTED);

break; // NBP (2/21/2015): add missing break (?)

case ACI_EVT_PIPE_STATUS:
if (lib_aci_is_pipe_available(&aci_state, PIPE_UART_OVER_BTLE_UART_TX_TX) && (false == timing_change_done))
{
Expand Down Expand Up @@ -432,7 +444,7 @@ void Adafruit_BLE_UART::pollACI()
}

/* Increment the credit available as the data packet was not sent */
aci_state.data_credit_available++;
//aci_state.data_credit_available++; // NBP (2/21/2015): do not increment, let ACI_EVT_DATA_CREDIT do it.
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion Adafruit_BLE_UART.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ All text above, and the splash screen below must be included in any redistributi

#include "utility/aci_evts.h"

#define BLE_RW_DEBUG
//#define BLE_RW_DEBUG

extern "C"
{
Expand Down