mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-08 02:06:15 +00:00
6c4e890960
We have this odd legacy notion of a divecomputer 'device', that was originally just basically the libdivecomputer 'EVENT_DEVINFO' report that was associated with each dive. So it had firmware version, deviceid, and serial number. It had also gotten extended to do 'nickname' handling, and it was all confusing, ugly and bad. It was particularly bad because it wasn't actually a 'per device' thing at all: due to the firmware field, a dive computer that got a firmware update forced a new 'device'. To make matters worse, the 'deviceid' was also almost random, because we've calculated it a couple of different ways, and libdivecomputer itself has changed how the legacy 32-bit 'serial number' is expressed. Finally, because of all these issues, we didn't even try to make the thing unique, so it really ended up being a random snapshot of the state of the dive computer at the time of a dive, and sometimes we'd pick one, and sometimes another, since they weren't really well-defined. So get rid of all this confusion. The new rules: - the actual random dive computer state at the time of a dive is kept in the dive data. So if you want to know the firmware version, it should be in the 'extra data' - the only serial number that matters is the string one in the extra data, because that's the one that actually matches what the dive computer reports, and isn't some random 32-bit integer with ambiguous formatting. - the 'device id' - the thing we match with (together with the model name, eg "Suunto EON Steel") is purely a hash of the real serial number. The device ID that libdivecomputer reports in EVENT_DEVINFO is ignored, as is the device ID we've saved in the XML or git files. If we have a serial number, the device ID will be uniquely associated with that serial number, and if we don't have one, the device ID will be zero (for 'match anything'). So now 'deviceid' is literally just a shorthand for the serial number string, and the two are joined at the hip. - the 'device' managament is _only_ used to track devices that have serial numbers _and_ nicknames. So no more different device structures just because one had a nickname and the other didn't etc. Without a serial number, the device is 'anonymous' and fundamentally cannot be distinguished from other devices of the same model, so a nickname is meaningless. And without a nickname, there is no point in creating a device data structure, since all the data is in the dive itself and the device structure wouldn't add any value.. These rules mean that we no longer have ambiguous 'device' structures, and we can never have duplicates that can confuse us. This does mean that you can't give a nickname to a device that cannot be uniquely identified with a serial number, but those are happily fairly rare (and mostly older ones). Dirk said he'd look at what it takes to give more dive computers proper serial numbers, and I already did it for the Garmin Descent family yesterday. (Honesty in advertizing: right now you can't add a nickname to a dive computer that doesn't already have one, because such a dive computer will not have a device structure. But that's a UI issue, and I'll sort that out separately) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
||
|---|---|---|
| .. | ||
| images | ||
| abitofeverything.ssrf | ||
| Demo_SmartTrak.slg | ||
| Dive_2013-02-02-1614.xml | ||
| DL7.xml | ||
| DL7.zxu | ||
| Example.log | ||
| exportprofilereference.csv | ||
| exportprofilereferenceVPMB.csv | ||
| gps-import.gpx | ||
| gps-import.xml | ||
| mergedVyperOstc.xml | ||
| ostc.xml | ||
| ostc_00087_04-05-2014_043m_032min.dive | ||
| ostc_00173_17-08-2013_027m_043min.dive | ||
| Poseidon_MkVILog.csv | ||
| Poseidon_MkVILog.txt | ||
| sac-test.xml | ||
| SampleDivesV2.ssrf | ||
| tank_pressure.xml | ||
| Test.csv | ||
| test0.xml | ||
| test0b.xml | ||
| test1.xml | ||
| test2.xml | ||
| test3.xml | ||
| test4.xml | ||
| test5.xml | ||
| test6.xml | ||
| test7.xml | ||
| test8.xml | ||
| test9.xml | ||
| test9a.xml | ||
| test10.xml | ||
| test11.xml | ||
| test12.xml | ||
| test13.xml | ||
| test14.xml | ||
| test15.xml | ||
| test16.xml | ||
| test17.xml | ||
| test18.xml | ||
| test19.xml | ||
| test20.xml | ||
| test21.xml | ||
| test22.xml | ||
| test23.xml | ||
| test24.xml | ||
| test25.xml | ||
| test26.xml | ||
| test27.xml | ||
| test28.xml | ||
| test29.xml | ||
| test30.xml | ||
| test31.xml | ||
| test32.xml | ||
| test33.xml | ||
| test34.xml | ||
| test35.xml | ||
| test36.xml | ||
| test38.xml | ||
| test40-42.xml | ||
| test40.xml | ||
| test41.csv | ||
| test42.xml | ||
| test43.xml | ||
| test44.xml | ||
| test47+48.xml | ||
| test47.xml | ||
| test47b.xml | ||
| test47c.xml | ||
| test48+47.xml | ||
| test48.xml | ||
| test50.xml | ||
| test51.xml | ||
| TestAPDLogViewer.csv | ||
| TestAtmPress.xml | ||
| TestComma.csv | ||
| TestDiveDivelogsDE.DLD | ||
| TestDiveDivelogsDE.udcf | ||
| TestDiveDivelogsDE.xml | ||
| TestDiveDivingLog5.08.udcf | ||
| TestDiveDivingLog5.08.uddf | ||
| TestDiveDivingLog5.08allimperial.xml | ||
| TestDiveDivingLog5.08allmetric.xml | ||
| TestDiveDivingLog5.08allmetric.zip | ||
| TestDiveDM3.SDE | ||
| TestDiveDM4.db | ||
| TestDiveDM4.xml | ||
| TestDiveDM5.db | ||
| TestDiveDM5.xml | ||
| TestDiveJDiveLog.jlb | ||
| TestDiveSeabearH3_0002SBDT.CSV | ||
| TestDiveSeabearH3_0003SBDT.CSV | ||
| TestDiveSeabearH3_0004SBDT.CSV | ||
| TestDiveSeabearH3_0005SBDT.CSV | ||
| TestDiveSeabearHUDC.csv | ||
| TestDiveSeabearHUDC.xml | ||
| TestDiveSeabearNewFormat.xml | ||
| TestDiveSeabearT1_0001SBDT.CSV | ||
| TestDiveSeabearT1_0002SBDT.CSV | ||
| TestDiveSeabearT1_0003SBDT.CSV | ||
| TestDiveSeabearT1_0004SBDT.CSV | ||
| TestDiveSeabearT1_0005SBDT.CSV | ||
| TestDiveSeacSync.db | ||
| TestDivingLog4.1.1.sql | ||
| TestSensusSingle.csv | ||
| TestXP5_de.csv | ||
| TwoTimesTwo.ssrf | ||
| vyper.xml | ||