Skip to content

add get_firmware_variant() #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drebbe-intrepid merged 1 commit into from
Nov 26, 2025
Merged

add get_firmware_variant() #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions include/methods.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,11 @@ extern "C"
PyObject* meth_flash_accessory_firmware(PyObject* self, PyObject* args);
PyObject* meth_get_accessory_firmware_version(PyObject* self, PyObject* args);
PyObject* meth_set_safe_boot_mode(PyObject* self, PyObject* args);
PyObject* meth_get_device_name(PyObject* self, PyObject* args); // icsneoGetDeviceName
PyObject* meth_get_imei(PyObject* self, PyObject* args); // icsneoGetIMEI
PyObject* meth_get_component_versions(PyObject* self, PyObject* args); // icsneoGetComponentVersions
PyObject* meth_get_device_name(PyObject* self, PyObject* args); // icsneoGetDeviceName
PyObject* meth_get_imei(PyObject* self, PyObject* args); // icsneoGetIMEI
PyObject* meth_get_component_versions(PyObject* self, PyObject* args); // icsneoGetComponentVersions
PyObject* meth_request_set_neovi_miscio(PyObject* self, PyObject* args); // icsneoRequestSetNeoVIMiscIO
PyObject* meth_get_firmware_variant(PyObject* self, PyObject* args); // icsneoGetFirmwareVariant

#ifdef _cplusplus
}
Expand Down Expand Up @@ -2003,6 +2004,21 @@ extern "C"
"\tNone\n" \
"\n"

#define _DOC_GET_FIRMWARE_VARIANT \
MODULE_NAME ".get_firmware_variant(device) -> Int\n" \
"\n" \
"Gets firmware variant of the device.\n" \
"\n" \
"Args:\n" \
"\tdevice (:class:`" MODULE_NAME ".PyNeoDeviceEx`): :class:`" MODULE_NAME ".PyNeoDeviceEx`\n\n" \
"\n" \
"Raises:\n" \
"\t:class:`" MODULE_NAME ".RuntimeError`\n" \
"\n" \
"Returns:\n" \
"\t(:class:`int`): :class:`int`: variant\n" \
"\n"

extern PyMethodDef IcsMethods[];

#endif // _METHODS_H_
4 changes: 4 additions & 0 deletions src/ics/py_neo_device_ex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,3 +506,7 @@ def get_component_versions(self, *args, **kwargs):
def request_set_neovi_miscio(self, *args, **kwargs):
"see ics.request_set_neovi_miscio for details on arguments."
return ics.request_set_neovi_miscio(self, *args, **kwargs)

def get_firmware_variant(self, *args, **kwargs):
"see ics.get_firmware_variant for details on arguments."
return ics.get_firmware_variant(self, *args, **kwargs)
45 changes: 43 additions & 2 deletions src/methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,12 @@ PyMethodDef IcsMethods[] = {
meth_request_set_neovi_miscio,
METH_VARARGS,
_DOC_REQUEST_SET_NEOVI_MISCIO),
_EZ_ICS_STRUCT_METHOD("get_firmware_variant",
"icsneoGetFirmwareVariant",
"GetFirmwareVariant",
meth_get_firmware_variant,
METH_VARARGS,
_DOC_GET_FIRMWARE_VARIANT),

{ "override_library_name", (PyCFunction)meth_override_library_name, METH_VARARGS, _DOC_OVERRIDE_LIBRARY_NAME },
{ "get_library_path", (PyCFunction)meth_get_library_path, METH_NOARGS, "" },
Expand Down Expand Up @@ -5029,8 +5035,8 @@ PyObject* meth_uart_read(PyObject* self, PyObject* args)
size_t bytesActuallyRead = 0;
// int _stdcall icsneoUartRead(void* hObject, const EUartPort_t uart, void* bData, const size_t bytesToRead,
// size_t* bytesActuallyRead, uint8_t* flags)
ice::Function<int __stdcall(void*, const EUartPort_t, void*, const size_t, size_t*, uint8_t*)>
icsneoUartRead(lib, "icsneoUartRead");
ice::Function<int __stdcall(void*, const EUartPort_t, void*, const size_t, size_t*, uint8_t*)> icsneoUartRead(
lib, "icsneoUartRead");
auto gil = PyAllowThreads();
if (!icsneoUartRead(handle, port, buffer, bytesToRead, &bytesActuallyRead, &flags)) {
gil.restore();
Expand Down Expand Up @@ -5611,3 +5617,38 @@ PyObject* meth_request_set_neovi_miscio(PyObject* self, PyObject* args) // icsne
return set_ics_exception(exception_runtime_error(), (char*)ex.what());
}
}

PyObject* meth_get_firmware_variant(PyObject* self, PyObject* args) // icsneoGetFirmwareVariant
{
(void)self;
PyObject* obj = NULL;
if (!PyArg_ParseTuple(args, arg_parse("O:", __FUNCTION__), &obj)) {
return NULL;
}
if (!PyNeoDeviceEx_CheckExact(obj)) {
return set_ics_exception(exception_runtime_error(), "Argument must be of type " MODULE_NAME ".PyNeoDeviceEx");
}
void* handle = NULL;
if (!PyNeoDeviceEx_GetHandle(obj, &handle)) {
return NULL;
}
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 icsneoGetFirmwareVariant(void* hObject, uint32_t* variant)
ice::Function<int __stdcall(void*, uint32_t*)> icsneoGetFirmwareVariant(lib, "icsneoGetFirmwareVariant");
auto gil = PyAllowThreads();
uint32_t variant = 0;
if (!icsneoGetFirmwareVariant(handle, &variant)) {
gil.restore();
return set_ics_exception(exception_runtime_error(), "icsneoGetFirmwareVariant() Failed");
}
gil.restore();
return Py_BuildValue("I", variant);
} catch (ice::Exception& ex) {
return set_ics_exception(exception_runtime_error(), (char*)ex.what());
}
}
Loading