asad patel / stm-spirit1-rf-driver

Prototype RF driver for STM Sub-1 GHz RF expansion board based on the SPSGRF-868 module for STM32 Nucleo.

Dependents:   DISCO_IOT-wifi_client

Fork of stm-spirit1-rf-driver by ST

Files at this revision

API Documentation at this revision

Revision 21:d5c10e5742f6, committed 2016-11-08

Comitter:
Wolfgang Betz
Date:
Tue Nov 08 11:04:30 2016 +0100
Parent:
20:0b738b9ca855
Child:
22:9165bd73c61e
Commit message:
First version running 'mbed-os-example-client' & 'k64f-border-router with Spirit1'

Changed in this revision

SimpleSpirit1.cpp Show annotated file Show diff for this revision Revisions of this file
mbed_driver_api.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/SimpleSpirit1.cpp	Mon Nov 07 11:28:22 2016 +0100
+++ b/SimpleSpirit1.cpp	Tue Nov 08 11:04:30 2016 +0100
@@ -466,8 +466,6 @@
 
 	/* Transmission error */
 	if(x_irq_status.IRQ_TX_FIFO_ERROR) {
-		error("IRQ_TX_FIFO_ERROR should never happen!\n");
-
 		cmd_strobe(SPIRIT1_STROBE_FTX);
 		if(_spirit_tx_started) {
 			_spirit_tx_started = false;

--- a/mbed_driver_api.cpp	Mon Nov 07 11:28:22 2016 +0100
+++ b/mbed_driver_api.cpp	Tue Nov 08 11:04:30 2016 +0100
@@ -205,7 +205,7 @@
 
         /*Return frame pending status*/
         case PHY_EXTENSION_READ_LAST_ACK_PENDING_STATUS:
-        	// tr_debug("%s (%d), need_ack=%x", __func__, __LINE__, (unsigned int)need_ack);
+        	tr_debug("%s (%d), need_ack=%x", __func__, __LINE__, (unsigned int)need_ack);
             *data_ptr = need_ack;
             break;
 
@@ -331,7 +331,7 @@
 	uint8_t src_addr_mode = 0x0; /*0x00 = no address 0x01 = reserved 0x02 = 16-bit short address 0x03 = 64-bit extended address */
 	uint8_t min_size = 3; // FCF & SeqNr
 	bool ret = false;
-#ifndef SHORT_ACK_FRAMES
+#if !defined(SHORT_ACK_FRAMES) || defined(HEAVY_TRACING)
 	bool panid_compr = false;
 #endif
 
@@ -345,7 +345,7 @@
 	(*ack_requested) = ((fcf & MAC_FCF_ACK_REQ_BIT_MASK) >> MAC_FCF_ACK_REQ_BIT_SHIFT);
 	dst_addr_mode = ((fcf & MAC_FCF_DST_ADDR_MASK) >> MAC_FCF_DST_ADDR_SHIFT);
 	src_addr_mode = ((fcf & MAC_FCF_SRC_ADDR_MASK) >> MAC_FCF_SRC_ADDR_SHIFT);
-#ifndef SHORT_ACK_FRAMES
+#if !defined(SHORT_ACK_FRAMES) || defined(HEAVY_TRACING)
 	panid_compr = ((fcf & MAC_FCF_INTRA_PANID_MASK) >> MAC_FCF_INTRA_PANID_SHIFT);
 #endif
 
@@ -375,7 +375,7 @@
 		} else if(dst_addr_mode == 0x2) {
 	    	dst_short_adr = rf_read_16_bit(&rf_rx_buf[5]);
 			if(dst_short_adr == stored_short_adr) {
-		    	// tr_debug("%s (%d)", __func__, __LINE__);
+		    	tr_debug("%s (%d)", __func__, __LINE__);
 				ret = true;
 			} else {
 #ifdef HEAVY_TRACING
@@ -537,8 +537,7 @@
 #endif // !SHORT_ACK_FRAMES
 	}
 
-#ifdef HEAVY_TRACING
-	tr_debug("%s (%d), ret=%d, ack=%d", __func__, __LINE__, ret, (*ack_requested));
+#ifdef HEAVY_tr_debug tr_debug("%s (%d), ret=%d, ack=%d", __func__, __LINE__, ret, (*ack_requested));
 #endif
 	return ret;
 }
@@ -688,7 +687,7 @@
 		}
 
 #ifdef HEAVY_TRACING
-    	tr_debug("%s (%d), hdr=%x", __func__, __LINE__, buffer[0], ptr[0];
+    	tr_debug("%s (%d), hdr=%x, nr=%x", __func__, __LINE__, buffer[0], ptr[0]);
 #endif
 
     	/* Set information that we have sent an ACK */