Added ics.enable_network_com() method.

Signed-off-by: David Rebbe <drebbe@intrepidcs.com>

# Conflicts:
#	include/methods.h

Author: drebbe-intrepid

include/methods.h

@@ -79,6 +79,7 @@ PyObject* meth_set_fd_bit_rate(PyObject* self, PyObject* args);
 PyObject* meth_set_bit_rate_ex(PyObject* self, PyObject* args);
 PyObject* meth_get_timestamp_for_msg(PyObject* self, PyObject* args);
 PyObject* meth_get_device_status(PyObject* self, PyObject* args);
+PyObject* meth_enable_network_com(PyObject* self, PyObject* args);
 
 #ifdef _cplusplus
 }
@@ -1190,6 +1191,30 @@ PyObject* meth_get_device_status(PyObject* self, PyObject* args);
     "\t>>> status.fire2Status.ethernetActivationLineEnabled\n" \
     "\t0\n" \
 
+#define _DOC_ENABLE_NETWORK_COM \
+    MODULE_NAME".enable_network_com(device, enable, net_id)\n" \
+    "\n" \
+    "Enable or disable network communication.\n" \
+    "\n" \
+    "Args:\n" \
+    "\tdevice (:class:`"MODULE_NAME"."NEO_DEVICE_OBJECT_NAME"`): :class:`"MODULE_NAME"."NEO_DEVICE_OBJECT_NAME"`\n\n" \
+    "\n" \
+    "\tenable (:class:`bool`): :class:`bool`\n\n" \
+    "\n" \
+    "\tnet_id (:class:`int`): :class:`int`: Optional. If left blank, disables/enables all networks.\n\n" \
+    "\n" \
+    "Raises:\n" \
+    "\t:class:`"MODULE_NAME".RuntimeError`\n" \
+    "\n" \
+    "Returns:\n" \
+    "\tNone.\n" \
+    "\n" \
+    "\t>>> import ics\n" \
+    "\t>>> d = ics.open_device()\n" \
+    "\t>>> status = ics.enable_network_com(d, True)\n" \
+    "\t>>> \n"
+
+
 static PyMethodDef IcsMethods[] = {
     _EZ_ICS_STRUCT_METHOD("find_devices", "FindNeoDevices", (PyCFunction)meth_find_devices, METH_VARARGS | METH_KEYWORDS, _DOC_FIND_DEVICES),
     _EZ_ICS_STRUCT_METHOD("open_device", "OpenNeoDevice", (PyCFunction)meth_open_device, METH_VARARGS | METH_KEYWORDS, _DOC_OPEN_DEVICES),
@@ -1258,6 +1283,7 @@ static PyMethodDef IcsMethods[] = {
     _EZ_ICS_STRUCT_METHOD("get_timestamp_for_msg", "icsneoGetTimeStampForMsg", meth_get_timestamp_for_msg, METH_VARARGS, _DOC_GET_TIMESTAMP_FOR_MSG),
     _EZ_ICS_STRUCT_METHOD("get_device_status", "icsneoGetDeviceStatus", meth_get_device_status, METH_VARARGS, _DOC_GET_DEVICE_STATUS),
 
+    _EZ_ICS_STRUCT_METHOD("enable_network_com", "icsneoEnableNetworkCom", meth_enable_network_com, METH_VARARGS, _DOC_ENABLE_NETWORK_COM),
     {"override_library_name", (PyCFunction)meth_override_library_name, METH_VARARGS, _DOC_OVERRIDE_LIBRARY_NAME},
     {"get_library_path", (PyCFunction)meth_get_library_path, METH_NOARGS, ""},
 

src/methods.cpp

@@ -4040,6 +4040,51 @@ PyObject* meth_get_device_status(PyObject* self, PyObject* args)
     return set_ics_exception(exception_runtime_error(), "This is a bug!");
 }
 
+PyObject* meth_enable_network_com(PyObject* self, PyObject* args)
+{
+    PyObject* obj = NULL;
+    bool enable = true; 
+    long net_id = -1;
+    if (!PyArg_ParseTuple(args, arg_parse("O|bk:", __FUNCTION__), &obj, &enable, &net_id)) {
+        return NULL;
+    }
+    if (!PyNeoDevice_CheckExact(obj)) {
+        return set_ics_exception(exception_runtime_error(), "Argument must be of type " MODULE_NAME "." NEO_DEVICE_OBJECT_NAME);
+    }
+    ICS_HANDLE handle = PyNeoDevice_GetHandle(obj);
+    try
+    {
+        ice::Library* lib = dll_get_library();
+        if (!lib) {
+            char buffer[512];
+            return set_ics_exception(exception_runtime_error(), dll_get_error(buffer));
+        }
+        // int _stdcall icsneoEnableNetworkCom(void* hObject, int iEnable)
+        // int _stdcall icsneoEnableNetworkComEx(void* hObject, int iEnable, int iNetId)
+        ice::Function<int __stdcall (ICS_HANDLE, int)> icsneoEnableNetworkCom(lib, "icsneoEnableNetworkCom");
+        ice::Function<int __stdcall (ICS_HANDLE, int, int)> icsneoEnableNetworkComEx(lib, "icsneoEnableNetworkComEx");
+        Py_BEGIN_ALLOW_THREADS
+        if (net_id == -1) {
+            if (!icsneoEnableNetworkCom(handle, enable)) {
+                Py_BLOCK_THREADS
+                return set_ics_exception(exception_runtime_error(), "icsneoEnableNetworkCom() Failed");
+            }
+        } else {
+            if (!icsneoEnableNetworkComEx(handle, enable, net_id)) {
+                Py_BLOCK_THREADS
+                return set_ics_exception(exception_runtime_error(), "icsneoEnableNetworkComEx() Failed");
+            }
+        }
+        Py_END_ALLOW_THREADS
+        Py_RETURN_NONE;
+    }
+    catch (ice::Exception& ex)
+    {
+        return set_ics_exception(exception_runtime_error(), (char*)ex.what());
+    }
+    return set_ics_exception(exception_runtime_error(), "This is a bug!");
+}
+
 PyObject* meth_override_library_name(PyObject* self, PyObject* args)
 {
     const char* name = NULL;