summaryrefslogtreecommitdiff
path: root/FantomModule/FantomModule.h
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-03-03 08:14:22 +0800
committerTat-Chee Wan (USM)2011-03-03 08:14:22 +0800
commit6a5e828fbc95843d065fdd53c0dc4076afccc56e (patch)
treee0aa87adeb12adb58e1b3c845153eeccddb1652a /FantomModule/FantomModule.h
parent39058288d8ab2ed1486cefdc8547d25c3d723a8c (diff)
changed cpp object method call parameters to specific c types
Isolate Python to C/C++ conversion code to extern C routines. Only the static methods deal with Python Objects to reduce list processing inefficiencies.
Diffstat (limited to 'FantomModule/FantomModule.h')
-rw-r--r--FantomModule/FantomModule.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/FantomModule/FantomModule.h b/FantomModule/FantomModule.h
index ff3a1de..e2d99cb 100644
--- a/FantomModule/FantomModule.h
+++ b/FantomModule/FantomModule.h
@@ -19,6 +19,7 @@
#define FANTOM_USB "USB"
#define FANTOM_BT_TIMEOUTSEC 5
#define FANTOM_NXTNAME_LEN 256
+#define FANTOM_PASSKEY_LEN 256
#define FANTOM_DATA_BUFLEN 256
#define FANTOM_NXT_PASSKEY "1234"
@@ -28,7 +29,7 @@
extern "C" PyMODINIT_FUNC initfantom(void);
extern "C" PyObject *fantom_finddevices(PyObject *py_self, PyObject *py_args); // BT Discovery function
-extern "C" PyObject *fantom_find_bricks(PyObject *py_self, PyObject *py_args); // BT & USB function
+extern "C" PyObject *fantom_find_bricks(PyObject *py_self, PyObject *py_args); // USB function
extern "C" PyObject *fantom_socket(PyObject *py_self, PyObject *py_args);
extern "C" PyObject *fantom_connect(PyObject *py_self, PyObject *py_args);
extern "C" PyObject *fantom_send(PyObject *py_self, PyObject *py_args);
@@ -38,16 +39,19 @@ extern "C" PyObject *fantom_close(PyObject *py_self, PyObject *py_args);
class FantomModule
{
nFANTOM100::iNXT* nxtPtr;
+ nFANTOM100::tStatus status;
+ ViBoolean useBT;
+ ViChar passkey[FANTOM_PASSKEY_LEN];
ViChar pairedResourceName[FANTOM_NXTNAME_LEN];
public:
static PyObject *finddevices(PyObject *py_self, PyObject *py_args);
static PyObject *find_bricks(PyObject *py_self, PyObject *py_args);
- PyObject *socket(PyObject *py_self, PyObject *py_args);
- PyObject *connect(PyObject *py_self, PyObject *py_args);
- PyObject *send(PyObject *py_self, PyObject *py_args);
- PyObject *recv(PyObject *py_self, PyObject *py_args);
- PyObject *close(PyObject *py_self, PyObject *py_args);
+ ViBoolean socket(ViBoolean enableBT, ViConstString BTkey);
+ ViBoolean connect(ViConstString resourceName);
+ ViUInt32 send(const ViByte *bufferPtr, ViUInt32 numberOfBytes);
+ ViUInt32 recv(ViByte *bufferPtr, ViUInt32 numberOfBytes);
+ ViBoolean close();
~FantomModule();
void HelloWorld(const char *);
};