Diff: src/wbit_util.cpp

Revision:

8:a5316708e51d

Parent:

7:fba1e8fc7693

Child:

9:cc23b2049639

--- a/src/wbit_util.cpp	Fri Aug 10 19:17:43 2018 +0000
+++ b/src/wbit_util.cpp	Sat Aug 11 17:34:42 2018 +0000
@@ -83,10 +83,26 @@
 bool nvmWrite(nvm *pNvm){   
    pNvm->chksum = getNvmChkSum(pNvm);
    printNmvData(pNvm);
-   return dot->nvmWrite(0,pNvm,sizeof(nvm));      
-   
+   return dot->nvmWrite(0,pNvm,sizeof(nvm));     
 }
 //==============================================================================
+//nvmRestorekeys
+//restore hard coded keys
+//==============================================================================
+bool nvmRestoreKeys(nvm *pNvm){
+    uint8_t i;
+    for (i = 0; i < sizeof(network_id);i++){
+        pNvm->network_id[i] = network_id[i];   
+    }    
+    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);
+    printNmvData(pNvm);
+    return dot->nvmWrite(0,pNvm,sizeof(nvm));    
+}       
+//==============================================================================
 //nvmRead
 //- read nvmData struc from nvm memory
 //- if bad chksum then default to hard code network keys 
@@ -100,18 +116,10 @@
        logInfo("nvmRead: chksum ok");           
        return true;
    }    
-
 //bad chksum, resort to old hard coded keys  
-   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];   
-    }    
-    for (i = 0; i < sizeof(network_key);i++){
-        pNvm->network_key[i] = network_key[i];   
-    }
-    pNvm->bLogOutputOn = 0;  //disable log output
-  //  printNmvData(pNvm);
-    return false;
+   if(verbose)pc.printf("nvmRead: bad chksum, using default values");  
+   nvmRestoreKeys(pNvm);
+   return false;
 }
 //============================================================================