Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 22 insertions, 12 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 807e9f8e9..137b5a19f 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -124,9 +124,11 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
         {
             Bytes = sizeof(ProcessParameters);
             FileWrite(ProcessParams,Bytes,ProcessParamsConfigPath,BIOS_WAIT_FOREVER);
-            EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH);
+            MCU_E2PromProgramChunk(PROCESS_PARAMATERS_IN_EEPROM,4,&Bytes);
+            MCU_E2PromProgramChunk(PROCESS_PARAMATERS_IN_EEPROM+4, Bytes, ProcessParams);
+            /*EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH);
             ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH, 4,&Bytes);
-            ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);
+            ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);*/
             REPORT_MSG(Bytes,"Bytes write to flash");
         }
         else
@@ -386,9 +388,11 @@ uint32_t LoadProcessParamsFromFile(void)
             if ((ProcessParams->dryerzone1temp > 0.1)||(ProcessParams->headzone2temp > 0.1)||(ProcessParams->headzone3temp > 0.1)||(ProcessParams->headzone4temp > 0.1))//NOT turning off heaters
             {
                 Bytes = sizeof(ProcessParameters);
-                EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH);
+                MCU_E2PromProgramChunk(PROCESS_PARAMATERS_IN_EEPROM,4,&Bytes);
+                MCU_E2PromProgramChunk(PROCESS_PARAMATERS_IN_EEPROM+4, Bytes, ProcessParams);
+                /*EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH);
                 ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH, 4,&Bytes);
-                ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);
+                ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);*/
                 REPORT_MSG(Bytes,"ProcessParameters Bytes write to flash");
                 free (buffer);
             }
@@ -406,26 +410,32 @@ uint32_t ProcessParamsInit(void)
 {
     FRESULT Fresult = FR_NOT_READY;
     uint32_t Bytes;
+    ProcessParameters  ProcessParams;
 
-    memcpy(&Bytes,(void *)PROCESS_PARAMETERS_MAP_IN_FLASH,sizeof(Bytes));
-    REPORT_MSG(Bytes,"Bytes read from flash");
+    //memcpy(&Bytes,(void *)PROCESS_PARAMETERS_MAP_IN_FLASH,sizeof(Bytes));
+    MCU_E2PromReadChunk(PROCESS_PARAMATERS_IN_EEPROM,4,&Bytes);
+
+    REPORT_MSG(Bytes,"Bytes read from EEPROM");
 
     if ((Bytes)&&(Bytes < 1000))
     {
-        ProcessParameters*  ProcessParams = (ProcessParameters *)(PROCESS_PARAMETERS_MAP_IN_FLASH+4);
-        Fresult = HandleProcessParameters(ProcessParams,false);
+        //ProcessParameters*  ProcessParams = (ProcessParameters *)(PROCESS_PARAMETERS_MAP_IN_FLASH+4);
+        MCU_E2PromReadChunk(PROCESS_PARAMATERS_IN_EEPROM+4,Bytes,&ProcessParams);
+        Fresult = HandleProcessParameters(&ProcessParams,false);
     }
     else
     {
         if (LoadProcessParamsFromFile()==OK)
         {
-            memcpy(&Bytes,(void *)PROCESS_PARAMETERS_MAP_IN_FLASH,sizeof(Bytes));
-            REPORT_MSG(Bytes,"ProcessParams Bytes read from flash");
+            MCU_E2PromReadChunk(PROCESS_PARAMATERS_IN_EEPROM,4,&Bytes);
+            //memcpy(&Bytes,(void *)PROCESS_PARAMETERS_MAP_IN_FLASH,sizeof(Bytes));
+            REPORT_MSG(Bytes,"ProcessParams Bytes read from EEPROM");
 
             if ((Bytes)&&(Bytes < 1000))
             {
-                ProcessParameters*  ProcessParams = (ProcessParameters *)(PROCESS_PARAMETERS_MAP_IN_FLASH+4);
-                Fresult = HandleProcessParameters(ProcessParams,false);
+                MCU_E2PromReadChunk(PROCESS_PARAMATERS_IN_EEPROM+4,Bytes,&ProcessParams);
+                //ProcessParameters*  ProcessParams = (ProcessParameters *)(PROCESS_PARAMETERS_MAP_IN_FLASH+4);
+                Fresult = HandleProcessParameters(&ProcessParams,false);
             }
         }
     }