Revision 1:dfd24f608038, committed 2013-10-17

Comitter:

ansond

Date:

Thu Oct 17 20:25:14 2013 +0000

Parent:

0:6b56785dd2b6

Child:

2:be42baea4c81

Commit message:

updates

Changed in this revision

--- a/Thermostat-BaseUtils.h	Thu Oct 17 18:58:54 2013 +0000
+++ b/Thermostat-BaseUtils.h	Thu Oct 17 20:25:14 2013 +0000
@@ -1,4 +1,4 @@
-/* Thermostat-BaseUtils.cpp */
+/* Thermostat-BaseUtils.h */
 /* Copyright (C) 2013 mbed.org, MIT License
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
@@ -17,8 +17,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
-#ifndef THERMOSTAT_BASEUTILS_CPP_
-#define THERMOSTAT_BASEUTILS_CPP_
+#ifndef THERMOSTAT_BASEUTILS_H_
+#define THERMOSTAT_BASEUTILS_H_
 
 // AppBoard LCD Support
 #include "C12832_lcd.h"
@@ -65,4 +65,4 @@
     this->logMessage(true);
 }
 
-#endif // THERMOSTAT_BASEUTILS_CPP_
+#endif // THERMOSTAT_BASEUTILS_H_

--- a/Thermostat-LEDUtils.h	Thu Oct 17 18:58:54 2013 +0000
+++ b/Thermostat-LEDUtils.h	Thu Oct 17 20:25:14 2013 +0000
@@ -1,4 +1,4 @@
-/* Thermostat-LEDUtils.cpp */
+/* Thermostat-LEDUtils.h */
 /* Copyright (C) 2013 mbed.org, MIT License
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
@@ -17,8 +17,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
-#ifndef THERMOSTAT_LEDUTILS_CPP_
-#define THERMOSTAT_LEDUTILS_CPP_
+#ifndef THERMOSTAT_LEDUTILS_H_
+#define THERMOSTAT_LEDUTILS_H_
 
 // LEDs to toggle with control messages
 DigitalOut led1(LED1);
@@ -180,4 +180,4 @@
 }
 
 
-#endif // THERMOSTAT_LEDUTILS_CPP_
\ No newline at end of file
+#endif // THERMOSTAT_LEDUTILS_H_
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Thermostat-Location.h	Thu Oct 17 20:25:14 2013 +0000
@@ -0,0 +1,36 @@
+/* Thermostat-Location.h */
+/* Copyright (C) 2013 mbed.org, MIT License
+ *
+ * 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.
+ */
+ 
+#ifndef THERMOSTAT_LOCATION_H_
+#define THERMOSTAT_LOCATION_H_
+
+// initialize our location
+void Thermostat::initLocation() {
+}
+
+// update our location coordinates
+void Thermostat::updateCoordinates() {
+    this->m_latitude = DEFAULT_LATITUDE;
+    this->m_longitude = DEFAULT_LONGITUDE;
+    
+    this->display("Location: Latitude:%2.4f Longitude:%2.4f",this->m_latitude,this->m_longitude);
+    this->display_lcd("Location Coordinates\r\nLatitude: %2.4f\r\nLongitude: %2.4f",this->m_latitude,this->m_longitude);
+}
+
+#endif // THERMOSTAT_LOCATION_H_
\ No newline at end of file

--- a/Thermostat.cpp	Thu Oct 17 18:58:54 2013 +0000
+++ b/Thermostat.cpp	Thu Oct 17 20:25:14 2013 +0000
@@ -83,6 +83,9 @@
 // Include Base Utils
 #include "Thermostat-BaseUtils.h"
 
+// Include Location Stubs
+#include "Thermostat-Location.h"
+
 // Default constructor
 Thermostat::Thermostat() {
     this->m_temperature = 0.0;
@@ -332,16 +335,17 @@
 
 // main loop
 void Thermostat::mainLoop() {
+    // initialize our location
+    this->initLocation(); 
+    
+    // begin the main loop
     while(true) {
         // sleep for a bit
         checkForExit();
         wait(DEFAULT_MAIN_LOOP_WAIT);
         
         // announce our position
-        this->m_latitude = DEFAULT_LATITUDE;
-        this->m_longitude = DEFAULT_LONGITUDE;
-        this->display("Location: Latitude:%2.4f Longitude:%2.4f",this->m_latitude,this->m_longitude);
-        this->display_lcd("Location Coordinates\r\nLatitude: %2.4f\r\nLongitude: %2.4f",this->m_latitude,this->m_longitude);
+        this->updateCoordinates();
                 
         // check and react to the joystick button press
         if (joystick_pressed) {

--- a/Thermostat.h	Thu Oct 17 18:58:54 2013 +0000
+++ b/Thermostat.h	Thu Oct 17 20:25:14 2013 +0000
@@ -85,6 +85,10 @@
         void display(const char *format, ...);
         void display_lcd(const char *format, ...);
         
+        // Stubs
+        void updateCoordinates();
+        void initLocation();
+        
         // private members
         float  m_latitude;
         float  m_longitude;