Cleaned up and rebased "libdivecomputer-NG" branch

Dirk Hohndel dirk at
Tue Apr 24 17:11:04 PDT 2018

> On Apr 24, 2018, at 12:53 PM, Linus Torvalds <torvalds at> wrote:
> Ok, I finally got around to cleaning up my subsurface changes, and
> there is now a newly rebased libdivecomputer-NG branch at
>   git:// libdivecomputer-NG

Excellent - I’ve been waiting for that. I’m running  out of time today, but 
I’ll work on this tomorrow.

> that I think is in good enough shape to be pulled.
> That branch has the same requirement on the "Subsurface-NG" branch in
> libdivecomputer, but has additionally:
> - many cleanups, including entirely removing the "ble_serial" code
> (which in the old branch stayed around as dead code)
>   The ble_serial code wrapped the BLE code in a serial emulation
> layer, but now that libdivecomputer natively knows about BLE, there's
> no point any more.
> - simplified history.
>   I couldn't really split things up into lots of small changes (since
> it's a flag-day for the new libdivecomputer interface anyway), and
> instead the conversion history is just two commits: (a) convert our
> custom IO implementation to the new libdivecomputer world order and
> (b) hook it all in and use the new world order.
> - I added the fingerprint patch.
>   Ok, so this has nothing to do with the new world order, and maybe
> Dirk wants to handle this some other way, but it was part of my
> testing and seems solid, and is technically about libdivecomputer (and
> affects nothing else).

I think that last iteration made sense. I haven’t thought it through for
all the different OSs to make sure it works, but given that you used
a standard path, it should.

> NOTE! I have *not* updated libdivecomputer itself. I looked at it, and
> it all looks fine. I think Dirk should just use his "NG-test" branch
> as-is (ie my NG update and merging in the libdivecomputer upstream
> bugfix). But just rebasing it on top of the libdivecomputer OSTC3
> bugfix would be fine too. But unlike the subsurface branch, there's
> not really any big *reason* to rebase.
> Dirk - up to you. And obviously, I don't know when you want to cut
> over to the new libdivecomputer world order.

I’m happy to do it now - but for libdivecomputer I’m always a bit
gun shy, so I’d prefer that you did the rebasing and just pointed
me to a tree that you want me to start with (as this is a new branch).



More information about the subsurface mailing list