Merge remote-tracking branch 'origin/master' into develop

4 years ago · 83bd56e68c
parent ee3c138385 720c676403
commit 83bd56e68c
1 changed files with 5 additions and 3 deletions
--- a/tmk_core/common/chibios/flash_stm32.c
+++ b/tmk_core/common/chibios/flash_stm32.c
@ -161,10 +161,12 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) {
 * @retval None
 */
 void FLASH_Unlock(void) {
+    if (FLASH->CR & FLASH_CR_LOCK) {
        /* Authorize the FPEC Access */
        FLASH->KEYR = FLASH_KEY1;
        FLASH->KEYR = FLASH_KEY2;
    }
+}

 /**
 * @brief  Locks the FLASH Program Erase Controller.