Diff: mac/LoRaMac.cpp

Revision:

1:0a272b37c6cd

Parent:

0:9be122c18509

Child:

2:737ad7fbc97e

diff -r 9be122c18509 -r 0a272b37c6cd mac/LoRaMac.cpp
--- a/mac/LoRaMac.cpp	Wed Aug 12 14:08:29 2015 +0000
+++ b/mac/LoRaMac.cpp	Thu Aug 20 07:45:28 2015 +0000
@@ -1342,8 +1342,6 @@
 {
     uint64_t curTime = TimerGetCurrentTime( );
     
-      debug( "OnRadioTxDone\n\n\r" );
-    
     if( LoRaMacDeviceClass != CLASS_C )
     {
         Radio.Sleep( );
@@ -1413,7 +1411,6 @@
     
     bool isMicOk = false;
 
-    debug( "OnRadioRxDone\n\n\r" );
     if( LoRaMacDeviceClass != CLASS_C )
     {
         Radio.Sleep( );
@@ -1704,9 +1701,7 @@
  * Function executed on Radio Tx Timeout event
  */
 static void OnRadioTxTimeout( void )
-{
-    debug( "OnRadioTxTimeout\n\n\r" );
-    
+{    
     if( LoRaMacDeviceClass != CLASS_C )
     {
         Radio.Sleep( );
@@ -1724,9 +1719,7 @@
  * Function executed on Radio Rx Timeout event
  */
 static void OnRadioRxTimeout( void )
-{
-    debug( "OnRadioRxTimeout\n\n\r" );
-    
+{    
     if( LoRaMacDeviceClass != CLASS_C )
     {
         Radio.Sleep( );
@@ -1742,9 +1735,7 @@
  * Function executed on Radio Rx Error event
  */
 static void OnRadioRxError( void )
-{
-    debug( "OnRadioRxError\n\n\r" );
-    
+{    
     if( LoRaMacDeviceClass != CLASS_C )
     {
         Radio.Sleep( );
@@ -1797,9 +1788,8 @@
     int8_t datarate = 0;
     uint32_t bandwidth = 0; // LoRa 125 kHz
 
-        RxWindowTimer1.detach( );
+    RxWindowTimer1.detach( );
     
-    debug( "OnRxWindow1TimerEvent\n\n\r" );
     datarate = ChannelsDatarate - Rx1DrOffset;
     if( datarate < 0 )
     {
@@ -1824,9 +1814,7 @@
  */
 static void OnRxWindow2TimerEvent( void )
 {
-        RxWindowTimer2.detach( );
-    
-    debug( "OnRxWindow2TimerEvent\n\n\r" );
+    RxWindowTimer2.detach( );
 
     if( NodeAckRequested == true )
     {
@@ -1862,9 +1850,7 @@
  */
 static void OnMacStateCheckTimerEvent( void )
 {
-        MacStateCheckTimer.detach( );
-    
-    debug( "OnMacStateCheckTimerEvent\n\n\r" );
+    MacStateCheckTimer.detach( );
 
     if( LoRaMacEventFlags.Bits.Tx == 1 )
     {
@@ -1969,9 +1955,8 @@
 
 static void OnAckTimeoutTimerEvent( void )
 {
-        AckTimeoutTimer.detach( );
+    AckTimeoutTimer.detach( );
     
-    debug( "OnAckTimeoutTimerEvent\n\n\r" );
     AckTimeoutRetry = true;
     LoRaMacState &= ~MAC_ACK_REQ;
 }