Diff: main.cpp

Revision:

12:3dd3a1be40c1

Parent:

9:dddf6ed7e992

Child:

14:4639147f2f42

Child:

15:a835e28308b6

diff -r 6a3929294bf0 -r 3dd3a1be40c1 main.cpp
--- a/main.cpp	Tue Aug 12 02:37:22 2014 -0700
+++ b/main.cpp	Wed Aug 13 04:42:11 2014 -0700
@@ -1,13 +1,31 @@
-/*
- * Copyright 2014, ACKme Networks
- * All Rights Reserved.
- *
- * This is UNPUBLISHED PROPRIETARY SOURCE CODE of ACKme Networks;
- * the contents of this file may not be disclosed to third parties, copied
- * or duplicated in any form, in whole or in part, without the prior
- * written permission of ACKme Networks.
+/**
+ * ACKme WiConnect Host Library is licensed under the BSD licence: 
+ * 
+ * Copyright (c)2014 ACKme Networks.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met: 
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 3. The name of the author may not be used to endorse or promote products 
+ * derived from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
  */
-
 #include "Wiconnect.h"
 #include "util/log/log.h"
 #include "util/CommandProcessor/CommandProcessor.h"
@@ -39,7 +57,7 @@
 static uint8_t wiconnectSerialRxBuffer[WICONNECT_SERIAL_RX_BUFFER_SIZE];
 
 static const SerialConfig serialConfig(WICONNECT_RX_PIN, WICONNECT_TX_PIN, WICONNECT_CTS_PIN, WICONNECT_RTS_PIN, WICONNECT_DEFAULT_BAUD, WICONNECT_SERIAL_RX_BUFFER_SIZE, wiconnectSerialRxBuffer);
-static Wiconnect wiconnectIfc(serialConfig, wiconnectInternalBuffer, WICONNECT_INTERNAL_BUFFER_SIZE, WICONNECT_RESET_PIN, WICONNECT_WAKE_PIN, TEST_NONBLOCKING_API);
+static Wiconnect wiconnectIfc(serialConfig, WICONNECT_INTERNAL_BUFFER_SIZE, wiconnectInternalBuffer, WICONNECT_RESET_PIN, WICONNECT_WAKE_PIN, TEST_NONBLOCKING_API);
 
 ConsoleSerial consoleSerial(SERIAL_TX, SERIAL_RX);
 CommandProcessor cmdProcessor(&consoleSerial, commandList);
@@ -47,11 +65,8 @@
 
 
 /*************************************************************************************************/
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
 {
-    WiconnectResult result;
-    bool running = true;
-
     consoleSerial.setBaud(CONSOLE_BAUD);
 
     wiconnectIfc.setAssertLogger(LogFunc(wiconnectLogAssert));
@@ -62,6 +77,7 @@
 
     initialize_loop:
     {
+        WiconnectResult result;
         LOG_INFO("\r\n\r\nInitializing WiConnect...");
         if(WICONNECT_FAILED(result, wiconnectIfc.init(true)))
         {
@@ -73,6 +89,7 @@
     }
 
     {
+        WiconnectResult result;
         if(!WICONNECT_FAILED(result, wiconnectIfc.getVersion()))
         {
             LOG_INFO("Version: %s", wiconnectIfc.getResponseBuffer());
@@ -81,8 +98,9 @@
 
     LOG_INFO("WiConnect test app ready...");
 
-    while(running)
+    for(;;)
     {
+        WiconnectResult result;
         Command cmd;
         cmdProcessor.waitForCommand(&cmd);
         if(WICONNECT_FAILED(result, cmd.execute()))