summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid heuristics, and instead add an explicit --libre2 flag.Diego Elio Pettenò2020-01-241-12/+16
| | | | | This encodes some more details of which commands are encrypted and not, but makes decoding easier.
* Add a tool to extract a FreeStyle protocol chatter from an usbmon capture.Diego Elio Pettenò2020-01-241-0/+109
| | | | | | | | | | | The tool needs https://github.com/Flameeyes/usbmon-tools to work, and is derived off the extract-hid-chatter tool in that repository, so it's Apache-2 licensed (unlike the rest of the repository) and shares copyright with the usbmon-tools authors. While this does not work correctly for Libre2 traces, it does appear to work fine with Libre1 systems with text protocol exchanges, and it provides a starting point.
* Update AUTHORSmatmutant2019-12-041-0/+1
|
* Fix the freestyle_hid_console to use Python 3.5 compatible formatting.Diego Elio Pettenò2019-09-271-2/+2
|
* 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-256-1/+531
| | | | | | | | | | | 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]]
* Ooops remove my duplicate line.Diego Elio Pettenò2019-09-211-1/+0
|
* Add an AUTHORS file listing contributors with a name-looking handle.Diego Elio Pettenò2019-09-212-1/+23
| | | | | | | | This is currently missing @matmutant and @schferbe who are welcome to send me a pull request to add their names. This also changes the copyright notice to note that it's not just me anymore who assert copyright to this project.
* Add the list of known FreeStyle commands to the tools directory.Diego Elio Pettenò2019-09-151-0/+48
| | | | This can be used to help testing new FreeStyle devices, like the Libre2.
* fslibre: add support for factory resetting FreeStyle Libre device.Diego Elio Pettenò2019-09-081-1/+5
|
* freestyle_hid_console: allow feeding a list of known commands.Diego Elio Pettenò2019-09-081-1/+7
| | | | This makes it easier to identify the expected command range of a FreeStyle device.
* 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.
* Add a simple-ish script to use access a FreeStyle HID-compatible commands.Diego Elio Pettenò2019-09-081-0/+46
| | | | This makes it possible to send and receive text-command protocols to a FreeStyle HID device without actually writing any code, to identify possible valid commands.
* Add fsoptium basic tests for clock parsing.Diego Elio Pettenò2019-09-021-0/+39
|
* fsoptium: fix error in date stirng parsing.Diego Elio Pettenò2019-09-021-1/+1
|
* Use the new website's URL.Diego Elio Pettenò2019-09-021-1/+1
|
* Drop support for Python 3.4.Diego Elio Pettenò2019-09-024-5/+4
| | | | | | | | 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.
* Fix the PIP URL to install glucometerutils.Diego Elio Pettenò2019-08-311-1/+1
| | | | Newer versions of pip/wheel or some other packaging tools will error out during install phase if the egg value is wrong.
* td4277: add to the setup.py dependencies.Diego Elio Pettenò2019-08-061-5/+6
| | | | Also sort the list so that's easier to know where to add it.
* td4277: new driver for rebranded TaiDoc TD-4277 glucometers.Diego Elio Pettenò2019-08-033-17/+291
| | | | | This driver supports the GlucoRx Nexus, Menarini GlucoMen Nexus, and Aktivmed GlucoCheck XL.
* Fix invalid attribute in setup() method.Diego Elio Pettenò2019-07-301-1/+1
|
* travis: add Python 3.8 to the list of versions to test.Diego Elio Pettenò2019-07-301-0/+1
|
* 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-162-1/+24
| | | | 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-052-3/+3
|
* add time adjustments to fslibre dumpBen2019-05-053-9/+45
|
* Bug fix: incorrect argument order in call to construct.Const.André Caldas2019-05-051-1/+1
|
* Add SPDX license to .dir-locals.el.Diego Elio Pettenò2019-03-311-0/+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-0827-126/+55
| | | | | | | | | | 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-0828-29/+30
| | | | | | | | 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.
* Include the OneTouch Select Plus Flex in the otverio2015 list.Diego Elio Pettenò2018-12-191-16/+18
| | | | Add a note that only the USB connection is supported, not the BlueTooth one.
* 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-1217-202/+228
| | | | 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-125-13/+38
| | | | | 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-122-18/+21
| | | | 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.
* Travis: make dist xenial for python 3.7 supportDiego Elio Pettenò2018-11-161-0/+2
| | | | CC travis-ci/travis-ci#9815
* Travis: add Python 3.7 support.Diego Elio Pettenò2018-11-161-0/+1
|
* tests: simplify and cleanup.Diego Elio Pettenò2018-11-166-41/+26
| | | | | | | | | | * Remove the __main__ blocks as the tests should not be executable by themselves. * Use absltest everywhere instead of a mixture of unittest/absltest (via parameterized). * Only modify import path once. * Cleanup pylint warnings, by disabling those that are not useful, and fixing those that are.
* otultraeasy: factor out the packet creation, and add tests.Diego Elio Pettenò2018-11-162-10/+49
| | | | | 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.
* test-requirements: add some minimum version specifications.Diego Elio Pettenò2018-07-241-3/+3
|
* 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.
* Add double quotes according to @arvchristos suggestion on 'Example Usage' sectionNaokazu Terada2018-04-171-1/+1
|
* 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-176-16/+17
|
* construct: the construct API is significantly unstable, fix to 2.8.22 only.Diego Elio Pettenò2018-02-113-9/+9
| | | | | This still is required to fix Issue #38, but luckily it's just a test failure for now.
* Until Issue #38 is fixed, expect construct 2.8, and not 2.9.Diego Elio Pettenò2018-02-112-8/+8
| | | | | | The API changed in slightly incompatible ways so I'll have some work to make sure this works on both versions (and that there is some test around it, possibly).
* otverioiq: remove untested marking and list supported features.Diego Elio Pettenò2018-01-072-4/+10
| | | | 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: add to the list and to the dependency file.Diego Elio Pettenò2018-01-072-0/+2
| | | | | As noted in Issue #30, this is currently untested, but I'm confident it won't take much to get it to working state.
* 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.
* tests: improve code quality by passing the linter.Diego Elio Pettenò2018-01-013-6/+7
|
* test_lifescan: rename from test_otultraeasy, and cleanup.Diego Elio Pettenò2018-01-011-12/+1
| | | | | This test was actually only testing the CRC CCITT implementation now that otultraeasy uses construct.
* 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-013-236/+232
| | | | | | | 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-014-13/+115
| | | | | | | 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-014-277/+201
| | | | | | | | | 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-313-103/+94
| | | | | | | 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
|
* Run test and build on Travis CIMuhammad Kaisar Arkhan2017-12-302-0/+16
| | | | Closes https://github.com/Flameeyes/glucometerutils/issues/35
* Use pytest to run testsMuhammad Kaisar Arkhan2017-12-304-1/+41
| | | | Closes https://github.com/Flameeyes/glucometerutils/issues/34
* Add more tests to cover the basic translation of objects to strings.Diego Elio Pettenò2017-12-291-0/+74
| | | | | This would have found an extra bug that was pushed unfixed after enum conversion, and two bugs that I did find during the conversion.
* Fix error in meter info output, after conversion of Unit to enum.Diego Elio Pettenò2017-12-291-1/+1
|
* Fix dependency name for absl-py.Diego Elio Pettenò2017-12-281-1/+1
|
* freestyle: replace the custom struct and bytemangling with construct.Diego Elio Pettenò2017-12-283-26/+30
| | | | | | | | This simplifies the code and enforces the validation within the format documentation too. construct can handle the full package verification, including dealing with padding.
* deps: correct dependency for fsoptium.Diego Elio Pettenò2017-12-281-1/+1
|
* Add driver dependencies to setup.py, and document how to install this.Diego Elio Pettenò2017-12-282-0/+25
| | | | | | | | This should address Issue 5 (theoretically some of the dependencies are OS-specific but that's a longer problem). Also partially addresses Issue 9 because now we have an easy to understand "install and try out" option.
* Rewrite setup.py to use setuptools.Diego Elio Pettenò2017-12-281-22/+33
| | | | This should make it easier to add dependencies and so on.
* Rename the shim to match the old name.Diego Elio Pettenò2017-12-281-0/+0
|
* Move the binary script to glucometerutils/ and create a starting shim.Diego Elio Pettenò2017-12-282-3/+7
| | | | The shim needs to be renamed, but this makes the history simpler to read.
* Remove misleading MANIFEST template.Diego Elio Pettenò2017-12-281-1/+0
|
* Update Python version target in the README as well.Diego Elio Pettenò2017-12-281-1/+1
|
* Update documentation to be more useful.Diego Elio Pettenò2017-12-281-13/+21
|
* test: use byte constants instead of encoding on the fly.Diego Elio Pettenò2017-12-281-2/+2
|
* tests: fix OneTouch tests to use Python's own mock, and leverage absl-py.Diego Elio Pettenò2017-12-282-53/+26
| | | | | | Since I've increased the minimum Python version to 3.4, mock is now available within Python. And since I already used absl-py parameterized for test_common, make use of it to avoid boilerplate.
* Fix up link to the site.Diego Elio Pettenò2017-12-281-1/+1
|
* test_common: use absl-py to increase coverage, and simplify.Diego Elio Pettenò2017-12-281-8/+23
| | | | This ensures the tests run independently instead of failing at the first mistake.
* accucheck_reports: fix bug for mg/dL native meters.Diego Elio Pettenò2017-12-283-17/+11
| | | | | 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-2812-43/+36
| | | | This makes the code more idiomatic and less brittle.
* Raise minimum Python version to 3.4, to allow using the enum module.Diego Elio Pettenò2017-12-282-2/+3
| | | | | Supporting older Python is becoming harder, and modern Python is more readable, particularly as it allows for less brittle code.
* 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-024-9/+4
|
* Fix ketone readingLeonard Lausen2017-10-024-4/+9
|
* Fix syntax error in fsprecisionneo.pyLeonard Lausen2017-10-011-1/+1
|
* glucometer.py: add --with-ketone option to the dump actionSamuel Martin2017-09-251-0/+7
|
* 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.
* glucometer.py: restrict sorting choices to the common reading fieldsSamuel Martin2017-09-251-1/+1
| | | | | This change mainly aims to avoid breaking the glucometer.py script when introducing the ketone reading in the following patches.
* 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
|
* add udev rulesSamuel Martin2017-09-251-0/+30
|
* 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
|
* Remove the gdef submodule import.Diego Elio Pettenò2017-09-042-3/+0
| | | | | The gdef project should be considered deprecated. Instead we should implement the TidePool data model: http://developer.tidepool.org/data-model/device-data/
* Tested with FreeStyle Optium NeoWarren Moore2017-07-241-1/+1
|
* Fix typo on import statementRyan Jarvis2017-06-241-1/+1
|
* Use python3 in the shebang to mark this as not Python 2-compatible.Diego Elio Pettenò2017-06-181-1/+1
| | | | | Thanks to DorianScholz for pointing this out in pull request #14, and pointing me at https://www.python.org/dev/peps/pep-0394/.
* Raise an exception right away if the Python version is unsupported.Diego Elio Pettenò2017-06-151-0/+4
| | | | | | | | As suggested by @DorianScholz in pull request #14. Use 3.2 as minimum version since that's what I originally targeted. I wonder if there is an easy way to track which features the code is relying upon to keep this up to date.
* 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.
* fsprecisionneo: FreeStyle Optium Neo H has been tested workingDiego Elio Pettenò2017-06-071-1/+1
|
* 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.
* Add new model name to list of supported devices.Diego Elio Pettenò2017-06-051-0/+1
|
* Update message and fix line length.Diego Elio Pettenò2017-06-051-1/+2
|
* 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-036-14/+49
| | | | | | | | | 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 #13 from DorianScholz/make_dateutil_optionalDiego Elio Pettenò2017-05-301-2/+4
|\ | | | | Make dateutil optional:
| * Make dateutil optional:Dorian Scholz2017-05-301-2/+4
| | | | | | | | - import it only when user sets a date from a date string
* | Merge pull request #12 from DorianScholz/show_import_errorDiego Elio Pettenò2017-05-301-3/+3
|\ \ | | | | | | Show import error when loading driver, so the actual cause of the pro…
| * | Show import error when loading driver, so the actual cause of the problem can be seenDorian Scholz2017-05-301-3/+3
| |/
* | 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
| |/
* | Merge pull request #10 from DorianScholz/fix_fslibre_parsingDiego Elio Pettenò2017-05-301-5/+9
|\ \ | |/ |/| Fix IndexError and KeyError: double-rapid-acting-insulin
| * 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
* Add the Optium Neo as an untested supported device.Diego Elio Pettenò2017-04-171-1/+4
|
* All drivers: move documentation of features from README to docstring.Diego Elio Pettenò2017-04-179-44/+101
| | | | | | | | 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-172-1/+24
| | | | | | | | 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
|
* glucometer: make the error fatal and more clear when setting an invalid date.Diego Elio Pettenò2017-04-151-2/+4
|
* glucometer: log a better error if the driver name is not found.Diego Elio Pettenò2017-04-151-1/+8
|
* all drivers: make --device optional at the tool level.Diego Elio Pettenò2017-04-159-2/+45
| | | | | | | | 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.
* Add a --vlog option to enable verbose logging.Diego Elio Pettenò2017-02-251-0/+8
| | | | | This helps adding debug information to drivers, particularly those sending encoded messages.
* 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-232-0/+75
| | | | | | | | 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
|
* Merge pull request #8 from gonzojive/masterDiego Elio Pettenò2017-01-201-1/+1
|\ | | | | Include glucometerutils.support in setup.py.
| * Include glucometerutils.support in setup.py.Red Daly2017-01-201-1/+1
| |
* | Merge pull request #7 from gonzojive/masterDiego Elio Pettenò2017-01-201-1/+1
|\| | | | | Open OneTouch Verio devices in readwrite mode by default.
| * 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-172-1/+68
| | | | | | | | | | 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-172-16/+30
| | | | | | 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-169-13/+22
|
* Fix README to share the same Markdown syntax.Diego Elio Pettenò2017-01-161-10/+6
|
* Add new driver for the Abbott FreeStyle Precision Neo.Diego Elio Pettenò2017-01-163-11/+271
| | | | | This driver uses the HID-based protocol which is shared among different devices.
* Rename freestyle_optium to fsoptium.Diego Elio Pettenò2017-01-162-3/+3
| | | | | 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-166-25/+25
| | | | | This makes it easier to figure out which files represent drivers, and which ones are per-vendor support modules.
* Add an emacs local configuration file.Diego Elio Pettenò2017-01-161-0/+4
|
* Move the readings-to-csv conversion to the Reading class.Diego Elio Pettenò2017-01-152-3/+7
|
* Fetch the device information in all commands.Diego Elio Pettenò2017-01-151-4/+6
| | | | It's usually cheap and can provide assurance the device is connected and the right type.
* Wrap the meter information to a namedtuple, instead of a string.Diego Elio Pettenò2017-01-158-57/+78
| | | | | | This matches the gdef MeterInfo message, and produces a similar (though not identical) string as before. Importantly, it allows providing semantic information.
* Add a submodule pointing at gdef, to start implementing gdef export.Diego Elio Pettenò2017-01-152-0/+3
| | | | For now there is nothing using gdef, so this submodule does not need to be implemented.
* Merge pull request #6 from lgp171188/map_func_call_fixDiego Elio Pettenò2016-11-171-2/+2
|\ | | | | Fix error in call to map() function
| * 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: fix brainfart in README.Diego Elio Pettenò2016-06-191-1/+1
|
* sdcodefree: new driver.Diego Elio Pettenò2016-06-192-0/+193
| | | | | 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.
* Add backup files to .gitignore.Diego Elio Pettenò2016-03-021-0/+1
|
* 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-028-23/+15
| | | | | 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-152-0/+131
| | | | | | | | | 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.
* doc: use tables for devices, drivers, features and dependencies.Diego Elio Pettenò2016-02-151-13/+33
| | | | | This should provide more information on the devices themselves, particularly now that different levels of features are available.
* 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-142-0/+231
| | | | | | | | 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-133-16/+27
| | | | | 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-092-5/+20
| | | | 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.
* Add a note that the Ultra Easy is also known as Ultra Mini.Diego Elio Pettenò2014-01-291-2/+3
|
* otultra2: move checksum function within otultra2 driver.Diego Elio Pettenò2014-01-294-49/+28
| | | | | 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-293-3/+398
| | | | | 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-292-5/+12
| | | | | The otultraeasy requires explicit connect/disconnect so implementing this before is helpful.
* Merge pull request #1 from jimsiff/masterDiego Elio Pettenò2013-12-141-2/+7
|\ | | | | Add confirmation prompt to zero log argument
| * Add confirmation prompt to zero log argumentjimsiff2013-12-141-2/+7
|/ | | | | I’m sure there’s a cleaner way to do this, but I wanted a confirmation when zeroing the glucometer data log.
* Update documentation for the dump format and options.Diego Elio Pettenò2013-12-111-0/+20
|
* Clean up the code to remove methods that should be functions and imports.Diego Elio Pettenò2013-12-113-122/+115
|
* Allow sorting the dumped data; sort by date by default.Diego Elio Pettenò2013-12-112-6/+18
| | | | | 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.
* glucometer.py: if no unit is provided on command line, use the default of the meter.Diego Elio Pettenò2013-12-111-1/+5
|
* Generalise the meal/comment handling to the Reading object.Diego Elio Pettenò2013-12-113-8/+18
| | | | | 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-082-22/+24
| | | | | 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-082-4/+26
| | | | 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-082-1/+20
|
* otultra2: implement decoding of meal and comment codes.Diego Elio Pettenò2013-12-083-3/+35
| | | | 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-293-12/+32
| | | | | The Reading object will be extended to cater for flags, comments and other device-specific information.
* Fix style for tests.Diego Elio Pettenò2013-09-293-68/+60
|
* test_otultra2: factor out setting of returned serial string.Diego Elio Pettenò2013-08-101-9/+9
|
* glucometer: allow providing a freeform arbitrary date to set on the meter.Diego Elio Pettenò2013-08-041-2/+10
|
* setup.py: update license specification.Diego Elio Pettenò2013-08-031-1/+1
|
* glucometer: mark executable.Diego Elio Pettenò2013-08-031-0/+0
|
* Relicense everything under MIT license.Diego Elio Pettenò2013-08-0310-684/+27
| | | | | 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-033-34/+13
| | | | | | | 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-035-29/+139
| | | | | | | 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).
* glucometer: remove unused argv usage.Diego Elio Pettenò2013-08-031-2/+1
|
* Update function names to follow PEP8.Diego Elio Pettenò2013-08-036-43/+54
|
* Add utf-8 encoding specification to all files.Diego Elio Pettenò2013-08-037-0/+8
|
* glucometer: add support for selecting output units on dump.Diego Elio Pettenò2013-08-031-1/+4
|
* glucometer: fix script to actually work and provide actions.Diego Elio Pettenò2013-08-031-2/+13
|
* Add tests for the glucose unit conversion.Diego Elio Pettenò2013-08-031-0/+53
|
* test_otultra2: add header.Diego Elio Pettenò2013-08-031-0/+7
|
* otultra2: fix default unit handling.Diego Elio Pettenò2013-08-031-1/+2
|
* Add a link to README.md to try rendering it on GitHub.Diego Elio Pettenò2013-08-031-0/+1
|
* Initial import of the raw data.Diego Elio Pettenò2013-08-0312-0/+1142
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 10:49:34 +0100