Merge pull request #20 from libdriver/dev

fix: fix security register enumeration errors
libdriver · Jul 21, 2024 · 83f3eb1 · 83f3eb1
2 parents 9776b0e + 0899db6
commit 83f3eb1
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.0.1 (2024-07-21)
+
+## Bug Fixes
+
+- fix security register enumeration errors.
+
 ## 1.0.0 (2021-07-15)
 
 ## Features

diff --git a/doc/html/driver__w25qxx_8h.html b/doc/html/driver__w25qxx_8h.html
@@ -188,9 +188,9 @@
  }</td></tr>
 <tr class="memdesc:ga2fd3023819e1aebe089a4a72eb136da3"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx qspi read wrap length enumeration definition  <a href="group__w25qxx__advance__driver.html#ga2fd3023819e1aebe089a4a72eb136da3">More...</a><br /></td></tr>
 <tr class="separator:ga2fd3023819e1aebe089a4a72eb136da3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000
-, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000
-, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000
+<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10
+, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20
+, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30
  }</td></tr>
 <tr class="memdesc:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx security register enumeration definition  <a href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">More...</a><br /></td></tr>
 <tr class="separator:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memSeparator" colspan="2">&#160;</td></tr>

diff --git a/doc/html/driver__w25qxx_8h_source.html b/doc/html/driver__w25qxx_8h_source.html
@@ -147,9 +147,9 @@
 <div class="line"><a name="l00130"></a><span class="lineno">  130</span>&#160; </div>
 <div class="line"><a name="l00134"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">  134</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div>
 <div class="line"><a name="l00135"></a><span class="lineno">  135</span>&#160;{</div>
-<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">  136</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000,        </div>
-<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">  137</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000,        </div>
-<div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">  138</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000,        </div>
+<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">  136</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10,        </div>
+<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">  137</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20,        </div>
+<div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">  138</a></span>&#160;    <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30,        </div>
 <div class="line"><a name="l00139"></a><span class="lineno">  139</span>&#160;} <a class="code" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a>;</div>
 <div class="line"><a name="l00140"></a><span class="lineno">  140</span>&#160; </div>
 <div class="line"><a name="l00144"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#ga94bbae2bf8906903e8dc2a28c490723d">  144</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div>

diff --git a/doc/html/group__w25qxx__advance__driver.html b/doc/html/group__w25qxx__advance__driver.html
@@ -111,9 +111,9 @@
  }</td></tr>
 <tr class="memdesc:ga2fd3023819e1aebe089a4a72eb136da3"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx qspi read wrap length enumeration definition  <a href="group__w25qxx__advance__driver.html#ga2fd3023819e1aebe089a4a72eb136da3">More...</a><br /></td></tr>
 <tr class="separator:ga2fd3023819e1aebe089a4a72eb136da3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000
-, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000
-, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000
+<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10
+, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20
+, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30
  }</td></tr>
 <tr class="memdesc:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx security register enumeration definition  <a href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">More...</a><br /></td></tr>
 <tr class="separator:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memSeparator" colspan="2">&#160;</td></tr>

diff --git a/doc/html/group__w25qxx__basic__driver.html b/doc/html/group__w25qxx__basic__driver.html
@@ -899,6 +899,30 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga8e7a163b3d255b8c7fc035d
 </ul>
 </dd></dl>
 <dl class="section note"><dt>Note</dt><dd>none </dd></dl>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+<p>deinit</p>
+
 <p class="definition">Definition at line <a class="el" href="driver__w25qxx_8c_source.html#l06819">6819</a> of file <a class="el" href="driver__w25qxx_8c_source.html">driver_w25qxx.c</a>.</p>
 
 </div>

diff --git a/src/driver_w25qxx.h b/src/driver_w25qxx.h
@@ -133,9 +133,9 @@ typedef enum
  */
 typedef enum
 {
-    W25QXX_SECURITY_REGISTER_1 = 0x1000,        /**< security register 1 */
-    W25QXX_SECURITY_REGISTER_2 = 0x2000,        /**< security register 2 */
-    W25QXX_SECURITY_REGISTER_3 = 0x3000,        /**< security register 3 */
+    W25QXX_SECURITY_REGISTER_1 = 0x10,        /**< security register 1 */
+    W25QXX_SECURITY_REGISTER_2 = 0x20,        /**< security register 2 */
+    W25QXX_SECURITY_REGISTER_3 = 0x30,        /**< security register 3 */
 } w25qxx_security_register_t;
 
 /**