Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: C027 C12832 EthernetInterface StatusReporter LM75B MQTT-ansond endpoint_core endpoint_mqtt mbed-rtos mbed
Revision 42:46cc1641800b, committed 2014-03-01
- Comitter:
- ansond
- Date:
- Sat Mar 01 08:21:20 2014 +0000
- Parent:
- 41:36c59c3cd6f2
- Child:
- 43:904196b59496
- Commit message:
- updates
Changed in this revision
--- a/Definitions.h Sat Mar 01 07:43:17 2014 +0000 +++ b/Definitions.h Sat Mar 01 08:21:20 2014 +0000 @@ -63,8 +63,8 @@ #define IOC_RESPONSE_FAILED "FAILED" // TEMP - until we get HTTPS with BasicAuth working in MBED... -#define GW_IPADDRESS "192.168.1.191" // work -//#define GW_IPADDRESS "10.1.0.27" // home +//#define GW_IPADDRESS "192.168.1.191" // work +#define GW_IPADDRESS "10.1.0.27" // home #define GW_REDIRECT_URL "http://%s:8888/NSP-IOC-Gateway/IOCRestAPI" #define USE_GW_HTTP_REDIRECTOR true // true - make http calls to IOC via GW, false - make http calls directly to IOC
--- a/EmulatedResourceFactory.cpp Sat Mar 01 07:43:17 2014 +0000
+++ b/EmulatedResourceFactory.cpp Sat Mar 01 08:21:20 2014 +0000
@@ -84,7 +84,7 @@
}
void EmulatedResourceFactory::createResource(char *name,char *value) { ResourceFactory::createResource(name,value); }
- void EmulatedResourceFactory::createResource(char *endpoint_name,char *name,char *value,void *cb) { ResourceFactory::createResource(endpoint_name,name,value,cb); }
+ void EmulatedResourceFactory::createResource(char *ep_name,char *name,char *value,void *cb) { ResourceFactory::createResource(ep_name,name,value,cb); }
void EmulatedResourceFactory::createResource(char *name,char *value,void *io,void *notused) {
MBEDEndpoint *endpoint = (MBEDEndpoint *)this->m_endpoint;
char *ep_name = NULL; if (endpoint != NULL) ep_name = endpoint->getEndpointName();
@@ -97,7 +97,7 @@
}
// set a resource value (AND trigger the Emulated actions if registered)
- bool EmulatedResourceFactory::setResourceValue3(char *name, char *value) {
+ bool EmulatedResourceFactory::setResourceValue(char *name, char *value) {
// set the resource value
bool success = ResourceFactory::setResourceValue(name,value);
if (success) {
--- a/EmulatedResourceFactory.h Sat Mar 01 07:43:17 2014 +0000
+++ b/EmulatedResourceFactory.h Sat Mar 01 08:21:20 2014 +0000
@@ -38,11 +38,11 @@
virtual void createResources(char *endpoint_name);
- bool setResourceValue3(char *name, char *value);
+ bool setResourceValue(char *name, char *value);
protected:
+ virtual void createResource(char *endpoint_name,char *name,char *value,void *cb);
virtual void createResource(char *name,char *value);
- virtual void createResource(char *endpoint_name,char *name,char *value,void *cb);
void createResource(char *name,char *value,void *io,void *notused);
};
--- a/endpoint_core.lib Sat Mar 01 07:43:17 2014 +0000 +++ b/endpoint_core.lib Sat Mar 01 08:21:20 2014 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/ansond/code/endpoint_core/#ff05e71c4cb5 +http://mbed.org/users/ansond/code/endpoint_core/#361a61395588