diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-04 18:44:57 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-09 19:19:04 +0100 |
| commit | 7c9f46acd202121e67557bb634961ef17a9f6c1f (patch) | |
| tree | f21b6ff42a930cc97c31db9f20c03f1613e70291 /core/uemis.c | |
| parent | cd4f66014f7b5269dff9e088c9d7d38241c03156 (diff) | |
| download | subsurface-7c9f46acd202121e67557bb634961ef17a9f6c1f.tar.gz | |
Core: remove MAX_CYLINDERS restriction
Instead of using fixed size arrays, use a new cylinder_table structure.
The code copies the weightsystem code, but is significantly more complex
because cylinders are such an integral part of the core.
Two functions to access the cylinders were added:
get_cylinder() and get_or_create_cylinder()
The former does a simple array access and supposes that the cylinder
exists. The latter is used by the parser(s) and if a cylinder with
the given id does not exist, cylinders up to that id are generated.
One point will make C programmers cringe: the cylinder structure is
passed by value. This is due to the way the table-macros work. A
refactoring of the table macros is planned. It has to be noted that
the size of a cylinder_t is 64 bytes, i.e. 8 long words on a 64-bit
architecture, so passing on the stack is probably not even significantly
slower than passing as reference.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/uemis.c')
| -rw-r--r-- | core/uemis.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/uemis.c b/core/uemis.c index 88f402400..7272e2897 100644 --- a/core/uemis.c +++ b/core/uemis.c @@ -336,17 +336,18 @@ void uemis_parse_divelog_binary(char *base64, void *datap) * we store the incorrect working pressure to get the SAC calculations "close" * but the user will have to correct this manually */ - dive->cylinder[i].type.size.mliter = lrintf(volume); - dive->cylinder[i].type.workingpressure.mbar = 202600; - dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data + 120 + 25 * (gasoffset + i)) * 10; - dive->cylinder[i].gasmix.he.permille = 0; + cylinder_t *cyl = get_or_create_cylinder(dive, i); + cyl->type.size.mliter = lrintf(volume); + cyl->type.workingpressure.mbar = 202600; + cyl->gasmix.o2.permille = *(uint8_t *)(data + 120 + 25 * (gasoffset + i)) * 10; + cyl->gasmix.he.permille = 0; } /* first byte of divelog data is at offset 0x123 */ i = 0x123; u_sample = (uemis_sample_t *)(data + i); while ((i <= datalen) && (data[i] != 0 || data[i + 1] != 0)) { if (u_sample->active_tank != active) { - if (u_sample->active_tank >= MAX_CYLINDERS) { + if (u_sample->active_tank >= dive->cylinders.nr) { fprintf(stderr, "got invalid sensor #%d was #%d\n", u_sample->active_tank, active); } else { active = u_sample->active_tank; |