MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lib now passes all tests

Browse Source 
Added back original startWrite function for when users want to use
manual methods. The library uses startFastWrite for its internal
functions. Provides compatibility with prev. code while still using the
new methods for everything else.
This commit is contained in:
TMRh20
2014-03-22 18:39:46 -06:00
parent f3b3fb1f44
commit 4340d9339a
2 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RF24.cpp
+23 -5
View File
@@ -448,7 +448,7 @@ void RF24::powerUp(void)
bool RF24::write( const void* buf, uint8_t len )
{
//Start Writing
startWrite(buf,len);
startFastWrite(buf,len);
//Wait until complete or failed
//ACK payloads that are handled improperly will cause this to hang
@@ -487,7 +487,7 @@ bool RF24::writeBlocking( const void* buf, uint8_t len )
}
//Start Writing
startWrite(buf,len);
startFastWrite(buf,len);
return 1;
}
@@ -525,7 +525,7 @@ bool RF24::writeFast( const void* buf, uint8_t len )
}
//Start Writing
startWrite(buf,len);
startFastWrite(buf,len);
return 1;
}
@@ -539,7 +539,7 @@ bool RF24::writeFast( const void* buf, uint8_t len )
//Otherwise we enter Standby-II mode, which is still faster than standby mode
//Also, we remove the need to keep writing the config register over and over and delaying for 150 us each time if sending a stream of data
void RF24::startWrite( const void* buf, uint8_t len ){ //TMRh20
void RF24::startFastWrite( const void* buf, uint8_t len ){ //TMRh20
write_payload( buf,len);
ce(HIGH);
@@ -547,6 +547,24 @@ void RF24::startWrite( const void* buf, uint8_t len ){ //TMRh20
}
//Added the original startWrite back in so users can still use interrupts, ack payloads, etc
//Allows the library to pass all tests
void RF24::startWrite( const void* buf, uint8_t len )
{
// Transmitter power-up
write_register(CONFIG, ( read_register(CONFIG) | _BV(PWR_UP) ) & ~_BV(PRIM_RX) );
delayMicroseconds(150);
// Send the payload
write_payload( buf, len );
// Allons!
ce(HIGH);
delayMicroseconds(15);
ce(LOW);
}
bool RF24::txStandBy(){
if ( (read_register(FIFO_STATUS) & _BV(TX_EMPTY))){
@@ -613,7 +631,7 @@ void RF24::read( void* buf, uint8_t len ){
read_payload( buf, len );
//Clear the two possible interrupt flags with one command
write_register(STATUS,_BV(RX_DR) | _BV(TX_DS) );
write_register(STATUS,_BV(RX_DR) | _BV(MAX_RT) | _BV(TX_DS) );
}