Skip to content

this change to mercury.c address following error and warnings: #148

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

Open
lefty01 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

this change to mercury.c address following error and warnings: #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
620dd4c
this change to mercury.c address following error and warnings:
Mar 11, 2024
afa8013
on one platform still got warning, so need to cast
Mar 11, 2024
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
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
APIZIP ?= mercuryapi-AHAB-1.35.2.72-1.zip
APIVER ?= 1.35.2.72
APIZIP ?= mercuryapi-BILBO-1.37.2.24.zip
APIVER ?= 1.37.2.24

PYTHON ?= $(shell { command -v python3 || command -v python; } 2>/dev/null)

.PHONY: all mercuryapi install
Expand All @@ -25,4 +26,4 @@ mercuryapi-$(APIVER)/.done: $(APIZIP)
touch mercuryapi-$(APIVER)/.done

$(APIZIP):
curl https://www.jadaktech.com/wp-content/uploads/2022/08/$(APIZIP) -o $(APIZIP)
@echo "you need to download from: https://www.jadaktech.com/documents-downloads/thingmagic-mercury-api-1-37-2/?download (require register step)"
48 changes: 11 additions & 37 deletions mercury.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ typedef struct {
TMR_GEN2_Select_action action;
} Actions;

enum
{
NO_ACTION = 0xFF
};

static Actions Reader_actions[] = {
{"on&off", ON_N_OFF},
{"on&nop", ON_N_NOP},
Expand All @@ -314,15 +319,15 @@ static Actions Reader_actions[] = {
{"off&nop", OFF_N_NOP},
{"nop&on", NOP_N_ON},
{"nop&neg", NOP_N_NEG},
{NULL, -1}
{NULL, NO_ACTION}
};

static TMR_GEN2_Select_action str2action(const char *name)
{
Actions *act;

if (name == NULL)
return -1;
return NO_ACTION;

for(act = Reader_actions; act->name != NULL; act++)
{
Expand All @@ -331,7 +336,7 @@ static TMR_GEN2_Select_action str2action(const char *name)
}

PyErr_SetString(PyExc_TypeError, "invalid action");
return -1;
return NO_ACTION;
}

static int
Expand Down Expand Up @@ -439,7 +444,7 @@ parse_gen2filter(TMR_TagFilter *tag_filter, PyObject *arg, TMR_GEN2_Select_actio
{
if (obj == Py_None)
tag_filter->u.gen2Select.action = defaction;
else if ((tag_filter->u.gen2Select.action = str2action(object2str(obj))) == -1)
else if ((tag_filter->u.gen2Select.action = str2action(object2str(obj))) == (TMR_GEN2_Select_action)NO_ACTION)
return 0;
}
else
Expand Down Expand Up @@ -988,35 +993,6 @@ Reader_read_tag_mem(Reader *self, PyObject *args, PyObject *kwds)
return result;
}

static PyObject *
Reader_write_tag_mem(Reader *self, PyObject *args, PyObject *kwds)
{
TMR_Status ret;
PyObject *epc_target = NULL;
uint32_t bank, address;
PyObject *data;
TMR_TagFilter *tag_filter = NULL;

static char *kwlist[] = {"bank", "address", "data", "epc_target", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "IIO!|O", kwlist, &bank, &address, &PyByteArray_Type, &data, &epc_target))
return NULL;

if(!parse_multifilter(&tag_filter, epc_target))
return NULL;

ret = TMR_writeTagMemBytes(&self->reader, tag_filter, bank, address, PyByteArray_Size(data), (uint8_t *)PyByteArray_AsString(data));
reset_filter(&tag_filter);
if (ret == TMR_ERROR_NO_TAGS_FOUND)
Py_RETURN_FALSE;
else if (ret != TMR_SUCCESS)
{
PyErr_SetString(PyExc_RuntimeError, TMR_strerr(&self->reader, ret));
return NULL;
}
else
Py_RETURN_TRUE;
}

static PyObject *
Reader_gpi_get(Reader *self, PyObject *args)
{
Expand Down Expand Up @@ -1879,9 +1855,6 @@ static PyMethodDef Reader_methods[] = {
{"read_tag_mem", (PyCFunction)Reader_read_tag_mem, METH_VARARGS | METH_KEYWORDS,
"Read bytes from the memory bank of a tag"
},
{"write_tag_mem", (PyCFunction)Reader_write_tag_mem, METH_VARARGS | METH_KEYWORDS,
"Write bytes to the memory bank of a tag"
},
{"gpi_get", (PyCFunction)Reader_gpi_get, METH_VARARGS,
"Gets GPIO pin value"
},
Expand Down Expand Up @@ -2360,8 +2333,9 @@ initmercury(void)
{
#endif
PyObject* m;
#if PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION <= 9)
PyEval_InitThreads();

#endif
if (PyType_Ready(&ReaderType) < 0
|| PyType_Ready(&TagDataType) < 0
|| PyType_Ready(&TagReadDataType) < 0
Expand Down