Merge pull request #31 from libdriver/dev

libdriver · web-flow · commit cea01c5434be · 2025-03-31T20:21:27.000+08:00
fix: fix erase timeout bugs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.0.7 (2025-03-31)
+
+## Bug Fixes
+
+- fix erase timeout bugs
+
 ## 1.0.6 (2025-03-10)
 
 ## Bug Fixes
diff --git a/doc/html/driver__w25qxx_8c_source.html b/doc/html/driver__w25qxx_8c_source.html
@@ -1325,7 +1325,7 @@
 <div class="line"><a name="l01498"></a><span class="lineno"> 1498</span>&#160;               </div>
 <div class="line"><a name="l01499"></a><span class="lineno"> 1499</span>&#160;                <span class="keywordflow">return</span> 1;                                                                          <span class="comment">/* return error */</span></div>
 <div class="line"><a name="l01500"></a><span class="lineno"> 1500</span>&#160;            }</div>
-<div class="line"><a name="l01501"></a><span class="lineno"> 1501</span>&#160;            timeout = 400 * 1000;                                                                  <span class="comment">/* max 400s */</span></div>
+<div class="line"><a name="l01501"></a><span class="lineno"> 1501</span>&#160;            timeout = 1000 * 1000;                                                                 <span class="comment">/* max 1000s */</span></div>
 <div class="line"><a name="l01502"></a><span class="lineno"> 1502</span>&#160;            <span class="keywordflow">while</span> (timeout != 0)                                                                   <span class="comment">/* check timeout */</span></div>
 <div class="line"><a name="l01503"></a><span class="lineno"> 1503</span>&#160;            {</div>
 <div class="line"><a name="l01504"></a><span class="lineno"> 1504</span>&#160;                res = a_w25qxx_qspi_write_read(handle, <a class="code" href="driver__w25qxx_8c.html#adf682969c34f4b31a87dd92dd18ccea3">W25QXX_COMMAND_READ_STATUS_REG1</a>, 1,</div>
@@ -1375,7 +1375,7 @@
 <div class="line"><a name="l01548"></a><span class="lineno"> 1548</span>&#160;               </div>
 <div class="line"><a name="l01549"></a><span class="lineno"> 1549</span>&#160;                <span class="keywordflow">return</span> 1;                                                                          <span class="comment">/* return error */</span></div>
 <div class="line"><a name="l01550"></a><span class="lineno"> 1550</span>&#160;            }</div>
-<div class="line"><a name="l01551"></a><span class="lineno"> 1551</span>&#160;            timeout = 400 * 1000;                                                                  <span class="comment">/* max 400s */</span></div>
+<div class="line"><a name="l01551"></a><span class="lineno"> 1551</span>&#160;            timeout = 1000 * 1000;                                                                 <span class="comment">/* max 1000s */</span></div>
 <div class="line"><a name="l01552"></a><span class="lineno"> 1552</span>&#160;            <span class="keywordflow">while</span> (timeout != 0)                                                                   <span class="comment">/* check timeout */</span></div>
 <div class="line"><a name="l01553"></a><span class="lineno"> 1553</span>&#160;            {</div>
 <div class="line"><a name="l01554"></a><span class="lineno"> 1554</span>&#160;                buf[0] = <a class="code" href="driver__w25qxx_8c.html#adf682969c34f4b31a87dd92dd18ccea3">W25QXX_COMMAND_READ_STATUS_REG1</a>;                                          <span class="comment">/* read status1 command */</span></div>
@@ -1430,7 +1430,7 @@
 <div class="line"><a name="l01603"></a><span class="lineno"> 1603</span>&#160;           </div>
 <div class="line"><a name="l01604"></a><span class="lineno"> 1604</span>&#160;            <span class="keywordflow">return</span> 1;                                                                              <span class="comment">/* return error */</span></div>
 <div class="line"><a name="l01605"></a><span class="lineno"> 1605</span>&#160;        }</div>
-<div class="line"><a name="l01606"></a><span class="lineno"> 1606</span>&#160;        timeout = 400 * 1000;                                                                      <span class="comment">/* max 400s */</span></div>
+<div class="line"><a name="l01606"></a><span class="lineno"> 1606</span>&#160;        timeout = 1000 * 1000;                                                                     <span class="comment">/* max 1000s */</span></div>
 <div class="line"><a name="l01607"></a><span class="lineno"> 1607</span>&#160;        <span class="keywordflow">while</span> (timeout != 0)                                                                       <span class="comment">/* check timeout */</span></div>
 <div class="line"><a name="l01608"></a><span class="lineno"> 1608</span>&#160;        {</div>
 <div class="line"><a name="l01609"></a><span class="lineno"> 1609</span>&#160;            res = a_w25qxx_qspi_write_read(handle, <a class="code" href="driver__w25qxx_8c.html#adf682969c34f4b31a87dd92dd18ccea3">W25QXX_COMMAND_READ_STATUS_REG1</a>, 4,</div>
diff --git a/doc/html/group__w25qxx__basic__driver.html#gaa293c3a46c4010a3af597a83e646de0d b/doc/html/group__w25qxx__basic__driver.html#gaa293c3a46c4010a3af597a83e646de0d
diff --git a/src/driver_w25qxx.c b/src/driver_w25qxx.c
@@ -1498,7 +1498,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)
                
                 return 1;                                                                          /* return error */
             }
-            timeout = 400 * 1000;                                                                  /* max 400s */
+            timeout = 1000 * 1000;                                                                 /* max 1000s */
             while (timeout != 0)                                                                   /* check timeout */
             {
                 res = a_w25qxx_qspi_write_read(handle, W25QXX_COMMAND_READ_STATUS_REG1, 1,
@@ -1548,7 +1548,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)
                
                 return 1;                                                                          /* return error */
             }
-            timeout = 400 * 1000;                                                                  /* max 400s */
+            timeout = 1000 * 1000;                                                                 /* max 1000s */
             while (timeout != 0)                                                                   /* check timeout */
             {
                 buf[0] = W25QXX_COMMAND_READ_STATUS_REG1;                                          /* read status1 command */
@@ -1603,7 +1603,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)
            
             return 1;                                                                              /* return error */
         }
-        timeout = 400 * 1000;                                                                      /* max 400s */
+        timeout = 1000 * 1000;                                                                     /* max 1000s */
         while (timeout != 0)                                                                       /* check timeout */
         {
             res = a_w25qxx_qspi_write_read(handle, W25QXX_COMMAND_READ_STATUS_REG1, 4,

Original file line number	Diff line number	Diff line change
`@@ -1498,7 +1498,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)`
`1498`	`1498`
`1499`	`1499`	`return 1; /* return error */`
`1500`	`1500`	`}`
`1501`		`- timeout = 400 * 1000; /* max 400s */`
	`1501`	`+ timeout = 1000 * 1000; /* max 1000s */`
`1502`	`1502`	`while (timeout != 0) /* check timeout */`
`1503`	`1503`	`{`
`1504`	`1504`	`res = a_w25qxx_qspi_write_read(handle, W25QXX_COMMAND_READ_STATUS_REG1, 1,`
`@@ -1548,7 +1548,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)`
`1548`	`1548`
`1549`	`1549`	`return 1; /* return error */`
`1550`	`1550`	`}`
`1551`		`- timeout = 400 * 1000; /* max 400s */`
	`1551`	`+ timeout = 1000 * 1000; /* max 1000s */`
`1552`	`1552`	`while (timeout != 0) /* check timeout */`
`1553`	`1553`	`{`
`1554`	`1554`	`buf[0] = W25QXX_COMMAND_READ_STATUS_REG1; /* read status1 command */`
`@@ -1603,7 +1603,7 @@ uint8_t w25qxx_chip_erase(w25qxx_handle_t *handle)`
`1603`	`1603`
`1604`	`1604`	`return 1; /* return error */`
`1605`	`1605`	`}`
`1606`		`- timeout = 400 * 1000; /* max 400s */`
	`1606`	`+ timeout = 1000 * 1000; /* max 1000s */`
`1607`	`1607`	`while (timeout != 0) /* check timeout */`
`1608`	`1608`	`{`
`1609`	`1609`	`res = a_w25qxx_qspi_write_read(handle, W25QXX_COMMAND_READ_STATUS_REG1, 4,`