jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'misc-fixes'

Browse source
This commit is contained in:
Micke Prag 2012-03-30 16:29:59 +02:00
commit c77fd899a1
7 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/01-telldus-core.dox
View file

@ -44,7 +44,7 @@
* \code
* int intNumberOfDevices = tdGetNumberOfDevices();
* for (int i = 0; i < intNumberOfDevices; i++) {
* int id = tdGetDeviceId( index );
* int id = tdGetDeviceId( i );
* char *name = tdGetName( id );
* printf("%d\t%s\n", id, name);
* tdReleaseString(name);

10
examples/python/callbacks.py
View file

@ -58,11 +58,11 @@ def rawcallbackfunction(data, controllerId, callbackId, context):
print string_at(data)
if (platform.system() == 'Windows'):
CMPFUNC = WINFUNCTYPE(c_void_p, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p) #first is return type
CMPFUNCRAW = WINFUNCTYPE(c_void_p, POINTER(c_ubyte), c_int, c_int, c_void_p)
CMPFUNC = WINFUNCTYPE(None, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p) #first is return type
CMPFUNCRAW = WINFUNCTYPE(None, POINTER(c_ubyte), c_int, c_int, c_void_p)
else:
CMPFUNC = CFUNCTYPE(c_void_p, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p)
CMPFUNCRAW = CFUNCTYPE(c_void_p, POINTER(c_ubyte), c_int, c_int, c_void_p)
CMPFUNC = CFUNCTYPE(None, c_int, c_int, POINTER(c_ubyte), c_int, c_void_p)
CMPFUNCRAW = CFUNCTYPE(None, POINTER(c_ubyte), c_int, c_int, c_void_p)
cmp_func = CMPFUNC(callbackfunction)
cmp_funcraw = CMPFUNCRAW(rawcallbackfunction)
@ -73,4 +73,4 @@ lib.tdRegisterDeviceEvent(cmp_func, 0)
print "Waiting for events..."
while(1):
time.sleep(0.5) #don't exit
time.sleep(0.5) #don't exit

4
examples/python/sensors/sensorscallback.py
View file

@ -29,9 +29,9 @@ def callbackfunction(protocol, model, id, dataType, value, timestamp, callbackId
if (platform.system() == 'Windows'):
CMPFUNC = WINFUNCTYPE(c_void_p, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p) #first is return type
CMPFUNC = WINFUNCTYPE(None, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p) #first is return type
else:
CMPFUNC = CFUNCTYPE(c_void_p, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p)
CMPFUNC = CFUNCTYPE(None, POINTER(c_ubyte), POINTER(c_ubyte), c_int, c_int, POINTER(c_ubyte), c_int, c_int, c_void_p)
cmp_func = CMPFUNC(callbackfunction)

4
telldus-core/client/telldus-core.cpp
View file

@ -332,7 +332,7 @@ void WINAPI tdInit(void) {
* @since Version 2.0.0
**/
int WINAPI tdRegisterDeviceEvent( TDDeviceEvent eventFunction, void *context ) {
eventFunction; Client *client = Client::getInstance();
Client *client = Client::getInstance();
return client->registerEvent( CallbackStruct::DeviceEvent, (void *)eventFunction, context );
}
@ -1013,7 +1013,7 @@ char * WINAPI tdGetErrorString(int intErrorNo) {
"Received an unknown response",
"Syntax error",
"Broken pipe"
"An error occured while communicating with the Telldus Service"
"An error occurred while communicating with the Telldus Service"
};
std::string strReturn;
intErrorNo = abs(intErrorNo); //We don't use negative values here.

2
telldus-core/common/Strings.cpp
View file

@ -39,7 +39,7 @@ std::wstring TelldusCore::charToWstring(const char *value) {
size_t outbytesLeft = utf8Length*sizeof(wchar_t);
//Copy the instring
char *inString = new char[strlen(value)+1];
char *inString = new char[utf8Length+1];
strcpy(inString, value);
//Create buffer for output

5
telldus-core/service/ControllerManager.cpp
View file

@ -199,9 +199,10 @@ void ControllerManager::loadStoredControllers() {
int id = d->settings.getNodeId(Settings::Controller, i);
d->controllers[id].controller = NULL;
d->controllers[id].name = d->settings.getName(Settings::Controller, id);
d->controllers[id].type = d->settings.getControllerType(id);
const int type = d->settings.getControllerType(id);
d->controllers[id].type = type;
d->controllers[id].serial = d->settings.getControllerSerial(id);
signalControllerEvent(id, TELLSTICK_DEVICE_ADDED, 0, L"");
signalControllerEvent(id, TELLSTICK_DEVICE_ADDED, type, L"");
}
}

3
telldus-core/tdadmin/main.cpp
View file

@ -47,6 +47,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
argp_usage (state);
case ARGP_KEY_ARG:
if (state->next == state->argc) {
argp_usage (state);
}
command = arg;
action = state->argv[state->next];
state->next = state->argc;