Skip to content

GitLab

R
RF24
Commit 7005c479 authored by TMRh20's avatar TMRh20
Browse files
Options

Merge remote-tracking branch 'origin/Updates'

parents 417e6e52 594a949b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
RF24.cpp
View file @ 7005c479
...@@ -388,11 +388,9 @@ void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty) ...@@ -388,11 +388,9 @@ void RF24::print_byte_register(const char* name, uint8_t reg, uint8_t qty)
//char extra_tab = strlen_P(name) < 8 ? '\t' : 0; //char extra_tab = strlen_P(name) < 8 ? '\t' : 0;
//printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab); //printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
#if defined (RF24_LINUX) #if defined (RF24_LINUX)
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; printf("%s\t =", name);
printf("%s\t%c =", name, extra_tab);
#else #else
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; printf_P(PSTR(PRIPSTR"\t ="),name);
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
#endif #endif
while (qty--) while (qty--)
printf_P(PSTR(" 0x%02x"),read_register(reg++)); printf_P(PSTR(" 0x%02x"),read_register(reg++));
...@@ -405,11 +403,9 @@ void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty) ...@@ -405,11 +403,9 @@ void RF24::print_address_register(const char* name, uint8_t reg, uint8_t qty)
{ {
#if defined (RF24_LINUX) #if defined (RF24_LINUX)
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; printf("%s\t =",name);
printf("%s\t%c =",name,extra_tab);
#else #else
char extra_tab = strlen_P(name) < 8 ? '\t' : 0; printf_P(PSTR(PRIPSTR"\t ="),name);
printf_P(PSTR(PRIPSTR"\t%c ="),name,extra_tab);
#endif #endif
while (qty--) while (qty--)
{ {
...@@ -555,14 +551,14 @@ void RF24::printDetails(void) ...@@ -555,14 +551,14 @@ void RF24::printDetails(void)
print_address_register(PSTR("RX_ADDR_P0-1"),RX_ADDR_P0,2); 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_byte_register(PSTR("RX_ADDR_P2-5"),RX_ADDR_P2,4);
print_address_register(PSTR("TX_ADDR"),TX_ADDR); print_address_register(PSTR("TX_ADDR\t"),TX_ADDR);
print_byte_register(PSTR("RX_PW_P0-6"),RX_PW_P0,6); 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_AA\t"),EN_AA);
print_byte_register(PSTR("EN_RXADDR"),EN_RXADDR); print_byte_register(PSTR("EN_RXADDR"),EN_RXADDR);
print_byte_register(PSTR("RF_CH"),RF_CH); print_byte_register(PSTR("RF_CH\t"),RF_CH);
print_byte_register(PSTR("RF_SETUP"),RF_SETUP); print_byte_register(PSTR("RF_SETUP"),RF_SETUP);
print_byte_register(PSTR("CONFIG"),CONFIG); print_byte_register(PSTR("CONFIG\t"),CONFIG);
print_byte_register(PSTR("DYNPD/FEATURE"),DYNPD,2); print_byte_register(PSTR("DYNPD/FEATURE"),DYNPD,2);
#if defined(__arm__) || defined (RF24_LINUX) || defined (__ARDUINO_X86__) || defined(LITTLEWIRE) || defined (RF24_BBB) #if defined(__arm__) || defined (RF24_LINUX) || defined (__ARDUINO_X86__) || defined(LITTLEWIRE) || defined (RF24_BBB)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment