summaryrefslogtreecommitdiffstats
path: root/glucometerutils (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update fsprecisionneo.pyONO,Tetsuo2021-09-181-2/+2
| | | Fixed syntax (missing space)
* Update fsprecisionneo.pyONO,Tetsuo2021-09-181-0/+2
| | | Sometimes I gets "LO" record (lower-than 30 ) on using Precision Neo .
* glucomenareo: new driver added.Diego Elio Pettenò2021-03-271-0/+222
| | | | | | | This driver supports GlucoMen areo by A. Menarini Diagnostics. It possibly works with the GlucoMen Areo 2K but it is untested with it, and does not support reporting Ketone readings.
* serial meters support: allow selection of parity mode.Diego Elio Pettenò2021-03-271-1/+2
| | | | | While uncommon there are glucometers that don't use the default parity mode of "none". Allow the drivers to override this.
* Round mg/dL conversion to one decimal place.Diego Elio Pettenò2021-03-271-1/+1
| | | | | | This is only affecting accucheck_reports for now, but it makes sure that a round-trip between mmol/L→mg/dL→mmol/L don't lose (or invent) precision.
* CSV: use the same number of fields foreach readingPierre-Louis Bonicoli2021-03-082-2/+33
| | | | | | | | | | | | | | | | | | | | | | | Use 5 fields with KetoneReading and TimeAdjustment too. With this patch: $ glucometer --driver fslibre dump --with-ketone "2021-03-06 16:05:00","","","time","2021-03-06 15:57:59" "2021-03-07 14:34:26","0.01","","blood sample","(Ketone)" "2021-03-07 14:34:49","140.00","","blood sample","(Blood)" "2021-03-07 14:48:46","131.00","","CGM","(Sensor)" "2021-03-07 15:00:18","121.00","","CGM","(Scan)" Without this patch, KetoneReadings and TimeAdjustments use only 4 fields: $ glucometer --driver fslibre dump --with-ketone "2021-03-06 16:05:00","","time","2021-03-06 15:57:59" "2021-03-07 14:34:26","0.01","blood sample","(Ketone)" "2021-03-07 14:34:49","140.00","","blood sample","(Blood)" "2021-03-07 14:48:46","131.00","","CGM","(Sensor)" "2021-03-07 15:00:18","121.00","","CGM","(Scan)"
* freestyle: use freestyle-hid 1.0.2 encoding parameter.Diego Elio Pettenò2021-03-032-5/+10
| | | | | This allows FreeStyle Libre devices to use UTF-8 patient names, while not risking to brick older models that might just support ASCII.
* fslibre: add a debug log for the retrieved arresults.Diego Elio Pettenò2021-03-011-0/+2
| | | | This just makes debugging a bit easier.
* fslibre: don't drop the first and last characters of the comment.Diego Elio Pettenò2021-03-011-1/+1
| | | | | | The comment string is already parsed out of the quotes (`""`) so there is no reason to drop the first and last characters, which might make the comment itself unreadable.
* Re-add missing td42xx tests.Diego Elio Pettenò2021-03-011-0/+28
|
* td42xx: rename the previous td4277 driver, and support TD-4236B.Diego Elio Pettenò2021-02-252-36/+16
| | | | | | | | | | | The TD-4235B meter (sold as GlucoRx Nexus Q) uses pretty much the same protocol as the TD-4277. This change renames the driver, and reports the model returned by the device when receiving information. Other than that, a couple of constants are different from the previous meter.
* Add py.typed file to mark the package as typed.Diego Elio Pettenò2020-10-043-0/+9
|
* Use 0BSD instead of Unlicense for copyright disclaim.Diego Elio Pettenò2020-10-046-6/+6
|
* Depend on freestyle-hid for FreeStyle support and remove tools.Diego Elio Pettenò2020-10-042-283/+16
| | | | | | | | | Instead of maintaining the reversing tools for Abbott FreeStyle devices in this repository, they are now part of their own project (https://github.com/glucometers-tech/freestyle-hid), making it easier to split the dependencies requirements. The basic I/O of the FreeStyle session is also implemented in that library.
* Update pre-commit plugins to the latest versions as of today.Diego Elio Pettenò2020-09-0715-16/+39
|
* Make use of modern Python ordered kwargs.Svetlana Pantelejeva2020-08-027-121/+119
| | | | Remove usage of overloaded division operator in construct structures.
* Remove f-string prefix from strings with no placeholders.Diego Elio Pettenò2020-05-161-1/+1
|
* Add pre-commit configuration for REUSE.software.Diego Elio Pettenò2020-05-166-0/+18
| | | | | The only files that were lacking a license were the 0-sized __init__.py files — since those are not copyrighteable, make them Unlicense relesed.
* Make the project compliant with the REUSE guidelines.Diego Elio Pettenò2020-04-201-1/+2
| | | | | | | | | See https://reuse.software/ for details. For simplicity, the support files, that are vastly copy-pasta, are licensed under MIT license, rather than LGPL-2.1-or-later. Note that `reuse lint` currently fails due to fsfe/reuse-tool#208.
* When no action is provided by user, print the help output instead.Diego Elio Pettenò2020-04-091-3/+4
| | | | This makes it friendlier to the user who's not sure how to use it.
* Move driver loading to glucometerutils.driver.Diego Elio Pettenò2020-04-092-7/+22
| | | | This allows wrapping around some of the interfaces, and make typing more strict.
* Rename driver.GlucometerDriver to driver.GlucometerDevice.Diego Elio Pettenò2020-04-0911-11/+11
| | | | | The "driver" is the module — the classes need to be called Device. This allows adding further typing around this.
* Move driver_base to glucometerutils.driver instead.Diego Elio Pettenò2020-04-0911-34/+28
| | | | This makes it more like the other common modules, and allows expanding the interfaces.
* Add missing SPDX-FileCopyrightText throughout the project.Diego Elio Pettenò2020-03-2731-0/+31
| | | | This is following the advice provided in https://matija.suklje.name/how-and-why-to-properly-write-copyright-statements-in-your-code
* The big typing cleanup.Diego Elio Pettenò2020-03-2722-304/+408
| | | | | | | | Now that Python 3.7 is the minimum Python version, typing can be done inline, which makes it easier for mypy to know the files to check. Indeed, all the files are now typechecked, which uncovered a few minor bugs and mistakes here and there.
* Bring up command line error as we only support Python 3.7+ now.Diego Elio Pettenò2020-03-271-2/+2
|
* Combine a strangely-separated string.Diego Elio Pettenò2020-03-271-1/+1
|
* Fix typing for contourusb support module.Diego Elio Pettenò2020-03-271-32/+33
| | | | | | | This replaces the definition of modes with an Enum class, which is more appropriate, and adds typing throughout the module. Text is also replaced with str since we don't support Python 2 anyway.
* Use PEP526 declarations rather than `attr.ib()` calls all over.Diego Elio Pettenò2020-03-271-38/+32
| | | | | This simplifies type annotations a bit, and makes it easier figure out why attrs is still required (validators).
* Fix errors identified by flake8.Diego Elio Pettenò2020-03-2611-26/+18
|
* Make HID support a "session" class rather than a base class.Diego Elio Pettenò2020-03-228-122/+148
| | | | | | This in turn allows wrapping the FreeStyle access in its own session class, which the freestyle_hid_console can use without dirty tricks, and without triggering the now-abstract class.
* Move tests to be organized within the source directory.Diego Elio Pettenò2020-03-1612-0/+478
| | | | | This should simplify maintaining the tests in the long run, and allows mypy to more thoroughly check for types.
* Fix version information formatting.Diego Elio Pettenò2020-03-141-1/+3
| | | | The order of operations is a bit different with f-strings so the amount of padding is different.
* Now that Python 3.6 is the minimum supported version, use f-strings.Diego Elio Pettenò2020-03-1414-72/+48
| | | | | | | | | | | The f-strings formatted strings are generally simpler to write, read and debug, with a few exceptions. Keep the logging strings lazy, keep the CSV-building with %-formatting, as it makes it more readable. In fsoptium, keep `'$%s\r\n'` as a %-format, to avoid making it `f'${command}\r\n'` that would make it easy to mistake for a Shell variable.
* format code with blackBen2020-03-0823-931/+1026
|
* FreeStyle: fix keepalive message handling for non-Libre devices.Diego Elio Pettenò2020-03-061-1/+1
| | | | | | | Message type 0x22 is a keepalive message, which has usually one 0x05 or 0x03 byte. But don't expect a certain value, just ignore the message. This fixes issue #73.
* Fix typo.Diego Elio Pettenò2020-03-061-2/+2
|
* factor out common driver methodsBen2020-02-1814-101/+114
|
* Bugfix: get current time within the functionBen2020-02-188-8/+30
|
* contourusb: fix mypy typing.Diego Elio Pettenò2020-01-251-6/+9
| | | | | This includes importing the right abstract classes and correcting some call typing information.
* freestyle: add some (rough) support for encrypted messages.Diego Elio Pettenò2020-01-251-17/+80
| | | | | | While the Libre 2 protocol is still not usable, this makes it possible to at least send messages to it and get a translation of what the mistake was in the first place.
* freestyle: raise exceptions if a command returned an error state.Diego Elio Pettenò2020-01-251-0/+7
| | | | | This includes both the classic "unknown message type" error, and the Libre 2 encryption error state.
* freestyle: simplify the code for initialization further.Diego Elio Pettenò2020-01-251-9/+3
| | | | | | This is not a sequence, but rather a single initialization command. Remove the loop and the long comment that no longer applies (serial numbers and all.)
* freestyle: only send command 0x01 to initialize the device.Diego Elio Pettenò2020-01-241-1/+1
| | | | | | | | This has been tested on fslibre and fsprecisionneo, but please report if this does not work with other FreeStyle devices (Insulinx?) It appears the 0x04/0x05/0x15 dance is only needed by the Abbott software to identify which model (and software version) it is talking with.
* Make InvalidChecksum parameters and message harder to misunderstand.Diego Elio Pettenò2019-09-261-3/+3
|
* Add driver implementation for Ascensia ContourUSB.Arvanitis Christos2019-09-252-0/+409
| | | | | | | | | | | Implemented based on the protocol documentation provide by Ascensia, with portions from glucodump by @sm6xmm (relicensed by the author under MIT license.) Squashed from pull request #62. Signed-off-by: Anders Hammarquist <iko@iko.pp.se> Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.com>
* Remove try/except around typing imports.Diego Elio Pettenò2019-09-244-20/+4
| | | | Since Python 3.4 is no longer supported, there's no reason for typing not to be there.
* freestyle: fix return type for empty log.Diego Elio Pettenò2019-09-211-1/+1
| | | | () is not a valid Iterator[List[Text]]
* fslibre: add support for factory resetting FreeStyle Libre device.Diego Elio Pettenò2019-09-081-1/+5
|
* freestyle devices: don't error out if there are no readings.Diego Elio Pettenò2019-09-081-0/+4
| | | | | The multi-record format returns "Log Empty" if there's no entry in the device, catch that.
* fsoptium: fix error in date stirng parsing.Diego Elio Pettenò2019-09-021-1/+1
|
* Drop support for Python 3.4.Diego Elio Pettenò2019-09-021-2/+2
| | | | | | | | Python 3.4 lacks the `typing` module, which requires try/catch when importing, making type annotations more verbose than needed. At the time of writing, Debian oldstable has Python 3.5 available, so it sounds like a good default.
* Use the new website URL for glucometer-protocols.Diego Elio Pettenò2019-09-025-9/+8
|
* Use type= parameters in attr.ib() declarations.Diego Elio Pettenò2019-09-021-16/+18
| | | | | This should work just as well and makes it read a little better. Also, replace Text references with str, since we don't support Python 2 anyway.
* Replace the device_id attribute with a more generic extra_data dictionary.Diego Elio Pettenò2019-09-022-6/+8
| | | | This will allow providing other information, for other non-fslibre drivers.
* add internal device id to glucose measurements (and other entries) to prepare for better sortingBen2019-09-022-3/+11
|
* Add type: ignore comments when using lifescan_binary_protocol.Timestamp.Diego Elio Pettenò2019-09-013-9/+9
| | | | Somehow mypy does not seem to recognize it as a valid construct class.
* td4277: new driver for rebranded TaiDoc TD-4277 glucometers.Diego Elio Pettenò2019-08-031-0/+234
| | | | | This driver supports the GlucoRx Nexus, Menarini GlucoMen Nexus, and Aktivmed GlucoCheck XL.
* FreeStyle devices: don't error out for non-ASCII patient names.Diego Elio Pettenò2019-07-301-15/+27
| | | | | | | | | | This was brought up in issue #60. While the devices don't appear to care much for patient names, and can't be expected to support UTF-8 (the Windows software don't appear to allow that), it's worth protecting against this and just replacing the non-ASCII characters. To make this easier, the decoding is pushed down to the end of the processing of the multi-packet response, rather than being done per-packet.
* and patient_name supportmatmutant2019-07-081-2/+4
|
* Get and set the patient name on supported meters.Diego Elio Pettenò2019-07-073-1/+33
| | | | | | This includes the command line extensions to include the get/set patient name, as well as the driver support for all FreeStyle devices with the shared HID protocol, although not all will support this properly.
* fslibre: expose patient name if the device knows it.Diego Elio Pettenò2019-07-073-4/+19
| | | | | This includes extension of the base info command to report this when asked on the command line.
* Fix type annotations.Diego Elio Pettenò2019-07-011-4/+4
|
* Fix syntax error.Diego Elio Pettenò2019-07-011-1/+2
|
* Introduce an explicit InvalidDateTime exception for meters with unset time.Diego Elio Pettenò2019-07-013-4/+18
| | | | | | | | At least the FreeStyle Precision Neo appears to be able to report an invalid date/time (255/255/255 255:255), probably when the RTC is lost (see issue #58). This returns a more precise output than N/A, and should suggest to confirm the date and time setting instead.
* handle device.get_datetime() value error exceptionmatmutant2019-07-011-0/+2
|
* common: Correctly show ketone sample type in csvAndreas Sandberg2019-05-191-1/+1
|
* fsprecisionneo: Scale ketone readings to mmol/lAndreas Sandberg2019-05-193-14/+18
| | | | | | The FreeStyle Optimum Neo reports ketones in using the same unit as FreeStyle Libre. Move the conversion function from fslibre.py to freestyle.py to facilitate sharing and do the right conversion in fsprecisionneo.py.
* freestyle support: restore correct order of parameters.Diego Elio Pettenò2019-05-161-1/+1
| | | | Also add a test so that we don't break this again in the future.
* new line at end of .gitignore, rename arresult entry mapBen2019-05-051-2/+2
|
* add time adjustments to fslibre dumpBen2019-05-052-9/+43
|
* Bug fix: incorrect argument order in call to construct.Const.André Caldas2019-05-051-1/+1
|
* fslibre: correct the ketone reading.Diego Elio Pettenò2019-03-311-2/+9
| | | | | As discussed in glucometer-protocols #6, the value is actually converted the same way as blood glucose, despite it not having the same ratio.
* Replace epydoc metadata with SPDX identifiers.Diego Elio Pettenò2019-02-0819-96/+39
| | | | | | | | | | Most of the epydoc metadata (author, copyright, email) is duplicate in the package's setup.py or README. These copies are more likely to get out of date, and increase the amount of work to keep them in line. The license information should rather be provided with an SPDX identifier, which is more similar to what the Linux kernel and other projects, such as pyserial, do.
* Replace flameeyes.eu with flameeyes.com.Diego Elio Pettenò2019-02-0819-19/+19
| | | | | | | | Due to EURid threatening to suspend my domain, make sure that the references are updated to point at the right stable domain. This includes changes to the files as well as a mailmap to update the author references in the log.
* hiddevice: fix support for modern hidapi.Diego Elio Pettenò2019-01-291-3/+3
| | | | | | | The value of None is not valid for current hidapi implementation, but anything below 0 is considered no timeout. Fixes issue #50.
* exceptions: avoid using kwargs for message, as it's not correct.Diego Elio Pettenò2019-01-281-2/+2
| | | | Fixes the nested exception reported in Issue #50.
* otverio2015: fix string parsing to include the full prefix.Diego Elio Pettenò2018-12-191-5/+2
| | | | | This caused the normal ASCII-in-UTF16 strings to be misaligned, and the `info` output to be full of garbage.
* Fix most of the pylint output, and hide away some that is not needed.Diego Elio Pettenò2018-12-1216-202/+216
| | | | Again, this is not ready for CI yet unfortunately :(
* Simplify exceptions hierarchy.Diego Elio Pettenò2018-12-121-14/+10
|
* Reindent all files to match the 4-spaces indentation.Diego Elio Pettenò2018-12-126-630/+630
|
* hiddevice: split handle_ and hidapi_handle_.Diego Elio Pettenò2018-12-121-9/+15
| | | | This avoids confusing mypy, and is also less magical.
* Sprinkle more type annotations throughout the codebase.Diego Elio Pettenò2018-12-126-7/+30
|
* Fix indentation of common.py.Diego Elio Pettenò2018-12-121-83/+86
|
* Make GlucoseReading and KetoneReading use attrs, too.Diego Elio Pettenò2018-12-121-44/+24
| | | | This also adds more type annotations for them.
* Remove --sort-by flag.Diego Elio Pettenò2018-12-121-9/+1
| | | | | | There's nothing really meaningful beside the timestamp sorting, remove the flag. If for whatever analysis, a different sorting is needed, that should be post-processed from the generated CSV.
* Experimentally start adding type annotations, and mypy configs.Diego Elio Pettenò2018-12-123-11/+21
| | | | | This cannot currently be added to CI because the lack of `construct` stubs, which cause "unsupported left operands" for /-constructed structs.
* otverio2015: fix one remaining entry referencing the now-gone COMMAND_SUCCESS constant.Diego Elio Pettenò2018-12-121-1/+1
|
* Use [attrs](http://www.attrs.org/) instead of namedtuple for MeterInfo.Diego Elio Pettenò2018-12-121-18/+18
| | | | This avoids having the separate _MeterInfoBase class, and reads much nicer.
* sdcodefree: allows an arbitrary number of null-bytes before challenge.Diego Elio Pettenò2018-12-091-6/+9
| | | | This appears to be quite variable, and this should make it more reliable.
* otultraeasy: factor out the packet creation, and add tests.Diego Elio Pettenò2018-11-161-10/+19
| | | | | This would have caught the bug fixed with the previous commit, which is a strict improvement.
* Don't fold the command prefix into the LifeScanPacket.Diego Elio Pettenò2018-11-164-53/+53
| | | | | | | For the otultraeasy, there is no prefix provided in the acks at all, so the previous change broke the otultraeasy. Partial revert of b5784bb35b9968bf977d1319c3301958d671f45c.
* Fix sdcodefree driver, the same as the lifescan changes.Diego Elio Pettenò2018-07-241-1/+1
| | | | Thanks to Noel Cragg for reporting this.
* fix invalid self-referenceNoel Cragg2018-07-241-1/+1
| | | | | | | During the structure rebuild, the 'message' key is removed before its callback is invoked, causing 'this.message' to raise a nonexistent key error. This change reverts the line in question to its pre-84aad729 logic (but leaving the variable name substitutions in place).
* change 999 to infWesley T. Honeycutt2018-05-231-1/+1
|
* Fix for non-integer errorsWesley T. Honeycutt2018-05-231-1/+5
| | | This is a quick fix I used to address an error for "HI" readings on my unit. This comes up when testing inhuman blood. There may be a "LO", but I have not encountered it, so I do not know how the specifics of it. This error may come up on other units, but I have just done something about the hardware I have access to.
* freestyle support: add debug logging of commands sent and received.Diego Elio Pettenò2018-03-171-0/+4
|
* fsoptium: add debug logging when sending commands.Diego Elio Pettenò2018-03-171-0/+4
|
* Update lifescan_binary_protocol.pyArkadiusz Bulski2018-03-171-2/+2
| | | lambdafied this expression
* Update sdcodefree.pyArkadiusz Bulski2018-03-171-2/+2
| | | lambdafied this expression
* CString supports UTF-16/32-LE/BEArkadiusz Bulski2018-03-171-2/+1
|
* SymmetricMapping was renamed to MappingArkadiusz Bulski2018-03-174-5/+5
|
* corected timestamp commentArkadiusz Bulski2018-03-171-1/+1
|
* construct code fixed improper embeddingArkadiusz Bulski2018-03-174-15/+13
|
* construct-code is (almost) uptodateArkadiusz Bulski2018-03-174-8/+9
|
* otverioiq: remove untested marking and list supported features.Diego Elio Pettenò2018-01-071-3/+9
| | | | This closes Issue #30 as I actually tested this and it works perfectly fine.
* otverioiq: zero log is tested, it works.Diego Elio Pettenò2018-01-071-1/+1
|
* otverioiq: fix up set_datetime method.Diego Elio Pettenò2018-01-071-2/+4
|
* otverioiq: fix definition of the reading response, fix get_reading_count method.Diego Elio Pettenò2018-01-071-5/+3
|
* otverioiq: fix up a couple of syntax errors, and update baud rate.Diego Elio Pettenò2018-01-071-3/+3
|
* otverioiq: fix up syntax.Diego Elio Pettenò2018-01-071-6/+4
|
* otverioiq: fix typo.Diego Elio Pettenò2018-01-071-1/+1
|
* otverioiq: implement full parsing of the response structure.Diego Elio Pettenò2018-01-071-3/+19
| | | | | | The TidePool driver does not implement meal comment and it does not validate the full message. I checked the flags with the trace and they match the values in otverio2015.
* otverioiq: link-control is not used.Diego Elio Pettenò2018-01-071-1/+1
|
* lifescan binary protocol: factor out _COMMAND_SUCCESS.Diego Elio Pettenò2018-01-074-26/+27
| | | | The success status is always %x06 if there is a message at all.
* otverioiq: update version and serial number requests.Diego Elio Pettenò2018-01-061-2/+4
| | | | | These are now coming from the software trace. The version response is funny though.
* lifescan binary protocol: make the packet generator a function.Diego Elio Pettenò2018-01-064-56/+65
| | | | | | | | | | | | | | This ensures that the command prefix is added directly into the packet structure, simplifying the rest of the code. Per driver changes: - otverio2015: command prefix is changed from 0x04 to 0x03; this ensures that all the responses share the same prefix (READ RECORD COUNT does not repeat the selected command prefix). - otverioiq: command prefix is changed from 0x04 to 0x03, to align with the otverio2015 driver and the trace from OneTouch Diabetes Management Software.
* otultraeasy: fix AttributeErrors after factoring out link_control struct.Diego Elio Pettenò2018-01-061-4/+5
|
* otverioiq: add totally untested driver.Diego Elio Pettenò2018-01-061-0/+194
| | | | | | | | | | This is the first commit to support OneTouch Verio IQ (Issue #30). It's untested despite me having the device because it needs a new kernel I have not planned to build yet. Most of the protocol has been reverse engineered from the Tidepool driver (https://github.com/tidepool-org/chrome-uploader/blob/master/lib/drivers/onetouch/oneTouchVerioIQ.js) with a few assumption brought in from the UltraEasy and Verio 2015.
* lifescan_binary_protocol: factor out glucose unit mappings.Diego Elio Pettenò2018-01-063-13/+11
| | | | | The values are the same between all models sharing this protocol, even though the full reply message isn't.
* lifescan_binary_protocol: create a new module to support LifeScan drivers.Diego Elio Pettenò2018-01-063-60/+73
| | | | | | | | | | Both the UltraEasy and Verio 2015 use a similar protocol, with the same base packet serialised to the device. Factor the packet definition out (and make it a bit more generic). Verio IQ (Issue #30) also shares the same base protocol. Also move the definition of VERIO_TIMESTAMP to this common module as it's also shared with the Verio IQ.
* otverio2015: reorder functions to match otultraeasy.Diego Elio Pettenò2018-01-011-5/+5
|
* otultraeasy: merge _send_request and _read_response and match otverio2015.Diego Elio Pettenò2018-01-011-41/+35
| | | | | | | | | There was always a 1-to-1 mapping between these two functions, so merge them into a single function that knows both the request and response format. It also includes some refactoring of the actual record reading, to match the same structure of functions in otverio2015.
* otultraeasy: rename _ZERO_LOG_REQUEST to _MEMORY_ERASE_REQUEST.Diego Elio Pettenò2018-01-011-2/+2
| | | | This makes it the same as the otverio2015.
* otultraeasy: wrap around construct exceptions to MalformedCommand.Diego Elio Pettenò2018-01-011-11/+20
|
* otverio2015: rewrite using construct.Diego Elio Pettenò2018-01-011-220/+216
| | | | | | | This simplifies the code a bit here and there, making sure that the structures are all define at the top of the file. It also align the structure of the driver a bit more with otultraeasy, making it easier to spot the similitudes.
* otultraeasy: factor out the construct Timestamp implementation.Diego Elio Pettenò2018-01-012-13/+39
| | | | | | | This adds tests to ensure this works right in the general case, so that it can be used with different parameters. The adapter will be reused in the otverio2015 driver.
* otultraeasy: rewrite using construct for parsing.Diego Elio Pettenò2018-01-011-257/+198
| | | | | | | | | This removes the wholly complicated _Packet() object and replace it with more readable construct. Unfortunately this appears to reduce performance because of the serial stream buffering, needed to calculate the checksum. It's unfortunate, but it at least avoids a significant amount of custom code.
* sdcodefree: rewrite using construct and improve readability.Diego Elio Pettenò2017-12-311-87/+78
| | | | | | | This replaces the use of manual structures with well-defined construct entries; it also give consistency to packet vs message. Log input and output messages, to be clearer.
* serial devices: disable xonxoff by default.Diego Elio Pettenò2017-12-311-1/+1
| | | | | | | | | | With 2a825fb889735fa881566d1764cc48d2814447d2 the parameters to open the serial device were lifted from the fsoptium driver, which was the only one passing xonxoff=True. The Optium device has no problem with disabling this feature, but the codefree driver hangs if this is set to True. So instead set it to False and get rid of it.
* freestyle: rename miscopied constant name.Diego Elio Pettenò2017-12-301-2/+2
|
* Fix error in meter info output, after conversion of Unit to enum.Diego Elio Pettenò2017-12-291-1/+1
|
* freestyle: replace the custom struct and bytemangling with construct.Diego Elio Pettenò2017-12-281-8/+11
| | | | | | | | This simplifies the code and enforces the validation within the format documentation too. construct can handle the full package verification, including dealing with padding.
* Move the binary script to glucometerutils/ and create a starting shim.Diego Elio Pettenò2017-12-281-0/+147
| | | | The shim needs to be renamed, but this makes the history simpler to read.
* accucheck_reports: fix bug for mg/dL native meters.Diego Elio Pettenò2017-12-282-7/+9
| | | | | This was mixing up the units in the conversion. While fixing the bug, remove the confusing two-parameter form of convert_glucose_unit.
* Use Python3 Enum class for measurement methods.Diego Elio Pettenò2017-12-282-10/+11
| | | | This makes the code more idiomatic and less brittle.
* Use Python3 Enum class for meal flags.Diego Elio Pettenò2017-12-285-18/+19
| | | | This makes the code more idiomatic and less brittle.
* Use Python3 Enum class for glucose units.Diego Elio Pettenò2017-12-2810-35/+27
| | | | This makes the code more idiomatic and less brittle.
* otultraeasy: fix wrong module name for shared lifescan code.Diego Elio Pettenò2017-11-141-4/+4
| | | | | | | This was meant to be lifescan_common, and then renamed to just lifescan, but clearly I forgot that. Addresses part of Issue #29.
* Fix with_ketoneLeonard Lausen2017-10-023-8/+3
|
* Fix ketone readingLeonard Lausen2017-10-023-3/+8
|
* Fix syntax error in fsprecisionneo.pyLeonard Lausen2017-10-011-1/+1
|
* fsprecisionneo: add ketone reading supportSamuel Martin2017-09-251-8/+19
|
* fslibre: add ketone reading supportSamuel Martin2017-09-251-4/+24
|
* fslibre: set measure_method when parsing recordsSamuel Martin2017-09-251-2/+7
|
* common: introduce the KetoneReading classSamuel Martin2017-09-251-3/+32
| | | | | This change also remove the meal field from the _ReadingBase class and moves it only where it belongs, i.e. in the GlucoseReading class.
* common: rename Reading class into GlucoseReading classSamuel Martin2017-09-2510-12/+12
| | | | This renaming prepares for the ketone class introduction.
* common: add measure_method field to _ReadingBase classSamuel Martin2017-09-251-5/+10
| | | | | This new measure_method stores origin of the measure (either blood sample or from a CGM sensor).
* common: add constants for measure methodsSamuel Martin2017-09-251-0/+4
|
* fslibre: fix reading-type commentSamuel Martin2017-09-251-1/+1
|
* fslibre: fix insulin displaySamuel Martin2017-09-131-4/+4
| | | | | | | | | | | One of the professional options allows to choose the insulin increment step between 1 and 0.5 unit. This explains why the insulin dose values with no decimal part seems doubled in memory. This change adjusts the formating and computation when displaying these data.
* otverio2015: fix _MEAL_CODES map.Diego Elio Pettenò2017-09-131-3/+3
| | | | The unpacked value is an integer, not a byte array anymore.
* otverio2015: expose pre-/post-meal flags for Select Plus devices.Diego Elio Pettenò2017-09-131-7/+15
| | | | | While Verio 2015 does not appear to expose this information, Select Plus devices do, and the mapping is very simple.
* otverio2015: fix readings on Select Plus readers (Issue #22).Diego Elio Pettenò2017-09-131-3/+4
| | | | | | The reading value is only 16-bit long, not 32-bit. The following byte is a meal indicator (not implemented in Verio), followed by a (likely) constant 0x00.
* otverio2015: add debug logging to help track Issue #22.Diego Elio Pettenò2017-09-131-2/+8
|
* Fix typo on import statementRyan Jarvis2017-06-241-1/+1
|
* freestyle: add some debugging information.Diego Elio Pettenò2017-06-151-0/+3
|
* hiddevice: default to no timeout, like before.Diego Elio Pettenò2017-06-151-5/+5
| | | | | This restores the original behaviour, that seems to be necessary for the FreeStyle devices.
* hiddevice: make hidapi calls take a timeout, default to 1 second.Diego Elio Pettenò2017-06-061-1/+8
| | | | | This is important for a meter I'm working on right now, as there is no obvious way to tell whether to wait for new packets or not.
* hiddevice: add a 1-second timeout to reads.Diego Elio Pettenò2017-06-051-1/+6
| | | | This is a semantics difference between hidraw and HIDAPI, cover for it.
* Add a ne support class for HID-based devices.Diego Elio Pettenò2017-06-043-36/+90
| | | | | I'm currently implementing a separate HID-based driver that does not use the Abbott protocol, so this makes my life easier.
* Abbott devices: add support for using hidapi library.Diego Elio Pettenò2017-06-034-10/+43
| | | | | | | | | This allows these drivers to be used on operating systems other than Linux, as hidapi abstracts away the access. The interface is similar enough to using hidraw that the actual code only needed minimal changes. Maintain the ability to access the devices with the hidraw path too, without forcing the dependency.
* Merge pull request #11 from DorianScholz/fix_encoding_infoDiego Elio Pettenò2017-05-303-0/+2
|\ | | | | Fix encoding info and add missing __init__.py file
| * Fix encoding info and add missing __init__.py fileDorian Scholz2017-05-303-0/+2
| |
* | Fix IndexError and KeyError:Dorian Scholz2017-05-301-5/+9
|/ | | | even if rapid-acting-flag is set double-rapid-acting-insulin record does not always exist, so make it optional and provide a default value
* All drivers: move documentation of features from README to docstring.Diego Elio Pettenò2017-04-178-7/+88
| | | | | | | | This allows the drivers to keep up to date with what they support and need. Should make Issue #9 easier to solve. Also merge the dependency list with the list of supported devices, so that you don't have to join the two tables in your head.
* Add support for a "help" action that prints the driver module's docstring.Diego Elio Pettenò2017-04-171-1/+14
| | | | | | | | This allows the drivers to provide information on what they support directly, rather than relying on the README file. It also allows to provide further information for the quirkier devices. This is again trying to resolve Issue #9.
* Serial drivers: factor out opening of the serial port to a new base class.Diego Elio Pettenò2017-04-175-49/+85
| | | | | | This allows the serial support class to open the serial port without each driver having to pass the same long list of parameters, given that effectively all the meters use the same parameters, except few.
* Remove unused constants.Diego Elio Pettenò2017-04-151-4/+0
|
* serial drivers: if no --device parameter is given, look for default cable.Diego Elio Pettenò2017-04-154-21/+21
| | | | | | | | pyserial makes it very easy to look for a serial port based on VID/PID pairs, so use those when possible. Unfortunately serial drivers are also the least reliable as all of the cables but Abbott's use generic IDs. This keeps in the direction of solving Issue 9.
* fsoptium: use logging instead of writing to stderr directly.Diego Elio Pettenò2017-04-151-3/+2
|
* all drivers: make --device optional at the tool level.Diego Elio Pettenò2017-04-158-0/+42
| | | | | | | | This requires the drivers to validate their device, but also means they can provide a more explicit error message for the user as to what should be passed. This is a first step to help solving Issue 9.
* fslibre: parse and output the scan and blood tests.Diego Elio Pettenò2017-02-241-19/+137
| | | | | This adds some very free-form comments to note where the reading comes from and to convert the flags into something that the user can use.
* fslibre: new driver for Abbott FreeStyle Libre download.Diego Elio Pettenò2017-02-231-0/+73
| | | | | | | | This is the first (draft) version of the driver, that only downloads the automatic sensor readings, marking them as (Sensor) in the comments. I'll follow up with downloading of the scans and blood tests, but wanted to have this pushed first.
* sdcodefree: reformat and cleanup.Diego Elio Pettenò2017-02-091-135/+138
|
* Open OneTouch Verio devices in readwrite mode by default.Red Daly2017-01-201-1/+1
| | | | | | | | | Opening the device with read+write permissions is necessary to send write10 SCSI commands. The error message I was receiving was "SG_IO ioctl error; Operation not permitted" when running as non-root. http://sg.danny.cz/sg/sg_io.html describes SCSI permissions in greater depth and helped illuminate the nature of the permissions problem.
* freestyle: error out if hidraw device does not exist.Diego Elio Pettenò2017-01-171-0/+4
| | | | This avoids creating a binary file when running the tool as root (bad Flameeyes).
* fsinsulinx: add untested FreeStyle InsuLinx driver.Diego Elio Pettenò2017-01-171-0/+66
| | | | | | | | | | This is based off the fsprecisionneo driver, as the two share an almost identical protocol. The readings format is different between them, but otherwise the commands are compatible. There are a number of higher-level commands that differ between them, though, so it might be necessary to specialize the drivers further in the future.
* fsprecisionneo: move the version and serial number information to the common support class.Diego Elio Pettenò2017-01-172-10/+10
|
* fsprecisionneo: fix mistake in readings dump command.Diego Elio Pettenò2017-01-171-1/+1
|
* freestyle: improve error message on command failure, fix comment.Diego Elio Pettenò2017-01-171-2/+2
|
* freestyle: raise NotImplementedError when trying to zero-log.Diego Elio Pettenò2017-01-171-0/+4
|
* fsprecisionneo: add support for setting date and time.Diego Elio Pettenò2017-01-171-15/+29
| | | | | | There are shared commands that allow settings the date and time of the device, implement those in the freestyle support module, so that they can be re-used in implementation of the same base protocol.
* Update copyrights, cleanup whitespace where needed.Diego Elio Pettenò2017-01-168-12/+21
|
* Add new driver for the Abbott FreeStyle Precision Neo.Diego Elio Pettenò2017-01-162-0/+257
| | | | | This driver uses the HID-based protocol which is shared among different devices.
* Rename freestyle_optium to fsoptium.Diego Elio Pettenò2017-01-161-0/+0
| | | | | The number of freestyle devices drivers will soon skyrocket, use the same shortening as the OneTouch ones.
* LifeScan devices: move lifescan_common to the support directory.Diego Elio Pettenò2017-01-164-18/+18
| | | | | This makes it easier to figure out which files represent drivers, and which ones are per-vendor support modules.
* Move the readings-to-csv conversion to the Reading class.Diego Elio Pettenò2017-01-151-0/+6
|
* Wrap the meter information to a namedtuple, instead of a string.Diego Elio Pettenò2017-01-157-56/+73
| | | | | | This matches the gdef MeterInfo message, and produces a similar (though not identical) string as before. Importantly, it allows providing semantic information.
* Fix error in call to map() functionL. Guruprasad2016-11-161-2/+2
|
* freestyle_optium: ignore β-ketones results from dumps.Diego Elio Pettenò2016-08-311-4/+7
| | | | | Since there is no way to expose non-glucose readings right now (I might work on that in the future), filter β-ketones results out from the dump.
* freestyle_optium: fix reversed parameters to map().Diego Elio Pettenò2016-08-311-1/+1
| | | | Not sure how this ever worked.
* freestyle_optium: remove debugging print.Diego Elio Pettenò2016-08-311-1/+0
|
* sdcodefree: new driver.Diego Elio Pettenò2016-06-191-0/+190
| | | | | This driver supports SD Codefree readers, that are sold in the UK by HomeHealth UK.
* otverio2015: fix date/time handling, which was broken outside of UTC.Diego Elio Pettenò2016-05-211-1/+1
|
* otverio2015: implement proper glucose unit identification.Diego Elio Pettenò2016-05-211-3/+22
| | | | | I managed to get my hands on an US-edition of the device, and I can confirm this behaves in a similar way to the otultraeasy.
* Use a more Pythonic map(..., int) instead of list comprehension.Diego Elio Pettenò2016-03-022-4/+4
|
* Move the InvalidChecksum exception to the base exceptions module.Diego Elio Pettenò2016-03-026-21/+13
| | | | | Most glucometers have *some* sort of checksum, so there is no reason to implement this on a per-driver basis.
* accuchek_reports: add a new driver for Accu-Chek Mobile meters.Diego Elio Pettenò2016-02-151-0/+129
| | | | | | | | | The default USB connection provides a USB storage device with a CSV datafile. This driver works by looking for that file and importing it. This does not support setting the time, nor reading the actual device time, but it is at least a good way to import data from different meters under the same format.
* otultra2: make the before/after meal constants in common module.Diego Elio Pettenò2016-02-152-4/+9
| | | | This will lead the way to providing meal information with future drivers.
* otverio2015: new driver for OneTouch Verio (2015) and similar devices.Diego Elio Pettenò2016-02-141-0/+226
| | | | | | | | This should be working for OneTouch Select Plus devices, too. It currently does not support reporting in the native unit of the device. As of today, you'll also need my forked repository of python-scsi, as the current upstream one does not have working SGIO for Linux.
* Make the ConnectionFailed exception more generic.Diego Elio Pettenò2016-02-131-2/+2
|
* otultraeasy: move the MalformedCommand exception to common.Diego Elio Pettenò2016-02-132-11/+17
| | | | | Also make the exception more general, so that it can be used in the verio2015 driver.
* otultraeasy: move the crc function to lifescan_common.Diego Elio Pettenò2016-02-132-14/+25
| | | | | The same CRC-CCITT function is used in Verio 2015 devices, so prepare to reuse it by moving it to the common module.
* Update documentation, reference the new glucometer-protocols repository.Diego Elio Pettenò2016-02-091-1/+8
| | | | Also update copyright year.
* freestyle_optium: implement checksum verification on results.Diego Elio Pettenò2016-02-091-2/+26
| | | | | This should ensure more integrity of the results, and matches the behaviour on the lifescan devices.
* Implement a basic driver for the FreeStyle Optium devices.Diego Elio Pettenò2016-02-082-0/+256
| | | | | This driver supports dumping of (glucose) readings and reading/setting the clock.
* otultra2: avoid using connect/disconnect to wake up the device.Diego Elio Pettenò2014-02-081-3/+2
| | | | It seems like the device is very sensible to the reset command.
* otultra2: move checksum function within otultra2 driver.Diego Elio Pettenò2014-01-292-21/+20
| | | | | The function is not shared with the Ultra Easy and likely not with other devices either.
* Initial support for OneTouch Ultra Easy glucometers.Diego Elio Pettenò2014-01-291-0/+326
| | | | | The driver is fully functional but requires proper documentation and testing.
* common: fix namedtuple usage to allow for optional parameters.Diego Elio Pettenò2014-01-291-3/+3
| | | | The otultraeasy does not provide comments or meal indications.
* Add connect/disconnect methods to otultra2 and send \x11\r on connection.Diego Elio Pettenò2014-01-291-5/+8
| | | | | The otultraeasy requires explicit connect/disconnect so implementing this before is helpful.
* Clean up the code to remove methods that should be functions and imports.Diego Elio Pettenò2013-12-112-121/+115
|
* Allow sorting the dumped data; sort by date by default.Diego Elio Pettenò2013-12-111-5/+7
| | | | | This changes the dump output for otultra2 devices as they would dump data in record format, last reading first.
* Change all the internal representations to mg/dL for compatibility with LifeScan.Diego Elio Pettenò2013-12-112-15/+12
| | | | | | While mmol/L is the international standard unit, at least LifeScan uses mg/dL in all their devices, and since they are the ones for which we have protocols for, we might as well use the same.
* Generalise the meal/comment handling to the Reading object.Diego Elio Pettenò2013-12-112-6/+15
| | | | | While not all readers implement before/after meal notes, it's possible to implement an heuristics for that.
* otultra2: expose the meal and comments as separate field in the CSV.Diego Elio Pettenò2013-12-111-5/+1
| | | | | Idea by Jim Sifferle, implemented in a slightly different way as I noticed I forgot to quote it properly.
* Better error handling.Diego Elio Pettenò2013-12-081-1/+1
| | | | | If any exception is thrown by the library, print an error statement and return a non-zero exit value.
* Add a new command to dump the identification of the glucometer.Diego Elio Pettenò2013-12-081-0/+18
| | | | This allows to get the serial number, as well as other details about the glucometer once it's installed.
* otultra2: implement a zero log command to clear a device's memory.Diego Elio Pettenò2013-12-081-1/+11
|
* otultra2: implement decoding of meal and comment codes.Diego Elio Pettenò2013-12-082-2/+33
| | | | This also dumps the comment with the dump command.
* Read more data out of the OTUltra2 dump lines. Return data in a Reading object.Diego Elio Pettenò2013-09-292-10/+30
| | | | | The Reading object will be extended to cater for flags, comments and other device-specific information.
* Relicense everything under MIT license.Diego Elio Pettenò2013-08-034-4/+4
| | | | | There is no reason for me to use GPLv3 now that I'm not using the CRC32-Sick code, so I'll go with the most liberal license out there.
* Implement the correct checksum algorithm.Diego Elio Pettenò2013-08-031-30/+8
| | | | | | | Unlike what I though, OneTouch2 does not use CRC32 Sick algorithm, but a very stupid full 16-bit modulo sum of the bytes in the reply. This is very simple and does not require GPLv3 code at all.
* Add support for checksum verification for the otultra2 driver.Diego Elio Pettenò2013-08-033-25/+91
| | | | | | | This introduced some changes in the Exception class to simplify the code, and at the same time it adds a module for multiple lifescan drivers to share code (multiple OneTouch protocols share the same checksum for instance).
* Update function names to follow PEP8.Diego Elio Pettenò2013-08-032-28/+28
|
* Add utf-8 encoding specification to all files.Diego Elio Pettenò2013-08-033-0/+3
|
* otultra2: fix default unit handling.Diego Elio Pettenò2013-08-031-1/+2
|
* Initial import of the raw data.Diego Elio Pettenò2013-08-035-0/+334