Revision 25:856779ac8921, committed 2016-02-25

Comitter:

tmulrooney

Date:

Thu Feb 25 21:28:39 2016 +0000

Parent:

24:54935d8f4b9e

Commit message:

first successful join

Changed in this revision

diff -r 54935d8f4b9e -r 856779ac8921 sx1272/sx1272.cpp
--- a/sx1272/sx1272.cpp	Thu Feb 25 15:39:46 2016 +0000
+++ b/sx1272/sx1272.cpp	Thu Feb 25 21:28:39 2016 +0000
@@ -41,7 +41,6 @@
     { 300000, 0x00 }, // Invalid Badwidth
 };
 
-
 SX1272::SX1272( RadioEvents_t *events,
                 PinName mosi, PinName miso, PinName sclk, PinName nss, PinName reset,
                 PinName dio0, PinName dio1, PinName dio2, PinName dio3, PinName dio4, PinName dio5 )
@@ -51,7 +50,7 @@
                 spi( PTD6, PTD7, PTD5 ),
                 nss( PTD4 ),
                 reset( reset ),
-                dio0( PTC2 ), dio1( PTC4 ), dio2( PTC3 ), dio3( PTC1 ), dio4( PTC1 ), dio5( PTC1 ),
+                dio0( PTC2 ), dio1( PTB1 ), dio2( PTC3 ), dio3( PTB0 ), dio4( PTC4 ), dio5( PTC1 ),
                 isRadioActive( false )
 {
     debug("SX1272 constructor\r\n");
@@ -95,7 +94,7 @@
 
 void SX1272::SetChannel( uint32_t freq )
 {
-       debug_val("SetChannel enter ",freq);
+//       debug_val("SetChannel enter ",freq);
    this->settings.Channel = freq;
     freq = ( uint32_t )( ( double )freq / ( double )FREQ_STEP );
     Write( REG_FRFMSB, ( uint8_t )( ( freq >> 16 ) & 0xFF ) );
@@ -1172,7 +1171,7 @@
 
 void SX1272::OnDio0Irq( void )
 {
-       debug("OnDio0Irq enter\r\n");
+//       debug_str("OnDio0Irq\r\n");
    volatile uint8_t irqFlags = 0;
 
     switch( this->settings.State )
@@ -1377,7 +1376,7 @@
 
 void SX1272::OnDio1Irq( void )
 {
-       debug("OnDio1Irq\r\n");
+//       debug_str("OnDio1Irq\r\n");
     switch( this->settings.State )
     {                
         case RF_RX_RUNNING:
@@ -1452,7 +1451,7 @@
 
 void SX1272::OnDio2Irq( void )
 {
-        debug("OnDio2Irq\r\n");
+        debug_str("OnDio2Irq\r\n");
    switch( this->settings.State )
     {                
         case RF_RX_RUNNING:
@@ -1517,7 +1516,7 @@
 
 void SX1272::OnDio3Irq( void )
 {
-        debug("OnDio3Irq\r\n");
+//        debug_str("OnDio3Irq\r\n");
    switch( this->settings.Modem )
     {
     case MODEM_FSK:
@@ -1549,7 +1548,7 @@
 
 void SX1272::OnDio4Irq( void )
 {
-        debug("OnDio4Irq\r\n");
+//        debug_str("OnDio4Irq\r\n");
    switch( this->settings.Modem )
     {
     case MODEM_FSK:
@@ -1569,7 +1568,7 @@
 
 void SX1272::OnDio5Irq( void )
 {
-        debug("OnDio5Irq\r\n");
+ //       debug_str("OnDio5Irq\r\n");
    switch( this->settings.Modem )
     {
     case MODEM_FSK: