Diff: source/globals.cpp

Revision:

5:0c7d131e6089

Parent:

3:f20e114eb2ee

Child:

6:424e225d2a91

--- a/source/globals.cpp	Tue Oct 04 16:52:21 2016 +0000
+++ b/source/globals.cpp	Thu Oct 06 07:58:31 2016 +0000
@@ -1,9 +1,34 @@
-// ***************
-// * globals.cpp *
-// ***************
-//
-// Created: 2015/03/19
-// By: Damien Frost
+/**
+* @author Damien Frost
+*
+* @section LICENSE
+*
+*   Copyright (c) 2016 Damien Frost
+*
+*   Permission is hereby granted, free of charge, to any person obtaining a copy
+*   of this software and associated documentation files (the "Software"), to deal
+*   in the Software without restriction, including without limitation the rights
+*   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*   copies of the Software, and to permit persons to whom the Software is
+*   furnished to do so, subject to the following conditions:
+*
+*   The above copyright notice and this permission notice shall be included in
+*   all copies or substantial portions of the Software.
+*
+*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*   THE SOFTWARE.
+*
+* @file "globals.cpp"
+*
+* @section DESCRIPTION
+*   Global definitions for the IoT example program.
+*
+*/
 
 #include "mbed.h"
 #include "globals.h"
@@ -15,21 +40,23 @@
 #define FUNCNAME "GBL"
 #include "messages.h"
 
-char* wifissid = "SC";
-char* wifipassword = "smartcellshield";
-
+// Hardware declarations:
 Serial          pc(USBTX, USBRX);
 InterruptIn     UIBut1(USER_BUTTON);
 Timer           DisplayTimer;
 DigitalOut      Led(LED1);
 
-WiflyInterface eth(D8, D2, D6, D5, wifissid, wifipassword, WPA2);
-
+// Global variable declarations:
 int ReconnectAttempts = 0;
 int SendCounter = 0;
 extern int IoT_ID = 0;
 float TempSensor = 0.0f;
+char* wifissid = "MyHomeNetwork";
+char* wifipassword = "MyHomeNetworkPassword";
 
+// Wifily interface declaration:
+WiflyInterface eth(D8, D2, D6, D5, wifissid, wifipassword, WPA2);
+// WebSocket declaration:
 Websocket ws;
 
 
@@ -129,7 +156,7 @@
     return;
 }
 
-void ReceiveNetworkData(unsigned int * wifi_cmd, unsigned int * var, float * value){
+void ReceiveNetworkData(unsigned int * wifi_cmd, float * value){
     char msg_buffer[CHARMSGBUFF];
     char msg_buffer2[CHARMSGBUFF];
     int resp;
@@ -139,7 +166,7 @@
         if(resp == 1){
             INFO("Received: %s", msg_buffer);
             sscanf(msg_buffer, "%d,%s", wifi_cmd, msg_buffer2);
-            if(*wifi_cmd == CHANGEVAR_WIFI_CMD){
+            if(*wifi_cmd == CV_LED_WIFI_CMD){
                 // Get one more value:
                 sscanf(msg_buffer2, "%f", value);
             }
@@ -149,7 +176,6 @@
         }else{
             //DBG("Did not receive anything :(\n\r");
             *wifi_cmd = NO_WIFI_CMD;
-            *var = 0;
             *value = 0.0f;
         }
     }