Subversion Repositories DashDisplay

Rev

Rev 50 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 50 Rev 61
Line 648... Line 648...
648 
      __HAL_FLASH_GET_FLAG(FLASH_FLAG_RDERR) ||
 648 
      __HAL_FLASH_GET_FLAG(FLASH_FLAG_RDERR) ||
649 
#endif /* FLASH_SR_RDERR */
 649 
#endif /* FLASH_SR_RDERR */
650 
#if defined(FLASH_SR_OPTVERRUSR)
 650 
#if defined(FLASH_SR_OPTVERRUSR)
651 
      __HAL_FLASH_GET_FLAG(FLASH_FLAG_OPTVERRUSR) ||
 651 
      __HAL_FLASH_GET_FLAG(FLASH_FLAG_OPTVERRUSR) ||
652 
#endif /* FLASH_SR_OPTVERRUSR */
 652 
#endif /* FLASH_SR_OPTVERRUSR */
- 
 
 653 
     __HAL_FLASH_GET_FLAG(FLASH_FLAG_SIZERR) ||
653 
     __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGAERR))
 654 
     __HAL_FLASH_GET_FLAG(FLASH_FLAG_PGAERR))
654 
  {
 655 
  {
655 
    /*Save the error code*/
 656 
    /*Save the error code*/
656 
    FLASH_SetErrorCode();
 657 
    FLASH_SetErrorCode();
657 
    return HAL_ERROR;
 658 
    return HAL_ERROR;
Line 698... Line 699...
698 
  {
 699 
  {
699 
    pFlash.ErrorCode |= HAL_FLASH_ERROR_OPTVUSR;
 700 
    pFlash.ErrorCode |= HAL_FLASH_ERROR_OPTVUSR;
700 
    flags |= FLASH_FLAG_OPTVERRUSR;
 701 
    flags |= FLASH_FLAG_OPTVERRUSR;
701 
  }
 702 
  }
702 
#endif /* FLASH_SR_OPTVERRUSR */
 703 
#endif /* FLASH_SR_OPTVERRUSR */
- 
 
 704 
  if(__HAL_FLASH_GET_FLAG(FLASH_FLAG_SIZERR))
- 
 
 705 
  {
- 
 
 706 
    pFlash.ErrorCode |= HAL_FLASH_ERROR_SIZE;
- 
 
 707 
    flags |= FLASH_FLAG_SIZERR;
703 
 
 708 
  }
704 
  /* Clear FLASH error pending bits */
 709 
  /* Clear FLASH error pending bits */
705 
  __HAL_FLASH_CLEAR_FLAG(flags);
 710 
  __HAL_FLASH_CLEAR_FLAG(flags);
706 
}  
 711 
}
707 
/**
 712 
/**
708 
  * @}
 713 
  * @}
709 
  */
 714 
  */
710 
 
 715 
 
711 
/**
 716 
/**