ACKme / WiConnect

Host library for controlling a WiConnect enabled Wi-Fi module.

Dependents:   wiconnect-ota_example wiconnect-web_setup_example wiconnect-test-console wiconnect-tcp_server_example ... more

Diff: doc/mbed/html/web_setup_2example_8cpp-example.html

Revision:
39:a963f69cb2de
Parent:
34:2616445d0823
--- a/doc/mbed/html/web_setup_2example_8cpp-example.html	Thu Nov 27 10:27:18 2014 +0000
+++ b/doc/mbed/html/web_setup_2example_8cpp-example.html	Mon Feb 23 20:30:18 2015 -0800
@@ -142,11 +142,6 @@
 <div class="line"></div>
 <div class="line"></div>
 <div class="line"></div>
-<div class="line"><span class="comment">/******************************************************************************</span></div>
-<div class="line"><span class="comment"> * Local Functions</span></div>
-<div class="line"><span class="comment"> */</span></div>
-<div class="line"><span class="keyword">static</span> <span class="keywordtype">void</span> webSetupCompleteCallback(<a name="a0"></a><a class="code" href="group__api__core__types.html#ga325637ed501728bd6c8c7a7982b9ce05">WiconnectResult</a> result, <span class="keywordtype">void</span> *arg1, <span class="keywordtype">void</span> *arg2);</div>
-<div class="line"></div>
 <div class="line"></div>
 <div class="line"><span class="comment">/******************************************************************************</span></div>
 <div class="line"><span class="comment"> * Global Defines</span></div>
@@ -159,8 +154,6 @@
 <div class="line"><span class="comment">// Buffer used internally by WiConnect library, note that this is optional</span></div>
 <div class="line"><span class="keyword">static</span> uint8_t wiconnectInternalBuffer[256];</div>
 <div class="line"></div>
-<div class="line"><span class="comment">// Flag that indicate websetup has completed</span></div>
-<div class="line"><span class="keyword">static</span> <span class="keyword">volatile</span> <span class="keywordtype">bool</span> webSetupCompleteFlag = <span class="keyword">false</span>;</div>
 <div class="line"></div>
 <div class="line"></div>
 <div class="line"><span class="comment">/******************************************************************************</span></div>
@@ -168,6 +161,7 @@
 <div class="line"><span class="comment"> */</span></div>
 <div class="line"><span class="keywordtype">int</span> main(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> **argv)</div>
 <div class="line">{</div>
+<div class="line">    <a name="a0"></a><a class="code" href="group__api__core__types.html#ga325637ed501728bd6c8c7a7982b9ce05">WiconnectResult</a> result;</div>
 <div class="line">    consoleSerial.baud(115200); <span class="comment">// console terminal to 115200 baud</span></div>
 <div class="line"></div>
 <div class="line">    <span class="comment">//-------------------------------------------------------------------------</span></div>
@@ -191,12 +185,12 @@
 <div class="line">    printf(<span class="stringliteral">&quot;Initializing WiConnect Library...\r\n&quot;</span>);</div>
 <div class="line"></div>
 <div class="line">    <span class="comment">// Initialize communication with WiFi module</span></div>
-<div class="line">    <span class="keywordflow">if</span>(wiconnect.init(<span class="keyword">true</span>) != <a name="a1"></a><a class="code" href="group__api__core__types.html#gga325637ed501728bd6c8c7a7982b9ce05af0a2ad8af174aee6b52813d8528328e7">WICONNECT_SUCCESS</a>)</div>
+<div class="line">    <span class="keywordflow">if</span>(<a name="a1"></a><a class="code" href="group__api__core__macro.html#gab27aa3ef76302b5221766abfd4f47e64">WICONNECT_FAILED</a>(result, wiconnect.init()))</div>
 <div class="line">    {</div>
 <div class="line">        <span class="keywordflow">if</span>(result == <a name="a2"></a><a class="code" href="group__api__core__types.html#gga325637ed501728bd6c8c7a7982b9ce05a62defbdafd472461054dd6bb888c9a1e">WICONNECT_FIRMWARE_OUTDATED</a>)</div>
 <div class="line">        {</div>
-<div class="line">            printf(<span class="stringliteral">&quot;The WiFi firmware is not supported. Run the ota example to update the firmware:\r\n&quot;</span>);</div>
-<div class="line">            printf(<span class="stringliteral">&quot;https://developer.mbed.org/teams/ACKme/code/wiconnect-ota_example&quot;</span>);</div>
+<div class="line">            printf(<span class="stringliteral">&quot;*** The WiFi firmware is not supported. Run the ota example to update the firmware:\r\n&quot;</span>);</div>
+<div class="line">            printf(<span class="stringliteral">&quot;https://developer.mbed.org/teams/ACKme/code/wiconnect-ota_example\r\n\r\n&quot;</span>);</div>
 <div class="line">        }</div>
 <div class="line">        <span class="keywordflow">else</span></div>
 <div class="line">        {</div>
@@ -214,7 +208,7 @@
 <div class="line">    printf(<span class="stringliteral">&quot;Starting Websetup...\r\n&quot;</span>);</div>
 <div class="line"></div>
 <div class="line">    <span class="comment">// Start web setup</span></div>
-<div class="line">    <span class="keywordflow">if</span>(wiconnect.startWebSetup(WEB_SETUP_SSID, WEB_SETUP_PASSWORD, Callback(webSetupCompleteCallback)) != <a class="code" href="group__api__core__types.html#gga325637ed501728bd6c8c7a7982b9ce05af0a2ad8af174aee6b52813d8528328e7">WICONNECT_SUCCESS</a>)</div>
+<div class="line">    <span class="keywordflow">if</span>(wiconnect.startWebSetup(WEB_SETUP_SSID, WEB_SETUP_PASSWORD) != <a name="a3"></a><a class="code" href="group__api__core__types.html#gga325637ed501728bd6c8c7a7982b9ce05af0a2ad8af174aee6b52813d8528328e7">WICONNECT_SUCCESS</a>)</div>
 <div class="line">    {</div>
 <div class="line">        printf(<span class="stringliteral">&quot;Failed to start web setup\r\n&quot;</span>);</div>
 <div class="line">        <span class="keywordflow">for</span>(;;); <span class="comment">// infinite loop</span></div>
@@ -231,11 +225,18 @@
 <div class="line">    printf(<span class="stringliteral">&quot;4. This will bringup a setup page, enter your router&#39;s credentials.\r\n&quot;</span>);</div>
 <div class="line">    printf(<span class="stringliteral">&quot;5. Click the &#39;Save &amp; Exit&#39; button at the bottom of the webpage\r\n\r\n&quot;</span>);</div>
 <div class="line"></div>
-<div class="line">    <span class="keywordflow">while</span>(!webSetupCompleteFlag)</div>
+<div class="line">    <span class="keywordflow">for</span>(;;)</div>
 <div class="line">    {</div>
-<div class="line">        <span class="comment">// do nothing while we wait</span></div>
-<div class="line">        <span class="comment">// When the user exits web setup from the webpage</span></div>
-<div class="line">        <span class="comment">// webSetupCompleteCallback() will execute and set webSetupCompleteFlag TRUE</span></div>
+<div class="line">        <span class="keywordtype">bool</span> isRunning;</div>
+<div class="line">        </div>
+<div class="line">        <span class="keywordflow">if</span>(wiconnect.isWebSetupRunning(&amp;isRunning) != <a class="code" href="group__api__core__types.html#gga325637ed501728bd6c8c7a7982b9ce05af0a2ad8af174aee6b52813d8528328e7">WICONNECT_SUCCESS</a>)</div>
+<div class="line">        {</div>
+<div class="line">            printf(<span class="stringliteral">&quot;Failed to get websetup status\r\n&quot;</span>);</div>
+<div class="line">            <span class="keywordflow">for</span>(;;);</div>
+<div class="line">        }</div>
+<div class="line">        <a name="a4"></a><a class="code" href="group__api__core__macro.html#ga596d1da2fb23f4e748c83d64a47e10b3">delayMs</a>(100);</div>
+<div class="line">        <span class="keywordflow">if</span>(!isRunning)</div>
+<div class="line">            <span class="keywordflow">break</span>;</div>
 <div class="line">    }</div>
 <div class="line"></div>
 <div class="line">    <span class="comment">//-------------------------------------------------------------------------</span></div>
@@ -249,12 +250,6 @@
 <div class="line">}</div>
 <div class="line"></div>
 <div class="line"></div>
-<div class="line"><span class="comment">// this function is called when web setup completes</span></div>
-<div class="line"><span class="comment">// it is called in the background</span></div>
-<div class="line"><span class="keyword">static</span> <span class="keywordtype">void</span> webSetupCompleteCallback(<a class="code" href="group__api__core__types.html#ga325637ed501728bd6c8c7a7982b9ce05">WiconnectResult</a> result, <span class="keywordtype">void</span> *arg1, <span class="keywordtype">void</span> *arg2)</div>
-<div class="line">{</div>
-<div class="line">    webSetupCompleteFlag = <span class="keyword">true</span>;</div>
-<div class="line">}</div>
 </div><!-- fragment --> </div><!-- contents -->
 </div><!-- doc-content -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->