Diff: src/wbit_util.cpp

Revision:

5:abfe25f0de33

Parent:

4:d87f8dcf40ef

Child:

7:fba1e8fc7693

--- a/src/wbit_util.cpp	Sat Aug 04 20:26:39 2018 +0000
+++ b/src/wbit_util.cpp	Mon Aug 06 19:11:02 2018 +0000
@@ -5,6 +5,7 @@
 #include "mbed.h"
 #include "mDot.h"
 extern Serial pc;
+extern bool verbose;
 uint8_t j_attempts = 0; //return number of attempts it took to join the network
 
 
@@ -12,23 +13,46 @@
 //these are used as backup keys in case nvm memory is corrupted and we can't read the keys correctly
 uint8_t network_id[] = { 0x90, 0xF1, 0x47, 0x90, 0x6C, 0x48, 0x1D, 0x29 };   //static id not used anymore but don't comment out                                
 uint8_t network_key[] = { 0x0F, 0xF9, 0xA2, 0x90, 0x2E, 0xAA, 0x6B, 0x8C, 0x6A, 0x4E, 0xFD, 0x67, 0xF9, 0xA6, 0xF3, 0xD3 };   //OTAA appkey    
+
+//============================================================================
+// printRadioCfg
+
+//============================================================================
+void printRadioCfg(){
+      if(verbose){       
+        pc.printf("\r\n************************************************************"); 
+        pc.printf("\r\n saved radio configuration: ");                
+        pc.printf("\r\n public network: %d ",dot->getPublicNetwork()); 
+        pc.printf("\r\n subband: %d ",dot->getFrequencySubBand()); 
+        pc.printf("\n\r join delay %d ",dot->getJoinDelay());                                   
+        pc.printf("\r\n ADR: %d ",dot->getAdr());                 
+        pc.printf("\r\n antenna gain: %d ",dot->getAntennaGain());                 
+        pc.printf("\r\n transmit max pwr: %d ",dot->getMaxTxPower()); //not saved in cfg                                                        
+        pc.printf("\r\n transmit min pwr: %d ",dot->getMinTxPower()); //not saved in cfg                                                        
+        pc.printf("\r\n transmit pwr: %d ",dot->getTxPower());                                 
+        pc.printf("\n\r tx inverted %d ",dot->getTxInverted());                                   
+        pc.printf("\n\r rx inverted %d ",dot->getRxInverted());                                   
+        pc.printf("\n\r rx delay  %d ",dot->getRxDelay());          
+        pc.printf("\r\n TxDataRate: %d ",dot->getTxDataRate());                        
+        pc.printf("\r\n maxPktLen: %d ",dot->getMaxPacketLength());  //not saved in cfg                                
+        pc.printf("\r\n************************************************************\r\n");         
+    }
+}
 //==============================================================================
 //printNmvData
 //==============================================================================
 void printNmvData(nvm *pNvm){
-
      uint8_t i;    
-     pc.printf("\r\nnon-volatile memory (nvm):"); 
-     pc.printf("\r\nnetwork_id:"); 
+     if(verbose)pc.printf("\r\n************************************************************"); 
+     if(verbose)pc.printf("\r\nnon-volatile memory (nvm):"); 
+     if(verbose)pc.printf("\r\nnetwork_id:"); 
      
      for (i = 0; i < 8;i++) 
-      pc.printf(" %x",pNvm->network_id[i]);
-         
-     //for (i = 0 ; i < sizeof(NvmData.network_id);i++)  pc.printf(" ,%x",NvmData.network_id[i]);
-     pc.printf("\r\nnetwork_key:"); 
-     for (i = 0 ; i < 16;i++)  pc.printf(" %x",pNvm->network_key[i]);
-     pc.printf("\r\nbLogOutputOn: %d\r\n",pNvm->bLogOutputOn); 
-    
+       if(verbose)pc.printf(" %x",pNvm->network_id[i]);
+     if(verbose)pc.printf("\r\nnetwork_key:"); 
+      for (i = 0 ; i < 16;i++)  if(verbose)pc.printf(" %x",pNvm->network_key[i]);         
+     if(verbose)pc.printf("\r\nbLogOutputOn: %d ",pNvm->bLogOutputOn); 
+     if(verbose)pc.printf("\r\n************************************************************\r\n"); 
 }                              
 //==============================================================================
 //getNvmChkSum
@@ -61,13 +85,15 @@
    uint8_t i;  
    dot->nvmRead(0,pNvm,sizeof(nvm));  
    uint8_t chksum = getNvmChkSum(pNvm);
+/*   
    if (chksum == pNvm->chksum){
        logInfo("nvmRead: chksum ok");    
-       printNmvData(pNvm);
+       //printNmvData(pNvm);
        return true;
    }    
+*/
 //bad chksum, resort to old hard coded keys  
-   pc.printf("nvmRead: bad chksum, using default values");      
+   if(verbose)pc.printf("nvmRead: bad chksum, using default values");      
    for (i = 0; i < sizeof(network_id);i++){
         pNvm->network_id[i] = network_id[i];   
     }    
@@ -75,7 +101,7 @@
         pNvm->network_key[i] = network_key[i];   
     }
     pNvm->bLogOutputOn = 1;  //disable log output
-    printNmvData(pNvm);
+  //  printNmvData(pNvm);
     return false;
 }
 //============================================================================