WebSVN – DashDisplay – Diff – /trunk/eeprom_lib/eeprom.c

 /* Private variables ---------------------------------------------------------*/
  FlashPage_t __attribute__((section(".EEPROM_Data"))) FlashPage[2];
+ static FLASH_EraseInitTypeDef EraseInitStruct;
+ static uint32_t PAGEError;
 /* Global variable used to store variable value in read sequence */
 uint16_t DataVar = 0;
 /* Virtual address defined by the user: 0xFFFF value is prohibited */
+  {
     case ERASED:
       if (PageStatus1 == VALID_PAGE) /* Page0 erased, Page1 valid */
+      {
         /* Erase Page0 */
-        FLASH_PageErase(PAGE0_BASE_ADDRESS);
+          EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-        /* If erase operation was failed, a Flash error code is returned */
+          EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
-        FlashStatus = HAL_FLASH_GetError();
+          EraseInitStruct.NbPages     = 1;
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-        {
+          {
+                  /* If erase operation was failed, a Flash error code is returned */
+              FlashStatus = HAL_FLASH_GetError();
-          return FlashStatus;
+              return FlashStatus;
-        }
+          }
+      }
       else if (PageStatus1 == RECEIVE_DATA) /* Page0 erased, Page1 receive */
+      {
         /* Erase Page0 */
-        FLASH_PageErase(PAGE0_BASE_ADDRESS);
+          EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-        /* If erase operation was failed, a Flash error code is returned */
+          EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
-        FlashStatus = HAL_FLASH_GetError();
+          EraseInitStruct.NbPages     = 1;
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+          if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-        {
+          {
+                  /* If erase operation was failed, a Flash error code is returned */
+                 FlashStatus = HAL_FLASH_GetError();
-          return FlashStatus;
+                 return FlashStatus;
-        }
+          }
-        /* Mark Page1 as valid */
+          /* Mark Page1 as valid */
-        HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE1_BASE_ADDRESS, VALID_PAGE);
+         HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE1_BASE_ADDRESS, VALID_PAGE);
         /* If program operation was failed, a Flash error code is returned */
-        FlashStatus = HAL_FLASH_GetError();
+         FlashStatus = HAL_FLASH_GetError();
-        if (FlashStatus != HAL_FLASH_ERROR_NONE)
+         if (FlashStatus != HAL_FLASH_ERROR_NONE)
-        {
+         {
           return FlashStatus;
+        }
+      }
       else /* First EEPROM access (Page0&1 are erased) or invalid state -> format EEPROM */
+      {
         /* Erase both Page0 and Page1 and set Page0 as valid page */
         FlashStatus = EE_Format();
         /* If erase/program operation was failed, a Flash error code is returned */
         if (FlashStatus != HAL_FLASH_ERROR_NONE)
+        {
-          return FlashStatus;
+           return FlashStatus;
+        }
+      }
       break;
     case RECEIVE_DATA:
   * @brief  Erases PAGE0 and PAGE1 and writes VALID_PAGE header to PAGE0
   * @param  None
   * @retval Status of the last operation (Flash write or erase) done during
   *         EEPROM formating
   */
 static FLASH_Status EE_Format(void)
+{
   FLASH_Status FlashStatus = HAL_FLASH_ERROR_NONE;
-  /* Erase Page0 */
+  /* Erase Page0 and Page1  */
+  /* Fill EraseInit structure*/
+   EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-  FLASH_PageErase(PAGE0_BASE_ADDRESS);
+   EraseInitStruct.PageAddress = PAGE0_BASE_ADDRESS;
+   EraseInitStruct.NbPages     = 2;
+   if(HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-  /* If erase operation was failed, a Flash error code is returned */
+   /* If erase operation was failed, a Flash error code is returned */
-  FlashStatus = HAL_FLASH_GetError();
-  if (FlashStatus != HAL_FLASH_ERROR_NONE)
+  {
+          FlashStatus = HAL_FLASH_GetError();
-    return FlashStatus;
+             return FlashStatus;
+  }
   /* Set Page0 as valid page: Write VALID_PAGE at Page0 base address */
-  HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE0_BASE_ADDRESS, VALID_PAGE);
+  uint32_t rc = HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,PAGE0_BASE_ADDRESS, VALID_PAGE);
    /* If program operation was failed, a Flash error code is returned */
-  FlashStatus = HAL_FLASH_GetError();
-    if (FlashStatus != HAL_FLASH_ERROR_NONE)
+    if (rc!= HAL_OK)
+   {
+          FlashStatus = HAL_FLASH_GetError();
-     return FlashStatus;
+        return FlashStatus;
+   }
-  /* Erase Page1 */
-  FLASH_PageErase(PAGE1_BASE_ADDRESS);
-  FlashStatus = HAL_FLASH_GetError();
   /* Return Page1 erase operation status */
   return FlashStatus;
+}
 /**
         if (FlashStatus != HAL_FLASH_ERROR_NONE)
+       {
          return FlashStatus;
+       }
      /* Set variable virtual address */
+      HAL_FLASH_Unlock();
       HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address + 2 ,VirtAddress);
        /* If program operation was failed, a Flash error code is returned */
       FlashStatus = HAL_FLASH_GetError();
       /* Return program operation status */
       return FlashStatus;

Subversion Repositories DashDisplay

(root)/trunk/eeprom_lib/eeprom.c – Rev 16 → 18