Skip to content

Commit

Permalink
Upload wifi-connection-manager 2.2.0.1391
Browse files Browse the repository at this point in the history
  • Loading branch information
gitlab-runner committed Dec 18, 2021
1 parent 9b99332 commit c7c2a01
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 27 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ This library and its features are supported on the following Infineon platforms:

* [CYW943907AEVAL1F Evaluation Kit(CYW943907AEVAL1F)](https://www.cypress.com/documentation/development-kitsboards/cyw943907aeval1f-evaluation-kit)

* [PSoC™ 62S2 evaluation kit (CY8CEVAL-062S2-MUR-43439M2)](https://www.cypress.com/documentation/development-kitsboards/psoc-62s2-evaluation-kit-cy8ceval-062s2)

## Dependent Libraries
This library depends on the following:
* [Wi-Fi Middleware Core](https://github.com/Infineon/wifi-mw-core)
Expand Down
4 changes: 4 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ See the [README.md](./README.md) for a complete description of the Wi-Fi Connect
| cy_wcm_connect_ap API does not connect to AP, if MAC address is specified as connection parameter.| No workaround. This issue will be fixed in future release. |

## Changelog

### v2.2.0
* Added support for CY8CEVAL-062S2-MUR-43439M2 kit

### v2.1.0
* Added support for CYW943907AEVAL1F and CYW954907AEVAL1F kits

Expand Down
23 changes: 21 additions & 2 deletions docs/api_reference_manual/html/group__group__wcm__macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,12 @@
<tr class="memitem:gad757aff6414a2ebb12dcdea491df9627"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__group__wcm__macros.html#gad757aff6414a2ebb12dcdea491df9627">CY_WCM_MAX_SSID_LEN</a>&#160;&#160;&#160;(32)</td></tr>
<tr class="memdesc:gad757aff6414a2ebb12dcdea491df9627"><td class="mdescLeft">&#160;</td><td class="mdescRight">Max SSID length. <a href="#gad757aff6414a2ebb12dcdea491df9627">More...</a><br /></td></tr>
<tr class="separator:gad757aff6414a2ebb12dcdea491df9627"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ga57d06f15bb823cd45d9542c1303f647a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__group__wcm__macros.html#ga57d06f15bb823cd45d9542c1303f647a">CY_WCM_MAX_PASSPHRASE_LEN</a>&#160;&#160;&#160;(64)</td></tr>
<tr class="memitem:ga57d06f15bb823cd45d9542c1303f647a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__group__wcm__macros.html#ga57d06f15bb823cd45d9542c1303f647a">CY_WCM_MAX_PASSPHRASE_LEN</a>&#160;&#160;&#160;(63)</td></tr>
<tr class="memdesc:ga57d06f15bb823cd45d9542c1303f647a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Max passphrase length. <a href="#ga57d06f15bb823cd45d9542c1303f647a">More...</a><br /></td></tr>
<tr class="separator:ga57d06f15bb823cd45d9542c1303f647a"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:ga93a8ed3b3f773cb1c211afbba3edf853"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__group__wcm__macros.html#ga93a8ed3b3f773cb1c211afbba3edf853">CY_WCM_MIN_PASSPHRASE_LEN</a>&#160;&#160;&#160;(8)</td></tr>
<tr class="memdesc:ga93a8ed3b3f773cb1c211afbba3edf853"><td class="mdescLeft">&#160;</td><td class="mdescRight">Min passphrase length. <a href="#ga93a8ed3b3f773cb1c211afbba3edf853">More...</a><br /></td></tr>
<tr class="separator:ga93a8ed3b3f773cb1c211afbba3edf853"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:gae032a02d61d8a9d68a502ac20591a1d5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__group__wcm__macros.html#gae032a02d61d8a9d68a502ac20591a1d5">CY_WCM_MAC_ADDR_LEN</a>&#160;&#160;&#160;(6)</td></tr>
<tr class="memdesc:gae032a02d61d8a9d68a502ac20591a1d5"><td class="mdescLeft">&#160;</td><td class="mdescRight">MAC address length. <a href="#gae032a02d61d8a9d68a502ac20591a1d5">More...</a><br /></td></tr>
<tr class="separator:gae032a02d61d8a9d68a502ac20591a1d5"><td class="memSeparator" colspan="2">&#160;</td></tr>
Expand Down Expand Up @@ -174,13 +177,29 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga57d06f15bb823cd45d9542c
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">#define CY_WCM_MAX_PASSPHRASE_LEN&#160;&#160;&#160;(64)</td>
<td class="memname">#define CY_WCM_MAX_PASSPHRASE_LEN&#160;&#160;&#160;(63)</td>
</tr>
</table>
</div><div class="memdoc">

<p>Max passphrase length. </p>

</div>
</div>
<a id="ga93a8ed3b3f773cb1c211afbba3edf853"></a>
<h2 class="memtitle"><span class="permalink"><a href="#ga93a8ed3b3f773cb1c211afbba3edf853">&#9670;&nbsp;</a></span>CY_WCM_MIN_PASSPHRASE_LEN</h2>

<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">#define CY_WCM_MIN_PASSPHRASE_LEN&#160;&#160;&#160;(8)</td>
</tr>
</table>
</div><div class="memdoc">

<p>Min passphrase length. </p>

</div>
</div>
<a id="gae032a02d61d8a9d68a502ac20591a1d5"></a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var group__group__wcm__macros =
[ "WCM-specific error codes", "group__cy__wcm__error.html", "group__cy__wcm__error" ],
[ "CY_WCM_MAX_SSID_LEN", "group__group__wcm__macros.html#gad757aff6414a2ebb12dcdea491df9627", null ],
[ "CY_WCM_MAX_PASSPHRASE_LEN", "group__group__wcm__macros.html#ga57d06f15bb823cd45d9542c1303f647a", null ],
[ "CY_WCM_MIN_PASSPHRASE_LEN", "group__group__wcm__macros.html#ga93a8ed3b3f773cb1c211afbba3edf853", null ],
[ "CY_WCM_MAC_ADDR_LEN", "group__group__wcm__macros.html#gae032a02d61d8a9d68a502ac20591a1d5", null ],
[ "CY_WCM_MAX_IE_LENGTH", "group__group__wcm__macros.html#ga25c78c2899233a91a6e52821fecdd3bf", null ],
[ "WEP_ENABLED", "group__group__wcm__macros.html#ga4199a1b37dba92f482ff0b9eb406c323", null ],
Expand Down
1 change: 1 addition & 0 deletions docs/api_reference_manual/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ <h1><a class="anchor" id="section_supported_platforms"></a>
<li><a href="https://www.cypress.com/documentation/development-kitsboards/psoc-62s2-evaluation-kit-cy8ceval-062s2">PSoC&trade; 62S2 evaluation kit (CY8CEVAL-062S2-LAI-4373M2)</a></li>
<li><a href="https://www.cypress.com/documentation/development-kitsboards/cyw954907aeval1f-evaluation-kit">CYW954907AEVAL1F Evaluation Kit(CYW954907AEVAL1F)</a></li>
<li><a href="https://www.cypress.com/documentation/development-kitsboards/cyw943907aeval1f-evaluation-kit">CYW943907AEVAL1F Evaluation Kit(CYW943907AEVAL1F)</a></li>
<li><a href="https://www.cypress.com/documentation/development-kitsboards/psoc-62s2-evaluation-kit-cy8ceval-062s2">PSoC&trade; 62S2 evaluation kit (CY8CEVAL-062S2-MUR-43439M2)</a></li>
</ul>
<h1><a class="anchor" id="section_dependencies"></a>
Dependent Libraries</h1>
Expand Down
2 changes: 1 addition & 1 deletion docs/api_reference_manual/html/navtreedata.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var NAVTREE =
var NAVTREEINDEX =
[
"group__cy__wcm__error.html",
"structcy__wcm__custom__ie__info__t.html#afd53c84c770bcba488cc1ff7567f8135"
"structcy__wcm__custom__ie__info__t.html#ad5be5ea213d5b9219aafe3770c85a9a0"
];

var SYNCONMSG = 'click to disable panel synchronisation';
Expand Down
36 changes: 18 additions & 18 deletions docs/api_reference_manual/html/navtreeindex0.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,23 +193,24 @@ var NAVTREEINDEX0 =
"group__group__wcm__functions.html#gae0f0b5f3e6138bfdae943e9f7b16aa07":[1,5,2],
"group__group__wcm__functions.html#gae5957d81ae8e2cd3b0ee5bac550f03f2":[1,5,8],
"group__group__wcm__macros.html":[1,1],
"group__group__wcm__macros.html#ga20f0d7118c2d35a688bcdc5b8b0920d9":[1,1,6],
"group__group__wcm__macros.html#ga25c78c2899233a91a6e52821fecdd3bf":[1,1,4],
"group__group__wcm__macros.html#ga2fd33d6cf6472c7452a22e5988e69516":[1,1,16],
"group__group__wcm__macros.html#ga4199a1b37dba92f482ff0b9eb406c323":[1,1,5],
"group__group__wcm__macros.html#ga4d4a4586c264fe8e4acb0bf7169b7b0f":[1,1,8],
"group__group__wcm__macros.html#ga577a9dbc615ba145496a41a2035bd615":[1,1,7],
"group__group__wcm__macros.html#ga20f0d7118c2d35a688bcdc5b8b0920d9":[1,1,7],
"group__group__wcm__macros.html#ga25c78c2899233a91a6e52821fecdd3bf":[1,1,5],
"group__group__wcm__macros.html#ga2fd33d6cf6472c7452a22e5988e69516":[1,1,17],
"group__group__wcm__macros.html#ga4199a1b37dba92f482ff0b9eb406c323":[1,1,6],
"group__group__wcm__macros.html#ga4d4a4586c264fe8e4acb0bf7169b7b0f":[1,1,9],
"group__group__wcm__macros.html#ga577a9dbc615ba145496a41a2035bd615":[1,1,8],
"group__group__wcm__macros.html#ga57d06f15bb823cd45d9542c1303f647a":[1,1,2],
"group__group__wcm__macros.html#ga8875737a0403d2136a69bbc96401cccf":[1,1,10],
"group__group__wcm__macros.html#ga9640c064932a3a633a3312b737658f83":[1,1,14],
"group__group__wcm__macros.html#gaa7ccd472bacbd8ee01f31f0f0e2ce3dc":[1,1,9],
"group__group__wcm__macros.html#gaaae7e8a0eb357cae8f130f9099d8e7b8":[1,1,13],
"group__group__wcm__macros.html#gaafdddf85f4d0df08ee3aead815ad7c76":[1,1,15],
"group__group__wcm__macros.html#gac7494a533045203834447aab9e85b4da":[1,1,17],
"group__group__wcm__macros.html#gad175824d1581f69f5a725e4c9171aa79":[1,1,11],
"group__group__wcm__macros.html#ga8875737a0403d2136a69bbc96401cccf":[1,1,11],
"group__group__wcm__macros.html#ga93a8ed3b3f773cb1c211afbba3edf853":[1,1,3],
"group__group__wcm__macros.html#ga9640c064932a3a633a3312b737658f83":[1,1,15],
"group__group__wcm__macros.html#gaa7ccd472bacbd8ee01f31f0f0e2ce3dc":[1,1,10],
"group__group__wcm__macros.html#gaaae7e8a0eb357cae8f130f9099d8e7b8":[1,1,14],
"group__group__wcm__macros.html#gaafdddf85f4d0df08ee3aead815ad7c76":[1,1,16],
"group__group__wcm__macros.html#gac7494a533045203834447aab9e85b4da":[1,1,18],
"group__group__wcm__macros.html#gad175824d1581f69f5a725e4c9171aa79":[1,1,12],
"group__group__wcm__macros.html#gad757aff6414a2ebb12dcdea491df9627":[1,1,1],
"group__group__wcm__macros.html#gada6d6331053c0f88c63d77ba8d2019c8":[1,1,12],
"group__group__wcm__macros.html#gae032a02d61d8a9d68a502ac20591a1d5":[1,1,3],
"group__group__wcm__macros.html#gada6d6331053c0f88c63d77ba8d2019c8":[1,1,13],
"group__group__wcm__macros.html#gae032a02d61d8a9d68a502ac20591a1d5":[1,1,4],
"group__group__wcm__mscs.html":[1,0],
"group__group__wcm__structures.html":[1,4],
"group__group__wcm__typedefs.html":[1,3],
Expand All @@ -218,8 +219,8 @@ var NAVTREEINDEX0 =
"group__group__wcm__typedefs.html#ga510db2323122294f3956024396ba2ff5":[1,3,1],
"group__group__wcm__typedefs.html#ga58bd6c567dc6b0b111fb5852227c0c88":[1,3,3],
"group__group__wcm__typedefs.html#ga5f028848682f04705e669b6823d290fb":[1,3,4],
"index.html":[0],
"index.html":[],
"index.html":[0],
"modules.html":[1],
"pages.html":[],
"structcy__wcm__ap__config__t.html":[1,4,14],
Expand Down Expand Up @@ -248,6 +249,5 @@ var NAVTREEINDEX0 =
"structcy__wcm__custom__ie__info__t.html":[1,4,13],
"structcy__wcm__custom__ie__info__t.html#a84e872b95d62994768cbb72a17c07692":[1,4,13,0],
"structcy__wcm__custom__ie__info__t.html#a95c37d239bc173d922186c37a55cfd2e":[1,4,13,4],
"structcy__wcm__custom__ie__info__t.html#aabade00f0187717a90f7837ad2d164e8":[1,4,13,3],
"structcy__wcm__custom__ie__info__t.html#ad5be5ea213d5b9219aafe3770c85a9a0":[1,4,13,1]
"structcy__wcm__custom__ie__info__t.html#aabade00f0187717a90f7837ad2d164e8":[1,4,13,3]
};
1 change: 1 addition & 0 deletions docs/api_reference_manual/html/navtreeindex1.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var NAVTREEINDEX1 =
{
"structcy__wcm__custom__ie__info__t.html#ad5be5ea213d5b9219aafe3770c85a9a0":[1,4,13,1],
"structcy__wcm__custom__ie__info__t.html#afd53c84c770bcba488cc1ff7567f8135":[1,4,13,2],
"structcy__wcm__ip__address__t.html":[1,4,2],
"structcy__wcm__ip__address__t.html#a7c275791b147e4ccd77ad178dd25bf81":[1,4,2,0],
Expand Down
1 change: 1 addition & 0 deletions docs/api_reference_manual/html/search/all_2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion include/cy_wcm.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ extern "C" {
* Constants
******************************************************/
#define CY_WCM_MAX_SSID_LEN (32) /**< Max SSID length. */
#define CY_WCM_MAX_PASSPHRASE_LEN (64) /**< Max passphrase length. */
#define CY_WCM_MAX_PASSPHRASE_LEN (63) /**< Max passphrase length. */
#define CY_WCM_MIN_PASSPHRASE_LEN (8) /**< Min passphrase length. */
#define CY_WCM_MAC_ADDR_LEN (6) /**< MAC address length. */
#define CY_WCM_MAX_IE_LENGTH (3) /**< Maximum Length of Information Element */
#define WEP_ENABLED 0x0001 /**< Flag to enable WEP security. */
Expand Down
13 changes: 9 additions & 4 deletions source/COMPONENT_LWIP/cy_wcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2369,6 +2369,11 @@ cy_rslt_t cy_wcm_start_ap(const cy_wcm_ap_config_t *ap_config)
keylen, ap_config->channel);
if (res != CY_RSLT_SUCCESS)
{
if(res == WHD_UNSUPPORTED || res == WHD_WEP_NOT_ALLOWED)
{
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "Security type not supported, result = %d \n", res);
res = CY_RSLT_WCM_SECURITY_NOT_SUPPORTED;
}
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "ERROR initializing AP = %d \n", res);
goto exit;
}
Expand Down Expand Up @@ -2665,9 +2670,9 @@ static cy_rslt_t check_ap_credentials(const cy_wcm_connect_params_t *connect_par
sec_type = connect_params->ap_credentials.security ;
/* For open and enterprise security auth types pwd len can be ignored */
if(((sec_type != CY_WCM_SECURITY_OPEN) && (!check_if_ent_auth_types(sec_type))) &&
(pwd_len == 0 || pwd_len > CY_WCM_MAX_PASSPHRASE_LEN))
(pwd_len < CY_WCM_MIN_PASSPHRASE_LEN || pwd_len > CY_WCM_MAX_PASSPHRASE_LEN))
{
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "AP credentials passphrase length error\n");
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "AP credentials passphrase length error. Length must be between 8 and 63\n");
return CY_RSLT_WCM_BAD_PASSPHRASE_LEN;
}
return CY_RSLT_SUCCESS;
Expand Down Expand Up @@ -3939,9 +3944,9 @@ static cy_rslt_t check_soft_ap_config(const cy_wcm_ap_config_t *ap_config_params
}

if((ap_config_params->ap_credentials.security != CY_WCM_SECURITY_OPEN) &&
(pwd_len == 0 || pwd_len > CY_WCM_MAX_PASSPHRASE_LEN))
(pwd_len < CY_WCM_MIN_PASSPHRASE_LEN || pwd_len > CY_WCM_MAX_PASSPHRASE_LEN))
{
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "AP credentials passphrase length error\n");
cy_wcm_log_msg(CYLF_MIDDLEWARE, CY_LOG_ERR, "AP credentials passphrase length error. Length must be between 8 and 63\n");
return CY_RSLT_WCM_BAD_PASSPHRASE_LEN;
}

Expand Down
2 changes: 1 addition & 1 deletion version.xml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<version>2.1.0.1373</version>
<version>2.2.0.1391</version>

0 comments on commit c7c2a01

Please sign in to comment.