diff --git a/hw/bleradio.h b/hw/bleradio.h index 4627f54..bf62404 100644 --- a/hw/bleradio.h +++ b/hw/bleradio.h @@ -20,7 +20,7 @@ class BLERadio /* ToDo: Force constructor with event handler callback */ /* These functions must be defined in the sub-class */ - virtual ble_error_t attach(void (*fptr)(void)); + //virtual ble_error_t attach(void (*fptr)(void)); virtual ble_error_t addService(BLEService &) = 0; virtual ble_error_t updateValue(uint8_t, uint8_t, uint8_t[], uint16_t) = 0; virtual ble_error_t start(void) = 0; diff --git a/hw/nrf51822.cpp b/hw/nrf51822.cpp index 372cc43..968e977 100644 --- a/hw/nrf51822.cpp +++ b/hw/nrf51822.cpp @@ -22,7 +22,8 @@ void nRF51822::uartCallback(void) event is raised by the radio HW. */ /**************************************************************************/ -nRF51822::nRF51822() : uart(P0_4, P0_0) +//nRF51822::nRF51822() : uart(P0_4, P0_0) /* LPC812 */ +nRF51822::nRF51822() : uart(p9, p10) /* LPC1768 using apps board */ { /* Setup the nRF UART interface */ uart.baud(9600); @@ -31,7 +32,8 @@ nRF51822::nRF51822() : uart(P0_4, P0_0) uart.attach(this, &nRF51822::uartCallback); /* Add flow control for UART (required by the nRF51822) */ - uart.set_flow_control(Serial::RTSCTS, P0_6, P0_8); + //uart.set_flow_control(Serial::RTSCTS, P0_6, P0_8); /* LPC812 */ + uart.set_flow_control(Serial::RTSCTS, p30, p29); /* LPC1768 */ /* Reset the service counter */ serviceCount = 0; @@ -51,10 +53,10 @@ nRF51822::~nRF51822(void) */ /**************************************************************************/ -ble_error_t nRF51822::attach(void (*fptr)(void)) -{ - return BLE_ERROR_NONE; -} +//ble_error_t nRF51822::attach(void (*fptr)(void)) +//{ +// return BLE_ERROR_NONE; +//} /**************************************************************************/ /*! diff --git a/hw/nrf51822.h b/hw/nrf51822.h index fb3c621..8b839dd 100644 --- a/hw/nrf51822.h +++ b/hw/nrf51822.h @@ -13,7 +13,7 @@ class nRF51822 : public BLERadio virtual ~nRF51822(void); /* Functions that mus be implemented from NRFRadio */ - virtual ble_error_t attach(void (*fptr)(void)); + //virtual ble_error_t attach(void (*fptr)(void)); virtual ble_error_t addService(BLEService &); virtual ble_error_t updateValue(uint8_t, uint8_t, uint8_t[], uint16_t); virtual ble_error_t start(void); diff --git a/mbed-src-flowcontrol.lib b/mbed-src-flowcontrol.lib index 5de2699..1f372ca 100644 --- a/mbed-src-flowcontrol.lib +++ b/mbed-src-flowcontrol.lib @@ -1 +1 @@ -http://mbed.org/users/bogdanm/code/mbed-src-flowcontrol/#8804ac57fc7e +http://mbed.org/users/bogdanm/code/mbed-src-flowcontrol/#d8b836b18f9c