From 0f63b524a67302e257353638152f2ff4bb2c54f6 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Fri, 16 Oct 2015 14:25:56 +0200 Subject: [PATCH] Mention Shearwater Nerd alongside Petrell 2 since this seems to be the same computer internally. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- Documentation/FAQ.wordpress | 3 ++- Documentation/user-manual.txt | 9 +++++---- SupportedDivecomputers.html | 4 ++-- SupportedDivecomputers.txt | 4 ++-- dive.c | 3 ++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Documentation/FAQ.wordpress b/Documentation/FAQ.wordpress index 97bc63d35..cd26f0d50 100644 --- a/Documentation/FAQ.wordpress +++ b/Documentation/FAQ.wordpress @@ -136,7 +136,7 @@ Setting up a connection to download dives from your Bluetooth-enabled device, su Users have reported difficulties with some Bluetooth controllers. If you have an onboard controller, try that first. It is simplest if you remove any USB Bluetooth dongles. If you have a USB dongle that came with your dive computer, try that before any others. -Make sure you know how to put your dive computer into upload mode. On the Shearwater Petrel and Petrel 2, cycle through the menu, select 'Dive Log', then 'Upload Log'. The display will read 'Initializing', then 'Wait PC 3:00' and will countdown. Once the connection is established, the display reads 'Wait CMD ...' and the countdown continues. When downloading the dive from Subsurface, the display reads 'Sending' then 'Sent Dive'. +Make sure you know how to put your dive computer into upload mode. On the Shearwater Petrel, Petrel 2 and Nerd, cycle through the menu, select 'Dive Log', then 'Upload Log'. The display will read 'Initializing', then 'Wait PC 3:00' and will countdown. Once the connection is established, the display reads 'Wait CMD ...' and the countdown continues. When downloading the dive from Subsurface, the display reads 'Sending' then 'Sent Dive'. To establish the connection you need to have root access through sudo or su, and you will need to have the correct permissions on your system to download the dives. On Fedora 22 and probably most other systems, this means becoming a member of the dialout group if you are not already. This can be done graphically, or on the command terminal, enter: 
sudo usermod -a -G dialout username
@@ -204,6 +204,7 @@ The command to establish an RFCOMM connection is: [channel] is the dive computer's Bluetooth channel we need to connect to. If you omit it, channel 1 will be assumed. Based on a limited number of user reports, the channel for different dive computers is probably:
  • Shearwater Petrel 2: channel 5 +
  • Shearwater Nerd: channel 5
  • Shearwater Petrel 1: channel 1
  • OSTC Sport: Channel 1
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 6c7d7f2dd..fc87e3a90 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -3576,14 +3576,14 @@ dives. [icon="images/icons/bluetooth.jpg"] [NOTE] For dive computers communicating through Bluetooth like the Heinrichs -Weikamp Frog or the Shearwater Predator and Petrel there is a +Weikamp Frog or the Shearwater Predator, Petrel, and Nerd there is a different procedure to get the devices name to communicate with _Subsurface_. Follow these steps: * *For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.* For Bluetooth pairing of the dive computer, refer to the -manufacturer's user guide. When using a Shearwater Predator/Petrel, select +manufacturer's user guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log -> Upload Log_ and wait for the _Wait PC_ message. * *Pair the _Subsurface_ computer with the dive computer.* @@ -3630,7 +3630,7 @@ It is essentially a three step process. - Establish an RFCOMM connection - Download the dives with Subsurface -Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and _Petrel 2_, +Ensure the dive computer is in upload mode. On the _Shearwater Petrel_, _Petrel 2_, and _Nerd_ cycle through the menu, select 'Dive Log', then 'Upload Log'. The display will read 'Initializing', then 'Wait PC 3:00' and will countdown. Once the connection is established, the display reads 'Wait CMD ...' and the countdown continues. When downloading the dive from Subsurface, the display reads 'Sending' then @@ -3733,6 +3733,7 @@ If one omits it, channel 1 is assumed. Based on a limited number of user report the appropriate channel for the dive computer is probably: - _Shearwater Petrel 2_: channel 5 +- _Shearwater Nerd_: channel 5 - _Shearwater Petrel 1_: channel 1 - _Heinrichs-Weikamp OSTC Sport_: channel 1 @@ -3873,7 +3874,7 @@ _Subsurface_ *Dive Profile* panel but please note that the deco calculated by _Subsurface_ will most likely differ from the one displayed on the xDEEP BLACK. -=== Importing from Shearwater Predator/Petrel using Bluetooth +=== Importing from Shearwater Predator/Petrel/Nerd using Bluetooth [icon="images/icons/predator.jpg"] [NOTE] diff --git a/SupportedDivecomputers.html b/SupportedDivecomputers.html index 953ea3d1d..6d72dce95 100644 --- a/SupportedDivecomputers.html +++ b/SupportedDivecomputers.html @@ -41,7 +41,7 @@
  • XP5
    • Shearwater
      -
    • Petrel, Predator
    +
  • Petrel, Predator, Nerd
    • Sherwood
    • Amphos, Insight, Insight 2, Wisdom, Wisdom 2, Wisdom 3
    @@ -65,4 +65,4 @@
  • N2iTiON3
    • - \ No newline at end of file + diff --git a/SupportedDivecomputers.txt b/SupportedDivecomputers.txt index 7951f437f..ff519895e 100644 --- a/SupportedDivecomputers.txt +++ b/SupportedDivecomputers.txt @@ -14,11 +14,11 @@ Oceanic: Atom 1.0, Atom 2.0, Atom 3.0, Atom 3.1, Datamask, Geo, Geo 2.0, OC1, OC Reefnet: Sensus, Sensus Pro, Sensus Ultra Scubapro: Chromis, Meridian, XTender 5 Seemann: XP5 -Shearwater: Petrel, Petrel 2, Predator +Shearwater: Petrel, Petrel 2, Predator, Nerd Sherwood: Amphos, Amphos Air, Insight, Insight 2, Wisdom, Wisdom 2, Wisdom 3 Subgear: XP Air, XP-10, XP-3G Suunto: Cobra, Cobra 2, Cobra 3, D3, D4, D4i, D6, D6i, D9, D9tx, DX, EON Steel, Eon, Gekko, HelO2, Mosquito, Solution, Solution Alpha, Solution Nitrox, Spyder, Stinger, Vyper, Vyper 2, Vyper Air, Vytec, Zoop Tusa: Element II (IQ-750), IQ-700, Zen (IQ-900), Zen Air (IQ-950) Uemis: Zürich SDA Uwatec: Aladin 2G, Aladin 2G, Aladin Air Twin, Aladin Air Z, Aladin Air Z Nitrox, Aladin Air Z O2, Aladin Prime, Aladin Pro, Aladin Pro Ultra, Aladin Sport Plus, Aladin Tec, Aladin Tec 2G, Galileo Luna, Galileo Sol, Galileo Terra, Galileo Trimix, Memomouse, Smart Com, Smart Pro, Smart Tec, Smart Z -Zeagle: N2iTiON3 \ No newline at end of file +Zeagle: N2iTiON3 diff --git a/dive.c b/dive.c index 18101094e..dfd5b495c 100644 --- a/dive.c +++ b/dive.c @@ -900,7 +900,8 @@ void update_setpoint_events(struct divecomputer *dc) if (dc->divemode == OC && (same_string(dc->model, "Shearwater Predator") || - same_string(dc->model, "Shearwater Petrel"))) { + same_string(dc->model, "Shearwater Petrel") || + same_string(dc->model, "Shearwater Nerd"))) { // make sure there's no setpoint in the samples // this is an irreversible change - so switching a dive to OC // by mistake when it's actually CCR is _bad_