Diff: src/wbit_util.cpp

Revision:

9:cc23b2049639

Parent:

8:a5316708e51d

Child:

12:7944e4dbe853

--- a/src/wbit_util.cpp	Sat Aug 11 17:34:42 2018 +0000
+++ b/src/wbit_util.cpp	Mon Aug 13 15:58:00 2018 +0000
@@ -87,9 +87,9 @@
 }
 //==============================================================================
 //nvmRestorekeys
-//restore hard coded keys
+//restore hard coded keys to nvm and also logdisplay enable/disable
 //==============================================================================
-bool nvmRestoreKeys(nvm *pNvm){
+bool nvmRestore(nvm *pNvm){
     uint8_t i;
     for (i = 0; i < sizeof(network_id);i++){
         pNvm->network_id[i] = network_id[i];   
@@ -97,8 +97,8 @@
     for (i = 0; i < sizeof(network_key);i++){
         pNvm->network_key[i] = network_key[i];   
     }
-    pNvm->bLogOutputOn = 0;  //disable log output  
     pNvm->chksum = getNvmChkSum(pNvm);
+    if(verbose)pc.printf("\r\n restoring backup keys:"); 
     printNmvData(pNvm);
     return dot->nvmWrite(0,pNvm,sizeof(nvm));    
 }       
@@ -116,9 +116,6 @@
        logInfo("nvmRead: chksum ok");           
        return true;
    }    
-//bad chksum, resort to old hard coded keys  
-   if(verbose)pc.printf("nvmRead: bad chksum, using default values");  
-   nvmRestoreKeys(pNvm);
    return false;
 }
 //============================================================================