Commit graph

20410 commits

Author SHA1 Message Date
Salvador Cuñat
69d1ac8314 [asd-logtrak] Make datatrak.cpp dt_libdc_buffer() no static
So it can be used in other import modules

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2025-01-01 14:31:54 +13:00
Salvador Cuñat
9e6ed55cf5 Add suport to import Scubapro's LogTrak files
Import can be done from .script files generated by LogTrak software or
from .asd files generated by SmartTrak and LogTrak export option.

This code was writen in C, and has just been "ported" to some extent to
C++, so it can work with recent rework of Subsurface to C++.

I'm not a C++ guy, so this is mostly C with some make-up.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2025-01-01 14:31:54 +13:00
Michael Keller
9baf36da45 CICD: Add Check for Changes in the Supported Dive Computer Lists.
Add a check that will fail whenever there is a change in the list of
supported dive computers in libdivecomputer that is not reflected in the
`SupportedDivecomputers.*` lists.
Also add a script for a simplified update of these lists.
From a discussion with @dirkhh in https://github.com/subsurface/libdc/pull/71#issuecomment-2565384338.

Signed-off-by: Michael Keller <github@ike.ch>
2025-01-01 14:31:44 +13:00
Michael Keller
939154705b Reshuffle the CCR Preference to Keep the Context Correct.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:22:47 +13:00
Michael Keller
b51ece8de0 Fixup gaschange events.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:22:47 +13:00
Michael Keller
0a27f124fd Fix the Diveplan Creation.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:22:47 +13:00
Michael Keller
07898f277c Profile: Improve Display of Bailout / Loop Events.
For dives in CCR mode, show 'bailout' and 'on loop' events whenever a
gas switch from a diluent gas to a bailout gas and vice versa happens.

Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:22:47 +13:00
Michael Keller
de12d3a6ea Disable Debugging in Planner.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:03:21 +13:00
Michael Keller
2673b7fa10 Bugfix: Fix planner debug code.
Fix the debug code in `core/planner.cpp`.

Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:03:21 +13:00
Michael Keller
29fcd5ca15 Update libdivecomputer to latest on 'Subsurface-DS9'.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 23:02:48 +13:00
Michael Keller
269ed630be CICD: Make Version Generation Fail a Bit More Verbosely.
Signed-off-by: Michael Keller <github@ike.ch>
2024-12-29 22:51:41 +13:00
Michael Keller
39e47845d7 Profile: Clarify the Gradient Factor Display.
Clarify that the gradient factor displayed in green in the profile is
the gradient factor that is set in Subsurface, and not the one used by
the dive computer.

Fixes #4396.

Signed-off-by: Michael Keller <mikeller@042.ch>
2024-12-23 21:47:13 +01:00
Berthold Stoeger
55b72d40e3 planner: round deco-stop levels to integral feet
In the decostop table, we had deco stops at fractional feet
(e.g. 333.33 ft). This was somewhat awkward, because the
user defined literals do not yet(?) support non-integers
and therefore, these entries were given in mm instead.

Just round to the nearest integral feet values.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
992e258524 core: pass depth_t to get_depth_units()
Commit is longer than expected, because a few of the callers
were converted to use depth_t instead of int.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
1d14b03935 core: let pressure_to_altitude return a depth_t
Also un-inline it. There seems no reason for exporting the
implementation details in the header file.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
4237cb9999 profile: turn plotdata::mod, ead, eadd, end into depth_t
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
58d096adfc profile: turn plotdata::ceiling into depth_t
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
9cf753fa56 core: refactor per_cylinder_mean_depth()
This function had a horrendous interface: The caller would have to
allocate two arrays of the correct size to be filled with data.
The callee couldn't even check the size, because the data was passed
as raw pointers.

Instead, use std::vector<>, construct everything in the called
function and do size-sanity check in the calling function.

Use depth_t and duration_t instead of plain integers to represent
mean depth and time.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
dbc06d78b6 profile: small cleanup concerning depth_t
Operate directly on depth_t instead of working with the base
type.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
94a54d8e35 profile: make plotdata::depth depth_t
A small drop in the bucket: more conversion to our unit types.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
851e8bc5ee core: implement scalar multiplication/division for unit types
Allow multiplication/division of unit types with scalars,
such as
	depth * 4
or
	depth / 4
Multiplication the other way round (4 * depth) is not currently
supported, because that needs some template trickery.

Might do this later or wait for our switch to C++20, where we
could use concepts to make that trickery more palatable.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
022b927755 planner: make argument to plan_add_segment() depth_t
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
6b57b3b745 core: make round_to parameter of gas_mod() and gas_mnd() a depth_t
Simplifies practically all the callers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
bd2f7e72f1 core: turn M_OR_FT macro into a function
No point in this being a macro. Make it return a depth_t - it
was unclear that this returns a depth in mm.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
0e77dd9a68 core: implement interpolate() function for unit types
Calls the global interpolate() function for integer types.

For now, the template is enabled if the arguments are not
integer types. Might want to refine that in the future.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
1ccfb823f0 core: make interpolate() a template
Make the type the interpolate() function works on a template type,
so that this can be used for arbitrary unit types without warnings.
Internally, it does its math using floating point arithmetics anyway,
so no risk of overflow. (Exception: when just taking the middle point,
but I would hope that no part of the code lives on the edge such that
addition of two values gives an overflow.)

Moreover, add an "math.h" include so that the header becomes
independent of others.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
6fbc3917bb core: make unit user-defined literals constexpr
Currently, we can't use our unit literals, such as "3_m" in
constexpr context, for example to define them as variables
as such:

static constexpr deco_stops_multiplier = 3_m;

Declaring the respective operator""() functions as constexpr
enables this use case.

The _ft and _atm literals are left as non-constexpr, because
they use round(), which is not constexpr on our Android
compiler. Revise this later.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
da17f6a08c core: pass depth_t to depth_to_* functions
This is a drop in the ocean. Make the usage of the unit-types a
bit more consistent throughout the code base.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
661ce3f9c7 Whitespace fix: no Java-style functions
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-17 13:58:27 +13:00
Berthold Stoeger
bc35aadc20 trivial: replace macro cube() by inline function/template
Avoids funky side effects. The old version would have failed
horribly for innocent invocations such as "cube(a+b)" or
"cube(++a)".

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-14 12:34:44 +01:00
Berthold Stoeger
d26f1a07cf trivial: remove unused macro
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-14 12:34:44 +01:00
Berthold Stoeger
6f367c70b7 Create UUID when adding a dive site to core
3f8b4604be introduced a bug: it replaced alloc_dive_site() by the
divesite constructor. However, the latter does not generate a
UUID (for that it would have to access the dive site table).

Thus newly added dive sites had no UUID and could not be saved
properly.

Use the register_site() instead of the put() function when
adding the dive site to the core, so that the UUID is created
if needed.

This needs an audit.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-08 17:56:53 -08:00
Subsurface CI
e0d1a54aef macOS: build against Qt 5.15.16
With this we should be able to switch to a newer mac build VM.

Signed-off-by: Subsurface CI <ci@subsurface-divelog.org>
2024-12-06 16:37:39 -08:00
Michael Keller
4410302de8 CICD: Add Build for Debian / bookworm (stable).
Our current build for debian trixie (testing) has started failing
because mdbtools-dev seems to be no longer available in trixie.
Not sure what the future plans for mdbtools are - the project itself
seems to be a bit stagnant, so we might need to consider removing this
from builds where the target OS has stopped supporting this tooling (or
change to download and install this library ourselves as part of our
build process.
For now I am adding a build for debian / bookworm to cover debian, and
disabling the debian / trixie build.

Signed-off-by: Michael Keller <github@ike.ch>
2024-12-06 14:07:16 +13:00
Michael Keller
f7e624fe0f Profile: Stop Hiding All Compass Headings.
It seems to be over the top to hide all compass heading information just
because _some_ dive computers log them for every sample.
A better approach will be to either suppress these in the parser for the
affected dive computer, or let the user suppress them in the
profile if they wish to do so.
Since there is no information in the comments about the manufacturer /
model of the affected dive computer, this is implementing a 'scream
test'.

Signed-off-by: Michael Keller <github@ike.ch>
2024-12-04 01:48:54 +13:00
Berthold Stoeger
4d4c250589 Avoid UTF8->UTF16->UTF8 roundtrip when logging on mobile
Make writeToAppLogFile() take an std::string parameter to avoid
an unnecessary UTF8->UTF16->UTF8 (std::string->QString->char *)
roundtrip.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-12-01 16:33:33 +01:00
Jef Driesen
7d1e0ef0d1 Redirect logs to the application log file again
In commit 4de109bbf1, qDebug() was
replaced with report_info(). As a side effect, the subsurface log
messages are no longer redirected to the application log file. Only the
internal Qt logging ends up in the log file.

For bug reporting by end-users, this application log file is important
because it's the easiest way to collect all the necessary information to
investigate the problem.

Signed-off-by: Jef Driesen <jef@libdivecomputer.org>
2024-11-30 16:22:30 +01:00
Michael Keller
be6b017534 Update the Windows MXE Build Image to 3.4.0.
Signed-off-by: Michael Keller <github@ike.ch>
2024-11-27 08:29:40 +13:00
rmultan
46c439c443 Bluetooth: Add Mares Sirius to known devices
The app already supports Mares Sirius,
but user has to allow scanning for
unknown devices in app settings.
This adds Mares Sirius to known devices.

Signed-off-by: rmultan <multan.rafal.k@gmail.com>
2024-11-26 22:29:13 +13:00
Michael Keller
015ac0e459 CICD: Build Release Versions on Push.
Change the builds on push (i.e. pull request merges) to build release
versions. This seems to be the correct way to build these, as they are
now distributed as the official builds on
https://subsurface-divelog.org/.
For users wanting to help with debugging, build artifacts on pull
requests are available, and these are debug builds.
Also adding the option to manually trigger builds, so if needed debug
builds can be run on `master`.

Signed-off-by: Michael Keller <github@ike.ch>
2024-11-26 19:37:45 +13:00
Michael Keller
91d8bfef55 Import: Add Parsing for Divesoft Freedom+ Format Files.
Switch the Divesoft log file importer to use the parser in
libdivecomputer. This adds support for the newer Divesoft Freedom+ log
file format.
Also refactor the OSTCTools log file importer to share common
functionality.

Signed-off-by: Michael Keller <github@ike.ch>
2024-11-19 08:47:00 +13:00
Michael Keller
7f42acfdfb Import: Add Parsing for Divesoft Freedom+ Format Files.
Switch the Divesoft log file importer to use the parser in
libdivecomputer. This adds support for the newer Divesoft Freedom+ log
file format.
Also refactor the OSTCTools log file importer to share common
functionality.

Signed-off-by: Michael Keller <github@ike.ch>
2024-11-19 08:47:00 +13:00
Robert C. Helling
7dc92e170f Round MOD to lower depths
When computing the suggested switch depth for a gas,
we should take the next stop depth above the MOD, i.e.
round down. Otherwise we can produce MOD violation warnings.

We need, however, a bit of fudge as otherwise we do not
suggest to switch to o2 at 6m.

TestPlan uses the MOD to determine the depth to switch to
Tx21/35. This happens to be 65.378m. Therefore, switching
at 66m violates the MOD, the switch should be at 63m.
This then affects the gas usage.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
2024-11-19 08:46:13 +13:00
Michael Keller
a898173ce7 CICD: Update the MXE Version Used to Build the Windows Version.
This fixes the missing 'Print' functionality in Windows.

Signed-off-by: Michael Keller <github@ike.ch>
2024-11-19 08:44:55 +13:00
Berthold Stoeger
4f7d567571 planner: use value semantics for computeVariations()
When computing the variations in a background thread, the
code has to work on a copy of the dive plan and the deco
state. Instead of passing a copy via a unique_ptr<>, simply
use value semantics when calling computeVariations().

This does an unnecessary copy of the deco state, when
computeVariations is not run in the background, but so what.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-11-17 08:40:24 +13:00
Berthold Stoeger
9f55f167b2 planner: fix calculations of variations
In 8704a8b the code in cloneDiveplan() was replaced by a simple
assignment statement.

Alas, the original code was more complex: it copied only up
to a certain point (it stopped at automatically generated
steps).

The new behavior made the calculations of variations fail,
because a call to plan() adds deco stops.

Therefore, copy the plan _before_ calling plan().

Fixes #4368

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2024-11-17 08:40:24 +13:00
Dirk Hohndel
beb352d47c Ubuntu: update supported versions
Drop 23.10 / Mantic
Add  24.10 / Oracular

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-11-11 14:22:28 +13:00
Dirk Hohndel
e7900c514c export-html: prevent invalid json
A dive without events could lead to json with extra closing brackets that
prevents browsers from rendering the dive log.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-11-05 19:17:12 +01:00
dependabot[bot]
8e9010a000 build(deps): bump com.github.mik3y:usb-serial-for-android
Bumps [com.github.mik3y:usb-serial-for-android](https://github.com/mik3y/usb-serial-for-android) from v3.8.0 to 3.8.1.
- [Release notes](https://github.com/mik3y/usb-serial-for-android/releases)
- [Changelog](https://github.com/mik3y/usb-serial-for-android/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/mik3y/usb-serial-for-android/compare/v3.8.0...v3.8.1)

---
updated-dependencies:
- dependency-name: com.github.mik3y:usb-serial-for-android
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-04 15:59:52 +13:00
Michael Keller
0e7d3a6466 Desktop: Fix Saving of the Divesite Country.
Fix a bug in the edit divesite country command preventing the
country of the divesite from ever being saved.

Fixes #4357.

Signed-off-by: Michael Keller <github@ike.ch>
2024-11-03 00:31:09 +13:00