Bladeren bron

Merge pull request #3297 from nsearchf/master

修复不能发现禁止写spi flash失败的情形
Bernard Xiong 5 jaren geleden
bovenliggende
commit
93b50db41d
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      components/drivers/spi/sfud/src/sfud.c
  2. 1 1
      src/thread.c

+ 1 - 1
components/drivers/spi/sfud/src/sfud.c

@@ -897,7 +897,7 @@ static sfud_err set_write_enabled(const sfud_flash *flash, bool enabled) {
         if (enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 0) {
             SFUD_INFO("Error: Can't enable write status.");
             return SFUD_ERR_WRITE;
-        } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) == 1) {
+        } else if (!enabled && (register_status & SFUD_STATUS_REGISTER_WEL) != 0) {
             SFUD_INFO("Error: Can't disable write status.");
             return SFUD_ERR_WRITE;
         }

+ 1 - 1
src/thread.c

@@ -585,7 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick)
 
     return RT_EOK;
 }
-RTM_EXPORT(rt_thread_delay_util);
+RTM_EXPORT(rt_thread_delay_until);
 
 /**
  * This function will let current thread delay for some milliseconds.