Diff: Flash/flash_programming.cpp

Revision:

43:dcde0e66874a

Parent:

38:64e3e9acb49c

Child:

50:5a19fc4b41d9

--- a/Flash/flash_programming.cpp	Sun Mar 04 07:58:23 2018 +0000
+++ b/Flash/flash_programming.cpp	Thu Mar 08 13:13:53 2018 +0000
@@ -128,7 +128,7 @@
     return PASSED;
 }
 
-int FP_WriteConfigValues(uint8_t Mode, uint8_t MinOxi, uint8_t MaxOxi, uint32_t UploadPeriod) {
+int FP_WriteConfigValues(uint8_t Mode ,uint8_t OxyThres, uint8_t TempThres, uint32_t UploadPeriod) {
     uint8_t  CurrentPage    = FP_GetPage(CONF_BASE_ADDRESS);    
     uint32_t CurrentAddress = MODE_ADDRESS;
     EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
@@ -142,8 +142,8 @@
     HAL_FLASH_Unlock();  
     
     if ((FP_ReadValue(MODE_ADDRESS) == Mode) &&
-        (FP_ReadValue(MIN_OXI_ADDRESS) == MinOxi) &&
-        (FP_ReadValue(MAX_OXI_ADDRESS) == MaxOxi) &&
+        (FP_ReadValue(OXY_THRES_ADDRESS) == OxyThres) &&
+        (FP_ReadValue(TEMP_THRES_ADDRESS) == TempThres) &&
         (FP_ReadValue(UPLOAD_PERIOD_ADDRESS) == UploadPeriod)) {
         printf("Configuration values don't change, no need to write\r\n");
         HAL_FLASH_Lock();
@@ -161,18 +161,18 @@
                                     printf("Write Mode failed, error num %d\r\n", HAL_FLASH_GetError());
                                 }
             break;
-            case (MIN_OXI_ADDRESS): if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, CurrentAddress, MinOxi) == HAL_OK) {
-                                        printf("Write MinOxi OK\r\n");
+            case (OXY_THRES_ADDRESS): if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, CurrentAddress, OxyThres) == HAL_OK) {
+                                        printf("Write OxyThres OK\r\n");
                                     }
                                     else {
-                                        printf("Write MinOxi failed, error num %d\r\n", HAL_FLASH_GetError());
+                                        printf("Write OxyThres failed, error num %d\r\n", HAL_FLASH_GetError());
                                     }
             break;
-            case (MAX_OXI_ADDRESS): if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, CurrentAddress, MaxOxi) == HAL_OK) {
-                                        printf("Write MaxOxi OK\r\n");
+            case (TEMP_THRES_ADDRESS): if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, CurrentAddress, TempThres) == HAL_OK) {
+                                        printf("Write TempThres OK\r\n");
                                     }
                                     else {
-                                        printf("Write MaxOxi failed, error num %d\r\n", HAL_FLASH_GetError());
+                                        printf("Write TempThres failed, error num %d\r\n", HAL_FLASH_GetError());
                                     }
             break;
             case (UPLOAD_PERIOD_ADDRESS): if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, CurrentAddress, UploadPeriod) == HAL_OK) {
@@ -199,20 +199,20 @@
                                     return FAILED;
                                  }
             break;
-            case (MIN_OXI_ADDRESS): if (FP_ReadValue(CurrentAddress) == MinOxi) {
-                                        printf("Read back MinOxi: %d\r\n", FP_ReadValue(CurrentAddress));  
+            case (OXY_THRES_ADDRESS): if (FP_ReadValue(CurrentAddress) == OxyThres) {
+                                        printf("Read back OxyThres: %d\r\n", FP_ReadValue(CurrentAddress));  
                                     }
                                     else {
-                                        printf("Write MinOxi failed, wrong read back value\r\n");
+                                        printf("Write OxyThres failed, wrong read back value\r\n");
                                         HAL_FLASH_Lock();
                                         return FAILED;
                                     }
             break;
-            case (MAX_OXI_ADDRESS): if (FP_ReadValue(CurrentAddress) == MaxOxi) {
-                                        printf("Read back MaxOxi: %d\r\n", FP_ReadValue(CurrentAddress));  
+            case (TEMP_THRES_ADDRESS): if (FP_ReadValue(CurrentAddress) == TempThres) {
+                                        printf("Read back TempThres: %d\r\n", FP_ReadValue(CurrentAddress));  
                                     }
                                     else {
-                                        printf("Write MaxOxi failed, wrong read back value\r\n");
+                                        printf("Write TempThres failed, wrong read back value\r\n");
                                         HAL_FLASH_Lock();
                                         return FAILED;
                                     }