Implemented the functions in the wrapper TellUsbD101.

driver/TellUsbD101/TellUsbD101.cpp

@@ -2,55 +2,58 @@
 
 #include "TellUsbD101.h"
 #include "../libtelldus-core/telldus-core.h"
+#include <stdio.h>
+#include <windows.h>
+#include <string>
+#include <sstream> 
+
 
 int __stdcall devGetNumberOfDevices(void){
-	int intReturn = -1;
+	return tdGetNumberOfDevices();
-	return intReturn;
 }
 
 int __stdcall devGetDeviceId(int intDeviceIndex){
-	int intReturn = -1;
+	return tdGetDeviceId(intDeviceIndex);
-	return intReturn;
 }
 
 char * __stdcall devGetName(int intDeviceId){
-	char* strReturn;
+	return tdGetName(intDeviceId);
-	return strReturn;
 }
 
 char* __stdcall devGetVendor(int intDeviceId){
-	char* strReturn = "";
+	return tdGetVendor(intDeviceId);
-	return strReturn;
 }
 
 char* __stdcall devGetModel(int intDeviceId){
-	char* strReturn = "";
+	int intModel = tdGetModel(intDeviceId);
-	return strReturn;
+
+	std::ostringstream ss;
+	std::string str;
+	ss << intModel;
+	str = ss.str();
+	char *strModel = (char *)SysAllocStringByteLen (str.c_str(), str.length());
+	return strModel;
 }
 
 int __stdcall devGetNumberOfArguments(int intDeviceId){
-	int intReturn = 0;
+	return 0;
-	return intReturn;
 }
 
 int __stdcall devGetArgument(int intDeviceId, int intArgumentIndex){
-	int intReturn;
+	return 0;
-	return intReturn;
 }
 
 bool __stdcall devSetName(int intDeviceId, char* strNewName){
-	bool blnSuccess = false;
+	return tdSetName(intDeviceId, strNewName);
-	return blnSuccess;
 }
 
 bool __stdcall devSetVendor(int intDeviceId, char* strVendor){
-	bool blnSuccess = false;
+	return tdSetVendor(intDeviceId, strVendor);
-	return blnSuccess;
 }
 
 bool __stdcall devSetModel(int intDeviceId, char* strNewModel){
-	bool blnSuccess = false;
+	int intModel = atoi(strNewModel);
-	return blnSuccess;
+	return tdSetModel(intDeviceId, intModel);
 }
 
 bool __stdcall devSetArguments(int intDeviceId, char* strArguments){
@@ -58,32 +61,29 @@ bool __stdcall devSetArguments(int intDeviceId, char* strArguments){
 }
 
 int __stdcall devAddDevice(){
-	int intNewDeviceId = -1;
+	return tdAddDevice();
-	return intNewDeviceId;
 }
 
 bool __stdcall devRemoveDevice(int intDeviceId){
-	bool blnSuccess = false;
+	return tdRemoveDevice(intDeviceId);
-	return blnSuccess;
 }
 
 int __stdcall devMethods(int id){
-	int intMethods = 0;
+	return tdMethods(id);
-	return intMethods;
 }
 
 bool  __stdcall devTurnOn(int intDeviceId){
-	return false;
+	return (tdTurnOn(intDeviceId) == TELLSTICK_SUCCESS ? true : false);
 }
 
 bool  __stdcall devTurnOff(int intDeviceId){
-	return false;
+	return (tdTurnOff(intDeviceId) == TELLSTICK_SUCCESS ? true : false);
 }
 
 bool __stdcall devBell(int intDeviceId){
-	return false;
+	return (tdBell(intDeviceId) == TELLSTICK_SUCCESS ? true : false);
 }
 
 bool __stdcall devDim(int intDeviceId, unsigned char level){
-	return false;
+	return (tdDim(intDeviceId, level) == TELLSTICK_SUCCESS ? true : false);
 }

driver/TellUsbD101/TellUsbD101.h

@@ -42,40 +42,4 @@ extern "C" {
 	TELLUSBD101_API int WINAPI devMethods(int id);
 }
 
-#define TELLSTICK_TURNON	1
-#define TELLSTICK_TURNOFF	2
-#define TELLSTICK_BELL		4
-#define TELLSTICK_TOGGLE	8
-#define TELLSTICK_DIM		16
-
-//Protocol Nexa
-#define TELLSTICK_DEVICE_YCR3500	"1"
-#define TELLSTICK_DEVICE_YCR300D	"2"
-#define TELLSTICK_DEVICE_WSR1000	"3"
-#define TELLSTICK_DEVICE_CMR1000	"4"
-#define TELLSTICK_DEVICE_CMR300		"5"
-#define TELLSTICK_DEVICE_PA33300	"6"
-#define TELLSTICK_DEVICE_EL2000		"8"
-#define TELLSTICK_DEVICE_EL2005		"9"
-#define TELLSTICK_DEVICE_EL2006		"10"
-#define TELLSTICK_DEVICE_SYCR3500	"12"
-#define TELLSTICK_DEVICE_SYCR300	"13"
-#define TELLSTICK_DEVICE_HDR105		"14"
-#define TELLSTICK_DEVICE_ML7100		"15"
-#define TELLSTICK_DEVICE_EL2004		"16"
-#define TELLSTICK_DEVICE_EL2016		"17"
-#define TELLSTICK_DEVICE_EL2010		"18"
-#define TELLSTICK_DEVICE_LYCR1000	"20"
-#define TELLSTICK_DEVICE_LYCR300	"21"
-#define TELLSTICK_DEVICE_LCMR1000	"22"
-#define TELLSTICK_DEVICE_LCMR300	"23"
-#define TELLSTICK_DEVICE_EL2023		"24"
-#define TELLSTICK_DEVICE_EL2024		"25"
-#define TELLSTICK_DEVICE_EL2021		"26"
-#define TELLSTICK_DEVICE_EL2017		"27"
-#define TELLSTICK_DEVICE_EL2019		"28"
-
-//Protocol Ikea
-#define TELLSTICK_DEVICE_KOPPLA		"19"
-
 #endif

driver/TellUsbD101/TellUsbD101.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8,00"
 	Name="TellUsbD101"
-	ProjectGUID="{2A868E40-88D9-4800-A83F-21D0F8DCB611}"
+	ProjectGUID="{F2BD0723-1E66-4191-AF6D-DEDD9605B028}"
 	RootNamespace="TellUsbD101"
 	Keyword="Win32Proj"
 	>
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TELLTEST3_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TellUsbD101_EXPORTS"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -61,8 +61,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="oleaut32.lib"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(SolutionDir)\tellTest3\tellTest3.def"
+				ModuleDefinitionFile="$(SolutionDir)\TellUsbD101\TellUsbD101.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"