Skip to content

reduce code size on ATtiny #1

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
jscrane wants to merge 31 commits into
base: master
Choose a base branch
from
Open

reduce code size on ATtiny #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ad38f3a
reduce code size on ATtiny
jscrane Aug 30, 2013
01e9840
#ifdefs for attiny
jscrane Sep 5, 2013
d98a6f9
merge ebcd0d1d0b3061fcb57444e1dbe5829ef25705cd
jscrane Nov 19, 2013
edf7af8
energia
jscrane Jun 7, 2014
f06cb9a
fixup for msp430
jscrane Jun 7, 2014
541262d
replacing printf() with printf_P() everywhere
jscrane Jul 23, 2014
82fe103
separate debugging from RF24 class
jscrane Jul 23, 2014
5d7893b
inline print_observe_tx
jscrane Jul 23, 2014
d87354e
fixes for msp430
jscrane Jul 24, 2014
a3a5799
msp430 update
jscrane Jul 24, 2014
f9f0495
- add back printDetails() on RF24 for backwards compatibility
jscrane Jul 25, 2014
3b0dd05
update for new debugging
jscrane Jul 25, 2014
904b959
debug
jscrane Jul 25, 2014
d1c927a
add setter for debug
jscrane Jul 29, 2014
ba0da8c
Merge branch 'master' of github.com:jscrane/RF24
jscrane Jul 29, 2014
9840064
bodge for stellaris
jscrane Jul 29, 2014
ac0c78a
merge msp430 + arduino pingpair examples
jscrane Jul 30, 2014
1e6b222
bugfix
jscrane Jul 30, 2014
d11cf69
improve debugging
jscrane Jul 31, 2014
3def073
grrr
jscrane Jul 31, 2014
418e41d
- remove printf from debugging, replace with Print
jscrane Jul 31, 2014
6621fad
fix for msp430
jscrane Jul 31, 2014
adb9019
- merge RF24Debug.h into RF24.h
jscrane Jul 31, 2014
b292c59
Merge branch 'master' of github.com:jscrane/RF24
jscrane Jul 31, 2014
8b7da7f
update for fraunchpad
jscrane Aug 1, 2014
2835a81
update for new avr toolchain
jscrane Mar 25, 2015
1516d01
Merge branch 'master' of github.com:jscrane/RF24
jscrane Mar 25, 2015
5a49ec8
A simple project from Original RF24 library to just check transmit an…
prasadp4009 Jul 16, 2015
e898fcf
Merge pull request #1 from prasadp4009/master
jscrane Jul 16, 2015
1015610
changes for esp8266
jscrane Jan 31, 2020
46088c1
Merge branch 'master' of github.com:jscrane/RF24
jscrane Jan 31, 2020
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
151 changes: 14 additions & 137 deletions RF24.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ uint8_t RF24::write_register(uint8_t reg, uint8_t value)
{
uint8_t status;

IF_SERIAL_DEBUG(printf_P(PSTR("write_register(%02x,%02x)\r\n"),reg,value));
on_write_register(reg, value);

csn(LOW);
status = SPI.transfer( W_REGISTER | ( REGISTER_MASK & reg ) );
Expand All @@ -104,7 +104,7 @@ uint8_t RF24::write_payload(const void* buf, uint8_t len, const uint8_t writeTyp
uint8_t data_len = min(len,payload_size);
uint8_t blank_len = dynamic_payloads_enabled ? 0 : payload_size - data_len;

//printf("[Writing %u bytes %u blanks]",data_len,blank_len);
on_write_payload(data_len, blank_len);

csn(LOW);
status = SPI.transfer( writeType );
Expand All @@ -127,7 +127,7 @@ uint8_t RF24::read_payload(void* buf, uint8_t len)
uint8_t data_len = min(len,payload_size);
uint8_t blank_len = dynamic_payloads_enabled ? 0 : payload_size - data_len;

//printf("[Reading %u bytes %u blanks]",data_len,blank_len);
on_read_payload(data_len, blank_len);

csn(LOW);
status = SPI.transfer( R_RX_PAYLOAD );
Expand Down Expand Up @@ -181,63 +181,6 @@ uint8_t RF24::get_status(void)

/****************************************************************************/

void RF24::print_status(uint8_t status)
{
printf_P(PSTR("STATUS\t\t = 0x%02x RX_DR=%x TX_DS=%x MAX_RT=%x RX_P_NO=%x TX_FULL=%x\r\n"),
status,
(status & _BV(RX_DR))?1:0,
(status & _BV(TX_DS))?1:0,
(status & _BV(MAX_RT))?1:0,
((status >> RX_P_NO) & B111),
(status & _BV(TX_FULL))?1:0
);
}

/****************************************************************************/

void RF24::print_observe_tx(uint8_t value)
{
printf_P(PSTR("OBSERVE_TX=%02x: POLS_CNT=%x ARC_CNT=%x\r\n"),
value,
(value >> PLOS_CNT) & B1111,
(value >> ARC_CNT) & B1111
);
}

/****************************************************************************/

void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty)
{
char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
while (qty--)
printf_P(PSTR(" 0x%02x"),read_register(reg++));
printf_P(PSTR("\r\n"));
}

/****************************************************************************/

void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty)
{
char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);

while (qty--)
{
uint8_t buffer[5];
read_register(reg++,buffer,sizeof buffer);

printf_P(PSTR(" 0x"));
uint8_t* bufptr = buffer + sizeof buffer;
while( --bufptr >= buffer )
printf_P(PSTR("%02x"),*bufptr);
}

printf_P(PSTR("\r\n"));
}

/****************************************************************************/

RF24::RF24(uint8_t _cepin, uint8_t _cspin):
ce_pin(_cepin), csn_pin(_cspin), wide_band(false), p_variant(false),
payload_size(32), ack_payload_available(false), dynamic_payloads_enabled(false),
Expand Down Expand Up @@ -280,63 +223,6 @@ uint8_t RF24::getPayloadSize(void)

/****************************************************************************/

static const char rf24_datarate_e_str_0[] PROGMEM = "1MBPS";
static const char rf24_datarate_e_str_1[] PROGMEM = "2MBPS";
static const char rf24_datarate_e_str_2[] PROGMEM = "250KBPS";
static const char * const rf24_datarate_e_str_P[] PROGMEM = {
rf24_datarate_e_str_0,
rf24_datarate_e_str_1,
rf24_datarate_e_str_2,
};
static const char rf24_model_e_str_0[] PROGMEM = "nRF24L01";
static const char rf24_model_e_str_1[] PROGMEM = "nRF24L01+";
static const char * const rf24_model_e_str_P[] PROGMEM = {
rf24_model_e_str_0,
rf24_model_e_str_1,
};
static const char rf24_crclength_e_str_0[] PROGMEM = "Disabled";
static const char rf24_crclength_e_str_1[] PROGMEM = "8 bits";
static const char rf24_crclength_e_str_2[] PROGMEM = "16 bits" ;
static const char * const rf24_crclength_e_str_P[] PROGMEM = {
rf24_crclength_e_str_0,
rf24_crclength_e_str_1,
rf24_crclength_e_str_2,
};
static const char rf24_pa_dbm_e_str_0[] PROGMEM = "PA_MIN";
static const char rf24_pa_dbm_e_str_1[] PROGMEM = "PA_LOW";
static const char rf24_pa_dbm_e_str_2[] PROGMEM = "PA_HIGH";
static const char rf24_pa_dbm_e_str_3[] PROGMEM = "PA_MAX";
static const char * const rf24_pa_dbm_e_str_P[] PROGMEM = {
rf24_pa_dbm_e_str_0,
rf24_pa_dbm_e_str_1,
rf24_pa_dbm_e_str_2,
rf24_pa_dbm_e_str_3,
};

void RF24::printDetails(void)
{
print_status(get_status());

print_address_register(PSTR("RX_ADDR_P0-1"),RX_ADDR_P0,2);
print_byte_register(PSTR("RX_ADDR_P2-5"),RX_ADDR_P2,4);
print_address_register(PSTR("TX_ADDR"),TX_ADDR);

print_byte_register(PSTR("RX_PW_P0-6"),RX_PW_P0,6);
print_byte_register(PSTR("EN_AA"),EN_AA);
print_byte_register(PSTR("EN_RXADDR"),EN_RXADDR);
print_byte_register(PSTR("RF_CH"),RF_CH);
print_byte_register(PSTR("RF_SETUP"),RF_SETUP);
print_byte_register(PSTR("CONFIG"),CONFIG);
print_byte_register(PSTR("DYNPD/FEATURE"),DYNPD,2);

printf_P(PSTR("Data Rate\t = %S\r\n"),pgm_read_word(&rf24_datarate_e_str_P[getDataRate()]));
printf_P(PSTR("Model\t\t = %S\r\n"),pgm_read_word(&rf24_model_e_str_P[isPVariant()]));
printf_P(PSTR("CRC Length\t = %S\r\n"),pgm_read_word(&rf24_crclength_e_str_P[getCRCLength()]));
printf_P(PSTR("PA Power\t = %S\r\n"),pgm_read_word(&rf24_pa_dbm_e_str_P[getPALevel()]));
}

/****************************************************************************/

void RF24::begin(void)
{
// Initialize pins
Expand Down Expand Up @@ -386,7 +272,7 @@ void RF24::begin(void)

// Reset current status
// Notice reset and flush is the last thing we do
write_register(STATUS,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
write_register(STATUS_,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );

// Set up default configuration. Callers can always change it later.
// This channel should be universally safe and not bleed over into adjacent
Expand All @@ -403,7 +289,7 @@ void RF24::begin(void)
void RF24::startListening(void)
{
write_register(CONFIG, read_register(CONFIG) | _BV(PWR_UP) | _BV(PRIM_RX));
write_register(STATUS, _BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
write_register(STATUS_, _BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );

// Restore the pipe0 adddress, if exists
if (pipe0_reading_address)
Expand Down Expand Up @@ -465,16 +351,16 @@ bool RF24::write( const void* buf, uint8_t len, const bool multicast )

// IN the end, the send should be blocking. It comes back in 60ms worst case.
// Generally much faster.
uint8_t observe_tx;
uint8_t obs;
uint8_t status;
uint32_t sent_at = micros();
const uint16_t timeout = getMaxTimeout() ; //us to wait for timeout

// Monitor the send
do
{
status = read_register(OBSERVE_TX,&observe_tx,1);
IF_SERIAL_DEBUG(Serial.print(observe_tx,HEX));
status = read_register(OBSERVE_TX, &obs, 1);
observe_tx(obs);
}
while( ! ( status & ( _BV(TX_DS) | _BV(MAX_RT) ) ) && ( micros() - sent_at < timeout ) );

Expand All @@ -490,17 +376,13 @@ bool RF24::write( const void* buf, uint8_t len, const bool multicast )
bool tx_ok, tx_fail;
whatHappened(tx_ok,tx_fail,ack_payload_available);

//printf("%u%u%u\r\n",tx_ok,tx_fail,ack_payload_available);

result = tx_ok;
IF_SERIAL_DEBUG(Serial.print(result?"...OK.":"...Failed"));

// Handle the ack packet
if ( ack_payload_available )
{
ack_payload_length = getDynamicPayloadSize();
IF_SERIAL_DEBUG(Serial.print("[AckPacket]/"));
IF_SERIAL_DEBUG(Serial.println(ack_payload_length,DEC));
on_ack(ack_payload_length);
}

return result;
Expand Down Expand Up @@ -549,9 +431,6 @@ bool RF24::available(uint8_t* pipe_num)
{
uint8_t status = get_status();

// Too noisy, enable if you really want lots o data!!
//IF_SERIAL_DEBUG(print_status(status));

bool result = ( status & _BV(RX_DR) );

if (result)
Expand All @@ -565,12 +444,12 @@ bool RF24::available(uint8_t* pipe_num)
// ??? Should this REALLY be cleared now? Or wait until we
// actually READ the payload?

write_register(STATUS,_BV(RX_DR) );
write_register(STATUS_,_BV(RX_DR) );

// Handle ack payload receipt
if ( status & _BV(TX_DS) )
{
write_register(STATUS,_BV(TX_DS));
write_register(STATUS_,_BV(TX_DS));
}
}

Expand All @@ -594,7 +473,9 @@ void RF24::whatHappened(bool& tx_ok,bool& tx_fail,bool& rx_ready)
{
// Read the status & reset the status in one easy call
// Or is that such a good idea?
uint8_t status = write_register(STATUS,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );
uint8_t status = write_register(STATUS_,_BV(RX_DR) | _BV(TX_DS) | _BV(MAX_RT) );

on_status(status);

// Report to the user what happened
tx_ok = status & _BV(TX_DS);
Expand Down Expand Up @@ -688,8 +569,6 @@ void RF24::enableDynamicPayloads(void)
write_register(FEATURE,read_register(FEATURE) | _BV(EN_DPL) );
}

IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));

// Enable dynamic payload on all pipes
//
// Not sure the use case of only having dynamic payload on certain
Expand Down Expand Up @@ -717,8 +596,6 @@ void RF24::enableAckPayload(void)
write_register(FEATURE,read_register(FEATURE) | _BV(EN_DYN_ACK) | _BV(EN_ACK_PAY) | _BV(EN_DPL) );
}

IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n",read_register(FEATURE)));

//
// Enable dynamic payload on pipes 0 & 1
//
Expand Down
Loading