MBED_DEMOS / Mbed 2 deprecated mbed_mqtt_endpoint_ublox_ethernet

Dependencies:   C027 C12832 EthernetInterface StatusReporter LM75B MQTT-ansond endpoint_core endpoint_mqtt mbed-rtos mbed

Files at this revision

API Documentation at this revision

Comitter:
ansond
Date:
Thu Mar 20 02:24:57 2014 +0000
Parent:
150:40e8745c0ee4
Child:
152:e031802d24ad
Commit message:
updates

Changed in this revision

Definitions.h Show annotated file Show diff for this revision Revisions of this file
EmulatedResourceFactory.cpp Show annotated file Show diff for this revision Revisions of this file
MBEDEndpoint.cpp Show annotated file Show diff for this revision Revisions of this file
endpoint_core.lib Show annotated file Show diff for this revision Revisions of this file
--- a/Definitions.h	Thu Mar 20 01:47:12 2014 +0000
+++ b/Definitions.h	Thu Mar 20 02:24:57 2014 +0000
@@ -59,6 +59,11 @@
 #define PL_ENABLE                   false                           // true - enable for endpoint light, false - disable
 #define PL_LIGHT_ID                 PL_LIGHT_ID_BILL                // Default light for Philips Light
 
+// unless we are using Philips lighting, disable the network mutex
+#ifndef PL_ENABLE
+#undef NETWORK_MUTEX
+#endif
+
 // External LED Light Configuration
 #define EXT_LED_ENABLE              true                            // true - enable external LED endpoint light, false - disable
 #define EXT_LED_PIN                 p21                             // pin to use for external LED cathode 
--- a/EmulatedResourceFactory.cpp	Thu Mar 20 01:47:12 2014 +0000
+++ b/EmulatedResourceFactory.cpp	Thu Mar 20 02:24:57 2014 +0000
@@ -68,7 +68,6 @@
      memset(this->m_gps_coords,0,PREFERENCE_VALUE_LEN+1);
      MBEDEndpoint *endpoint = (MBEDEndpoint *)this->m_endpoint;
      endpoint->preferences()->getPreference("coords",this->m_gps_coords,PREFERENCE_VALUE_LEN,ENDPOINT_GPS_COORDS);
-     for(int i=0;i<strlen(this->m_gps_coords);++i) if (this->m_gps_coords[i] == ',') this->m_gps_coords[i] = ' ';
  }
  
  // get our GPS coords from preferences
--- a/MBEDEndpoint.cpp	Thu Mar 20 01:47:12 2014 +0000
+++ b/MBEDEndpoint.cpp	Thu Mar 20 02:24:57 2014 +0000
@@ -81,7 +81,7 @@
  MBEDToIOCResourceMap *MBEDEndpoint::getMap() { return this->m_map; }
  
  // initialize our preferences
- void MBEDEndpoint::initPreferences() { if (this->m_preferences == NULL) this->m_preferences = new Preferences(this->logger()); }
+ void MBEDEndpoint::initPreferences() { if (this->m_preferences == NULL) this->m_preferences = new Preferences(this->logger()); if (this->m_preferences != NULL) this->m_preferences->fixCoordsForIOC(); }
 
  // get our preferences
  Preferences *MBEDEndpoint::preferences() { return this->m_preferences; }
--- a/endpoint_core.lib	Thu Mar 20 01:47:12 2014 +0000
+++ b/endpoint_core.lib	Thu Mar 20 02:24:57 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/ansond/code/endpoint_core/#c620eb98af8b
+http://mbed.org/users/ansond/code/endpoint_core/#edf33bd41e4f