This is the official upstream of the Subsurface divelog program
Find a file
Dirk Hohndel fe0864be60 Cloud storage: merge local and remote changes if there is no conflict
We still punt if there are any conflicts (which are likely to occur if we
have touched dive sites in both changes). But in my testing at least for
fairly simple, non-conflicting changes this works and creates a correctly
merged tree.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-22 17:52:31 -07:00
.tx
android Open subsurface on attaching divecomputer 2015-08-20 23:01:15 -07:00
android-mobile Use a different package for the mobile app 2015-07-16 18:41:06 -07:00
appdata
cmake/Modules
dives Test dives for Seabear new format import comparison 2015-07-28 08:46:55 -07:00
Documentation Add FAQ item of missing logs to user manual 2015-08-03 22:32:34 -07:00
icons Use mobile icon for subsurface-mobile 2015-07-09 20:47:16 -07:00
marbledata Add 1x1 transparent png to replace missing marble data 2015-07-09 16:38:36 -07:00
packaging Connect up serial_ftdi custom serial 2015-08-20 22:59:54 -07:00
printing_templates Printing: enhance 2 dives template 2015-08-15 15:05:16 +03:00
qt-mobile QML UI: move back button back to the left and center text 2015-07-30 10:13:25 -07:00
qt-models Display dives from the same location on the list 2015-08-20 22:23:25 -07:00
qt-ui Continue to separate logic code from UI code 2015-08-22 07:05:13 -07:00
ReleaseNotes Updates to the ReleaseNotes 2015-08-20 23:14:54 -07:00
scripts Build script: fix install_name for libssrfmarblewidget on Mac 2015-08-16 17:39:25 -07:00
tests Seabear import: fix detection of empty lines 2015-07-28 09:32:53 -07:00
theme HTML export: before showing the dive list, sort descending by dive number 2015-06-18 22:04:11 -07:00
translations
xslt CSV import: imperial support for cylinder pressure 2015-07-31 10:32:27 -07:00
.clang-format
.gitattributes
.gitignore
android.cpp Wire up get_usb_fd to libusb_set_android_open_callback 2015-08-20 22:56:27 -07:00
checkcloudconnection.cpp Move checking the cloud connection into its own files 2015-06-16 06:08:31 -07:00
checkcloudconnection.h Move checking the cloud connection into its own files 2015-06-16 06:08:31 -07:00
CMakeLists.txt Cmake: fix cross compiling on Windows 2015-08-21 10:16:06 -07:00
cochran.c
cochran.h
CodingStyle
color.h
configuredivecomputer.cpp
configuredivecomputer.h
configuredivecomputerthreads.cpp Implement the custom Bluetooth serial communication and use it 2015-07-06 08:37:42 -07:00
configuredivecomputerthreads.h
datatrak.c Code cleanup 2015-07-06 13:59:14 -07:00
datatrak.h Code cleanup 2015-07-06 13:59:14 -07:00
deco.c Use our pressure type to avoid bar / mbar confusion 2015-08-21 10:16:06 -07:00
deco.h
descriptor3.tsv
device.c
device.h When saving only selected dives, only include referenced dive computers 2015-06-10 09:29:04 -07:00
devicedetails.cpp
devicedetails.h
display.h Printing: remove the print_options struct from display.h 2015-06-04 10:07:59 -07:00
dive.c Add simple test for the dive planner 2015-07-05 09:42:38 -07:00
dive.h Use boyle_compensation in profile 2015-08-20 07:28:00 -07:00
divecomputer.cpp When saving only selected dives, only include referenced dive computers 2015-06-10 09:29:04 -07:00
divecomputer.h
divelist.c QML UI: make sure the dive list is empty before loading dives 2015-07-24 13:18:30 -07:00
divelist.h QML UI: make sure the dive list is empty before loading dives 2015-07-24 13:18:30 -07:00
divelogexportlogic.cpp HTML export: separate UI and logic code 2015-06-16 14:04:41 -07:00
divelogexportlogic.h HTML export: separate UI and logic code 2015-06-16 14:04:41 -07:00
divesite.c Allow creating new dive site with specific uuid 2015-07-24 13:20:57 -07:00
divesite.h Allow creating new dive site with specific uuid 2015-07-24 13:20:57 -07:00
divesitehelpers.cpp Geo taxonomy: special case for looking up data of the displayed dive site 2015-07-15 21:28:17 -07:00
divesitehelpers.h Geo taxonomy: download the taxonomy data from geonames.org 2015-07-02 06:50:49 -07:00
equipment.c Round MOD of gas rather than truncate 2015-07-05 15:53:49 -07:00
exif.cpp
exif.h
export-html.cpp HTML standalone exporter: use Subsurface dive numbers 2015-06-18 12:23:30 -07:00
file.c Fix MKVI erroneous sample time 2015-08-17 21:41:19 -07:00
file.h
gaspressures.c Prevent theoretical out of bounds access 2015-06-21 21:17:42 -07:00
gaspressures.h
gettext.h
gettextfromc.cpp
gettextfromc.h
git-access.c Cloud storage: merge local and remote changes if there is no conflict 2015-08-22 17:52:31 -07:00
git-access.h Cloud storage: make do_git_save available to other modules 2015-06-13 18:36:04 -07:00
gpl-2.0.txt
helpers.h
INSTALL INSTALL file: update Mac build instructions 2015-08-16 17:42:55 -07:00
libdivecomputer.c Connect up serial_ftdi custom serial 2015-08-20 22:59:54 -07:00
libdivecomputer.h Connect up serial_ftdi custom serial 2015-08-20 22:59:54 -07:00
linux.c Fix startup crash with missing HOME or LOGNAME environment variables 2015-08-19 10:11:31 -07:00
liquivision.c Avoid duplicate divesites on Liquivision import 2015-08-19 10:14:56 -07:00
load-git.c RBT - Add load/save in git storage support 2015-07-30 07:43:16 -07:00
macos.c
main.cpp Add extra logs for custom serial Bluetooth implementation 2015-07-06 08:38:12 -07:00
membuffer.c
membuffer.h
ostctools.c OSTCTools - Improve error management (II) 2015-07-13 15:21:30 -07:00
parse-xml.c Fix bit shift on Suunto DB import 2015-08-09 23:55:03 -07:00
planner.c Use our pressure type to avoid bar / mbar confusion 2015-08-21 10:16:06 -07:00
planner.h Leftovers from introduction of in_planner() helper function 2015-08-20 07:25:01 -07:00
pref.h Revert "Pref. to ascent to next stop only when stop is below ceiling" 2015-08-18 06:40:35 -07:00
prefs-macros.h Move initialization of preferences to helper function 2015-07-25 22:08:25 -07:00
printer.cpp Printing: remove silly white line at end of each page 2015-08-15 15:05:26 +03:00
printer.h Printing: don't break dives into successive pages 2015-08-15 15:04:45 +03:00
profile.c Use boyle_compensation in profile 2015-08-20 07:28:00 -07:00
profile.h Add support for RBT reported sample value 2015-07-30 07:43:16 -07:00
qt-gui.cpp QML UI: Sort dives by date 2015-07-22 19:09:49 +03:00
qt-gui.h QML UI: implement a message area to show information to the user 2015-07-12 17:39:13 -07:00
qt-init.cpp Separate initializing Qt from initializing the UI 2015-06-16 14:05:09 -07:00
qthelper.cpp Continue to separate logic code from UI code 2015-08-22 07:05:13 -07:00
qthelper.h Continue to separate logic code from UI code 2015-08-22 07:05:13 -07:00
qthelperfromc.h HTML export: need to work harder to find the pictures 2015-06-21 12:49:05 -07:00
qtserialbluetooth.cpp Add implementation for BTH custom serial write method used on Windows 2015-08-20 22:45:31 -07:00
README README should mention that this is not a release 2015-06-09 17:42:30 -07:00
Readme.testing
Readme.ubuntu
satellite.svg
save-git.c Always save taxonomy data, even if disabled in the prefs 2015-08-20 11:05:07 -07:00
save-html.c HTML export: need to work harder to find the pictures 2015-06-21 12:49:05 -07:00
save-html.h Move helper declarations into a better header file 2015-06-21 07:45:22 -07:00
save-xml.c Always save taxonomy data, even if disabled in the prefs 2015-08-20 11:05:07 -07:00
serial_ftdi.c Turn serial_ftdi.c into a custom_serial 2015-08-20 22:59:49 -07:00
sha1.c
sha1.h
statistics.c
statistics.h
strndup.h Add strndup.h header so we can use this useful function 2015-05-31 23:14:56 -07:00
strtod.c
subsurface-icon.svg
subsurface-mobile-icon.svg Add different icon for mobile app 2015-07-09 16:37:43 -07:00
subsurface.desktop
subsurface.qrc Use mobile icon for subsurface-mobile 2015-07-09 20:47:16 -07:00
subsurfacestartup.c Revert "Pref. to ascent to next stop only when stop is below ceiling" 2015-08-18 06:40:35 -07:00
subsurfacestartup.h
subsurfacesysinfo.cpp
subsurfacesysinfo.h
SupportedDivecomputers.html
SupportedDivecomputers.txt
taxonomy.c Geo taxonomy: correctly store / update the categories 2015-07-13 15:21:30 -07:00
taxonomy.h Geo taxonomy: correctly store / update the categories 2015-07-13 15:21:30 -07:00
templatelayout.cpp Printing: insert placeholders in empty feilds 2015-08-15 15:02:59 +03:00
templatelayout.h Printing: export border to templates 2015-08-15 15:04:11 +03:00
terms
time.c
TODO.CCR
uemis-downloader.c Uemis downloader: create the req.txt file if it went missing 2015-06-24 20:59:49 -07:00
uemis.c
uemis.h
units.h Location completer: give distance if known 2015-07-14 11:52:17 -07:00
version.c
version.h
webservice.h
windows.c Windows support: correct helper function name 2015-06-18 23:37:22 -07:00
windowtitleupdate.cpp Re-fix silly typo 2015-06-17 05:27:18 -07:00
windowtitleupdate.h Code cleanup: implement window title update via signal 2015-06-16 06:04:34 -07:00
worldmap-options.h
worldmap-save.c
worldmap-save.h
wreck.jpg

This is the README file for Subsurface master towards 4.5

Please check the ReleaseNotes.txt for details about new features and
changes since Subsurface 4.4.2 (and earlier versions).

Subsurface can be found at http://subsurface-divelog.org

Our user forum is at http://subsurface-divelog.org/user-forum/
We also try to respond to questions in the ScubaBoard.com dive software
forum at http://www.scubaboard.com/forums/dive-software/

Report bugs and issues at http://trac.subsurface-divelog.org

License: GPLv2

You can get the sources to the latest development version from the git
repository:

git clone git://git.subsurface-divelog.org/subsurface.git .

You can also browse the sources via gitweb at the same site.

If you want the latest release (instead of the bleeding edge
development version) you can either get this via git or the release tar
ball. After cloning run the following command:

git checkout v4.4.2  (or whatever the last release is)

or download a tar ball from:

http://subsurface-divelog.org/downloads/Subsurface-4.4.2.tgz

Detailed build instructions can be found in the INSTALL file.

Basic Usage:
============

Install and start from the desktop, or you can run it locally from the
build directory:

On Linux:

$ ./subsurface

On Mac:

$ open Subsurface.app

Native builds on Windows are not really supported (the official Windows
installers are both cross-built on Linux).

You can give a data file as command line argument, or (once you have
set this up in the Preferences) Subsurface picks a default file for
you when started from the desktop or without an argument.

If you have a dive computer supported by libdivecomputer, you can just
select "Import from Divecomputer" from the "Import" menu, select which
dive computer you have (and where it is connected if you need to), and
hit "OK".

The latest list of supported dive computers can be found in the file
SupportedDivecomputers.txt.

Much more detailed end user instructions can be found from inside
Subsurface by selecting Help (typically F1). When building from source
this is also available as Documentation/user-manual.html. The
documentation for the latest release is also available on-line
http://subsurface-divelog.org/documentation/


Contributing:
=============

There is a mailing list for developers: subsurface@subsurface-divelog.org
Go to http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
to subscribe.

If you want to contribute code, please either send signed-off patches or
a pull request with signed-off commits.  If you don't sign off on them,
we will not accept them. This means adding a line that says
"Signed-off-by: Name <email>" at the end of each commit, indicating that
you wrote the code and have the right to pass it on as an open source
patch.

See: http://developercertificate.org/

Also, please write good git commit messages.  A good commit message
looks like this:

	Header line: explain the commit in one line (use the imperative)

	Body of commit message is a few lines of text, explaining things
	in more detail, possibly giving some background about the issue
	being fixed, etc etc.

	The body of the commit message can be several paragraphs, and
	please do proper word-wrap and keep columns shorter than about
	74 characters or so. That way "git log" will show things
	nicely even when it's indented.

	Make sure you explain your solution and why you're doing what you're
	doing, as opposed to describing what you're doing. Reviewers and your
	future self can read the patch, but might not understand why a
	particular solution was implemented.

	Reported-by: whoever-reported-it
	Signed-off-by: Your Name <youremail@yourhost.com>

where that header line really should be meaningful, and really should be
just one line.  That header line is what is shown by tools like gitk and
shortlog, and should summarize the change in one readable line of text,
independently of the longer explanation. Please use verbs in the
imperative in the commit message, as in "Fix bug that...", "Add
file/feature ...", or "Make Subsurface..."


A bit of Subsurface history:
============================

In fall of 2011, when a forced lull in kernel development gave him an
opportunity to start on a new endeavor, Linus Torvalds decided to tackle
his frustration with the lack of decent divelog software on Linux.

Subsurface is the result of the work of him and a team of developers since
then. It now supports Linux, Windows and MacOS and allows data import from
a large number of dive computers and several existing divelog programs. It
provides advanced visualization of the key information provided by a
modern dive computer and allows the user to track a wide variety of data
about their diving.

In fall of 2012 Dirk Hohndel took over as maintainer of Subsurface.