Skip to content

added ble_error function as well as error state variable, I am using ble_error #4

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

Open
cerkiewny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added ble_error function as well as error state variable, I am using ble_error #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion Arduino/libraries/RBL_nRF8001/RBL_nRF8001.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ static hal_aci_evt_t aci_data;
/*Timing change state variable*/
static bool timing_change_done = false;

/* marks the error state of the ble shield*/
static bool error_state = false;

/*Initialize the radio_ack. This is the ack received for every transmitted packet.*/
//static bool radio_ack_pending = false;

Expand Down Expand Up @@ -106,7 +109,7 @@ void ble_begin()
SPI.setClockDivider(SPI_CLOCK_DIV8);
SPI.setDataMode(SPI_MODE0);
#endif

error_state = false;
/* Point ACI data structures to the the setup data that the nRFgo studio generated for the nRF8001 */
if (NULL != services_pipe_type_mapping)
{
Expand Down Expand Up @@ -225,12 +228,17 @@ unsigned char ble_busy()
}
}

bool ble_error(){
return error_state;
}

void ble_reset(uint8_t reset_pin)
{
pinMode(reset_pin, OUTPUT);
digitalWrite(reset_pin, HIGH);
digitalWrite(reset_pin, LOW);
digitalWrite(reset_pin, HIGH);
error_state = false;
}

static void process_events()
Expand Down Expand Up @@ -260,6 +268,7 @@ static void process_events()
if (aci_evt->params.device_started.hw_error)
{
delay(20); //Magic number used to make sure the HW error event is handled correctly.
error_state = true;
}
else
{
Expand Down Expand Up @@ -354,6 +363,7 @@ static void process_events()

case ACI_EVT_PIPE_ERROR:
//See the appendix in the nRF8001 Product Specication for details on the error codes
error_state = true;
Serial.print(F("ACI Evt Pipe Error: Pipe #:"));
Serial.print(aci_evt->params.pipe_error.pipe_number, DEC);
Serial.print(F(" Pipe Error Code: 0x"));
Expand All @@ -372,6 +382,7 @@ static void process_events()

case ACI_EVT_HW_ERROR:
Serial.print(F("HW error: "));
error_state = true;
Serial.println(aci_evt->params.hw_error.line_num, DEC);

for(uint8_t counter = 0; counter <= (aci_evt->len - 3); counter++)
Expand Down
1 change: 1 addition & 0 deletions Arduino/libraries/RBL_nRF8001/RBL_nRF8001.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ unsigned char ble_connected(void);
void ble_set_pins(uint8_t reqn, uint8_t rdyn);
unsigned char ble_busy();
void ble_reset(uint8_t reset_pin);
bool ble_error();

#endif