alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc: Minor fixes due to previous rebase

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-09-18 16:33:53 +03:00
committed by Mihai Tudor Panu
parent 428bac360b
commit 5e72c4febd
13 changed files with 14 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nrf24l01/nrf24l01.cxx
View File

@ -48,20 +48,6 @@ NRF24L01::init (uint8_t chip_select, uint8_t chip_enable) {
m_ce = chip_enable;
m_channel = 99;
m_csnPinCtx = mraa_gpio_init (m_csn);
if (m_csnPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(csn) failed, invalid pin?");
return;
}
m_cePinCtx = mraa_gpio_init (m_ce);
if (m_cePinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(ce) failed, invalid pin?");
return;
}
error = m_csnPinCtx.dir(mraa::DIR_OUT);
if (error != mraa::SUCCESS) {
mraa::printError (error);
@ -156,7 +142,8 @@ NRF24L01::setDataReceivedHandler (Callback *call_obj)
dataReceivedHandler = &generic_callback;
}
#else
void setDataReceivedHandler (funcPtrVoidVoid handler)
void
NRF24L01::setDataReceivedHandler (funcPtrVoidVoid handler)
{
dataReceivedHandler = handler;
}