diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git index 9da673406..62fd8c145 100644 --- a/Documentation/user-manual.html.git +++ b/Documentation/user-manual.html.git @@ -902,15 +902,43 @@ system of the computer on which Subsurface is running.

  • +If all the dives on the dive computer need to be downloaded, check the + checkbox Force download of all dives. Normally, Subsurface only downloads + dives after the date-time of the last dive in the Dive List panel. If one + or more of your dives in Subsurface have been accidentally deleted or if there + are older dives that still need to be downloaded from the dive computer, this + checkbox needs to be activated. Some dive computers (e.g. Mares Puck) do not provide + a contents list to Subsurface before the download in order to select only new dives. + Consequently, for these dive computers, all dives are downloaded + irrespective of the status of this check box. +

    +
    • +
  • +

    +If the checkbox Always prefer downloaded dives + has been checked and, during download, dives with identical date-times exist on + the dive computer and on the Subsurface + Dive List panel, the record in the Subsurface divelog will be overwritten + by the record from the dive computer +

    +
    • +
  • +

    +Do not check the checkboxes labeled Save libdivecomputer logfile and + Save libdivecomputer dumpfile. These are only used as diagnostic tools + when problems with downloads are experienced (see below). +

    +
    • +
  • +

    The OK button must then be clicked. Dialogue B in the figure above appears.

  • -With communication established, one can see how the data is -retrieved from the -dive computer. +With communication established, one can see how the data are +retrieved from the dive computer. Depending on the make of the dive computer and/or number of recorded dives, this could take some time. The user should be patient. The Download dialogue shows a @@ -918,7 +946,7 @@ progress bar at the bottom of the dialogue (for some dive computers the progress information could be inaccurate as we cannot determine how much downloadable data there is until all data have been downloaded). When the download of the dive information is complete, all the imported dives appear -in the Dive List, sorted by date and time. One can then disconnect and +in the Dive List, sorted by date and time. Disconnect and switch off the dive computer to conserve its battery power. If a particular dive is selected, the Dive Profile panel shows an informative @@ -935,6 +963,7 @@ message will be shown, similar to this text: "Unable to open /dev/ttyUSB0 Mares

    +

    PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?

    +USB port? If not, users should consult Appendix A.
    @@ -949,24 +978,27 @@ software? Has it worked before, or is this the first time the cable is being use 4) Consult Appendix A and make sure that the correct Mount Point was specified (see above). 5) On Unix-like operating systems, does the user have write permission to the -USB port? If not, users should consult appendix A.

    If the Subsurface computer does not recognise the USB adaptor by showing an appropriate device name next to the Mount Point, then there is a possibility that the cable or USB adaptor is faulty. A faulty cable is the most common cause of communication failure between dive computer and Subsurface -computer. It is also possible that the Subsurface computer is missing - data, one should perform a download with the following +computer. It is also possible that the Subsurface computer cannot interpret +the data. Perform a download for diagnostic purposes with the following two check boxes checked in the download dialogue discussed above:

    Save libdivecomputer logfile
 Save libdivecomputer dumpfile
    -

    When checking each of these boxes, the user is prompted to select a folder to -save the file into. The default folder is the one in which the Subsurface -dive log is kept. Important: After downloading, no dives are shown in the +

    Important: These check boxes are only used when problems are ancountered +during the download process: under normal circumstances they should not be checked. +When checking these boxes, the user is prompted to select a folder to +save the information to. The default folder is the one in which the Subsurface +dive log is kept. Important: After downloading with the above checkboxes +checked, no dives are shown in the Dive List but two files are created in the folder selected above:

    @@ -1047,7 +1079,7 @@ were stored using that device.

  • The coordinates can be entered by hand if they are known, using one of -three formats with latitude followed by longitude: +four formats with latitude followed by longitude:

    @@ -1145,7 +1177,7 @@ either press ENTER on the keyboard or click outside the cell that contains the cursor. Information for any additional cylinders can be added by using the
    button at the top right hand. Following is an example of a complete description -for a dive using two cylinders (air and EAN40):

    +for a dive using two cylinders (air and EAN50):

    FIGURE: a completed cylinder dive information table @@ -1200,8 +1232,7 @@ that the new data should be saved.

    -

    3.3. Importing dive information from other digital data sources or other data

    -

    formats

    +

    3.3. Importing dive information from other digital data sources or other data formats

    If a user has been diving for some time, it’s possible that several dives were logged using other dive log software. All this information needs not be typed by hand into Subsurface, because these divelogs can probably be @@ -1296,16 +1327,17 @@ accessible through the Import dialogue are also supported, as explained below.

    3.3.2. Importing from Mares Dive Organiser V2.1

    Since Mares utilise proprietory Microsoft software not compatible with -multi-platform software, these dive logs cannot be directly imported into +multi-platform applications, these dive logs cannot be +directly imported into Subsurface. Mares dive logs need to be imported using a three-step process, using www.divelogs.de as a mechanism to extract the dive information from the file.

    • -The dive log data from Mares Dive Organiser need to be exported to the users +The dive log data from Mares Dive Organiser need to be exported to the user’s desktop, using - a .sdf file name extension. Users should refer to Appendix + a .sdf file name extension. Refer to Appendix C for more information.

      • @@ -1321,8 +1353,8 @@ The instructions must be carefully followed to transfer the dive information

    • -Finally, the instructions below should be followed in order to import dives -from divelogs.de to Subsurface. +Finally, import the dives +from divelogs.de to Subsurface, using the instructions below.

    @@ -1332,13 +1364,13 @@ from divelogs.de to Subsurface.

    The import of dive information from divelogs.de is simple, using a single dialogue box. The Import→Import form Divelogs.de option should be selected from the Main Menu. This -brings up a dialogue box (see figure on left [A] below). one then needs to enter a +brings up a dialogue box (see figure on left [A] below). Enter a user-ID and password for divelogs.de into the appropriate fields and then select the Download button. Download from divelogs.de starts immediately, displaying a progress bar in the dialogue box. At the and of the download, the -succes status is indicated (see figure on the right [B], below). The -Apply button should then be selected. The imported dives appear in the +success status is indicated (see figure on the right [B], below). The +Apply button should then be selected, after which the imported dives appear in the Subsurface Dive List panel.

    @@ -1409,21 +1441,18 @@ ppO2: column 4
    • -

    Armed with this information, importing it into Subsurface is a -straightforward process. User should select -Import→Import Log Files from the main menu. In the appearing file -selection menu, users need to select one or more CSV files. Its format is -detected by the file -extension, and a common configuration dialog is presented for all the -files with a CSV extension. The configuration dialog is like the following:

    +

    Armed with this information, importing the data into Subsurface is +straightforward. Select +Import→Import Log Files from the main menu. In the resulting file +selection menu, select oa CSV files, after which a common configuration dialog +appears for all the +files with a CSV extension:

    FIGURE: CSV download dialogue
    -

    Then the user must specify the name of the CSV file or select it from the -browser button on the right. -There are pre-configured definitions for some dive computers, e.g. the APD +

    There are pre-configured definitions for some dive computers, e.g. the APD rebreathers. If the user’s dive computer is on this list, it should be selected using the dropdown box labeled Pre-configured imports. Finally the OK should be clicked and @@ -3269,7 +3298,7 @@ you may stay in the water for a long time, but spend most of it at the surface.