SX1276Lib

Fork of SX1276Lib by Semtech

Files at this revision

API Documentation at this revision

Comitter:
GregCr
Date:
Tue Sep 23 14:11:27 2014 +0000
Parent:
7:2b555111463f
Child:
9:b420e9c3d6fe
Commit message:
Clean up; FHSS Tx bug correction

Changed in this revision

registers/sx1276Regs-Fsk.h Show annotated file Show diff for this revision Revisions of this file
registers/sx1276Regs-LoRa.h Show annotated file Show diff for this revision Revisions of this file
sx1276/sx1276-hal.cpp Show annotated file Show diff for this revision Revisions of this file
sx1276/sx1276-hal.h Show annotated file Show diff for this revision Revisions of this file
sx1276/sx1276.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/registers/sx1276Regs-Fsk.h	Fri Sep 19 14:16:35 2014 +0000
+++ b/registers/sx1276Regs-Fsk.h	Tue Sep 23 14:11:27 2014 +0000
@@ -4,7 +4,7 @@
  \____ \| ___ |    (_   _) ___ |/ ___)  _ \
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
-    �2013 Semtech
+    ( C )2014 Semtech
 
 Description: SX1276 FSK modem registers and bits definitions
 
--- a/registers/sx1276Regs-LoRa.h	Fri Sep 19 14:16:35 2014 +0000
+++ b/registers/sx1276Regs-LoRa.h	Tue Sep 23 14:11:27 2014 +0000
@@ -4,7 +4,7 @@
  \____ \| ___ |    (_   _) ___ |/ ___)  _ \
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
-    ©2013 Semtech
+    ( C )2014 Semtech
 
 Description: SX1276 LoRa modem registers and bits definitions
 
--- a/sx1276/sx1276-hal.cpp	Fri Sep 19 14:16:35 2014 +0000
+++ b/sx1276/sx1276-hal.cpp	Tue Sep 23 14:11:27 2014 +0000
@@ -4,7 +4,7 @@
  \____ \| ___ |    (_   _) ___ |/ ___)  _ \
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
-( C )2014 Semtech
+    ( C )2014 Semtech
 
 Description: -
 
--- a/sx1276/sx1276-hal.h	Fri Sep 19 14:16:35 2014 +0000
+++ b/sx1276/sx1276-hal.h	Tue Sep 23 14:11:27 2014 +0000
@@ -4,7 +4,7 @@
  \____ \| ___ |    (_   _) ___ |/ ___)  _ \
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
-( C )2014 Semtech
+    ( C )2014 Semtech
 
 Description: -
 
--- a/sx1276/sx1276.cpp	Fri Sep 19 14:16:35 2014 +0000
+++ b/sx1276/sx1276.cpp	Tue Sep 23 14:11:27 2014 +0000
@@ -4,7 +4,7 @@
  \____ \| ___ |    (_   _) ___ |/ ___)  _ \
  _____) ) ____| | | || |_| ____( (___| | | |
 (______/|_____)_|_|_| \__)_____)\____)_| |_|
-( C )2014 Semtech
+    ( C )2014 Semtech
 
 Description: Actual implementation of a SX1276 radio, inherits Radio
 
@@ -762,7 +762,7 @@
                                               RFLR_IRQFLAGS_VALIDHEADER |
                                               RFLR_IRQFLAGS_TXDONE |
                                               RFLR_IRQFLAGS_CADDONE |
-                                              //RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL |
+                                              RFLR_IRQFLAGS_FHSSCHANGEDCHANNEL |
                                               RFLR_IRQFLAGS_CADDETECTED );
                                               
                 // DIO0=RxDone
@@ -844,7 +844,7 @@
                                               RFLR_IRQFLAGS_CADDETECTED );
                                               
                 // DIO0=TxDone
-                Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK ) | RFLR_DIOMAPPING1_DIO0_00 );
+                Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO0_MASK ) | RFLR_DIOMAPPING1_DIO0_01 );
                 // DIO2=FhssChangeChannel
                 Write( REG_DIOMAPPING1, ( Read( REG_DIOMAPPING1 ) & RFLR_DIOMAPPING1_DIO2_MASK ) | RFLR_DIOMAPPING1_DIO2_00 );  
             }
@@ -1372,6 +1372,8 @@
     case MODEM_FSK:
         break;
     case MODEM_LORA:
+        // Clear Irq
+        Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_CADDONE );
         if( ( cadDone != NULL ) )
         {
             cadDone( );