Revision 10:71acc66e27f8, committed 2016-10-17

Comitter:

mrcrsch

Date:

Mon Oct 17 09:02:10 2016 +0000

Parent:

9:ef74df512fed

Commit message:

com

Changed in this revision

diff -r ef74df512fed -r 71acc66e27f8 RF24.cpp
--- a/RF24.cpp	Tue Aug 23 09:28:00 2016 +0000
+++ b/RF24.cpp	Mon Oct 17 09:02:10 2016 +0000
@@ -359,68 +359,19 @@
 
 /****************************************************************************/
 #if !defined (MINIMAL)
-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) & 0b111),
-           (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) & 0b1111,
-           (value >> ARC_CNT) & 0b1111
-          );
-}
 
 /****************************************************************************/
 
-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);
-  
-  
-  
-    printf_P(PSTR(PRIPSTR"\t ="),name);
-  
-  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)
-{
+
 
-  
-  
-  
-    printf_P(PSTR(PRIPSTR"\t ="),name);
-  
-  while (qty--)
-  {
-    uint8_t buffer[addr_width];
-    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"));
-}
 #endif
 /****************************************************************************/
 RF24::RF24(PinName mosi, PinName miso, PinName sck, PinName _cepin, PinName _csnpin):
@@ -523,57 +474,6 @@
 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\t"),TX_ADDR);
-
-  print_byte_register(PSTR("RX_PW_P0-6"),RX_PW_P0,6);
-  print_byte_register(PSTR("EN_AA\t"),EN_AA);
-  print_byte_register(PSTR("EN_RXADDR"),EN_RXADDR);
-  print_byte_register(PSTR("RF_CH\t"),RF_CH);
-  print_byte_register(PSTR("RF_SETUP"),RF_SETUP);
-  print_byte_register(PSTR("CONFIG\t"),NRF_CONFIG);
-  print_byte_register(PSTR("DYNPD/FEATURE"),DYNPD,2);
-
-  printf_P(PSTR("Data Rate\t = " PRIPSTR "\r\n"),pgm_read_word(&rf24_datarate_e_str_P[getDataRate()]));
-  printf_P(PSTR("Model\t\t = " PRIPSTR "\r\n"),pgm_read_word(&rf24_model_e_str_P[isPVariant()]));
-  printf_P(PSTR("CRC Length\t = " PRIPSTR "\r\n"),pgm_read_word(&rf24_crclength_e_str_P[getCRCLength()]));
-  printf_P(PSTR("PA Power\t = " PRIPSTR "\r\n"),  pgm_read_word(&rf24_pa_dbm_e_str_P[getPALevel()]));
-
 }
 
 #endif