March 2014 - devel - libdivecomputer.org

Problems while using divecomputer-simulator for linux
by Venkatesh Shukla IIT BHU 02 Apr '14

02 Apr '14

Hello guys I am facing certain errors while trying to use simulator with universal script. I have taken the following steps. 1. I git cloned the libdivecomputer repository. Then I used these commands to compile and build. $ autoreconf --install $ ./configure --enable-pty --disable-shared $ make $ sudo make install 2. Then I used socat to make virtual serial connections. I confirmed that files ttyS0 and ttyS1 are present in /tmp folder $ socat PTY,link=/tmp/ttyS0 PTY,link=/tmp/ttyS1 3. I attached binary of Suunto Gekko to /tmp/ttyS0 $ ./simulator-linux -b vyper -p /tmp/ttyS0 -l simulator.logs gekko.linus.bin > CONFIGURATION: > backend=3 > devname=/tmp/ttyS0 > devtime=0 > systime=0 > model=0 > filename=gekko.linus.bin > size=8192 > header=gekko.linus.bin.header, size=0 > systime=gekko.linus.bin.systime, ticks=0 > lines=0 0 > is_spyder=0 4. I tried to download the dive data present in this binary by using both subsurface and the universal script. $ ./universal -n "Suunto Gekko" -b vyper -l divedownload.log -d divelogs.xml /tmp/ttyS1 > DATETIME 2014-03-30T18:00:39Z (1396202439) > VERSION 0.5.0-devel (fa90009c293a9ca1a4eaf49a478b381477695c0a) > Opening the device (Suunto Gekko, /tmp/ttyS1). > ERROR: Invalid argument (22) [in ../../source/src/serial_posix.c:415 (serial_configure)] > ERROR: Failed to set the terminal attributes. [in ../../source/src/suunto_vyper.c:121 (suunto_vyper_device_open)] > ../../source/examples/universal.c:681: Error opening device. > Result: Input/output error It used to work earlier. I don't understand what went wrong. I also tried switching to the release-0.4 branch. But the error persists. Can anyone please help? *Venkatesh Shukla B. Tech ( Electrical Engineering )III YearIndian Institute of TechnologyBanaras Hindu UniversityPh No. +91 8960 579 122* *Email: venkatesh.shukla.eee11(a)iitbhu.ac.in <venkatesh.shukla.eee11(a)iitbhu.ac.in>*

4 12

[PATCH] Fix building for Android
by Anton Lundin 28 Mar '14

28 Mar '14

This makes libdivecomputer build via Android NDK. Its currently unusable due to the fact that Android usually doesn't provide any kernel serial drivers. Signed-off-by: Anton Lundin <glance(a)acc.umu.se> --- src/serial_posix.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/serial_posix.c b/src/serial_posix.c index 2748957..fc0e79e 100644 --- a/src/serial_posix.c +++ b/src/serial_posix.c @@ -53,6 +53,11 @@ #define NOPTY 1 #endif +/* Android is missing tcdrain, so use ioctl version instead */ +#ifdef __ANDROID__ +#define tcdrain(x) ioctl(x, TCSBRK, 1) +#endif + #include "serial.h" #include "context-private.h" @@ -433,7 +438,7 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int // Configure a custom baudrate if necessary. if (custom) { -#if defined(TIOCGSERIAL) && defined(TIOCSSERIAL) +#if defined(TIOCGSERIAL) && defined(TIOCSSERIAL) && !defined(__ANDROID__) // Get the current settings. struct serial_struct ss; if (ioctl (device->fd, TIOCGSERIAL, &ss) != 0 && NOPTY) { -- 1.8.3.2

2 4

NitekQ sample logs...
by William Perry 25 Mar '14

25 Mar '14

Are you still looking for NitekQ sample logs? I just purchased a few to use on my technical dives, and a friend has a new one as well. No ‘real’ dives on them yet, but there should be some soon. -Bill

2 9

[PATCH] remove trailing whitespaces
by Florian Klink 19 Mar '14

19 Mar '14

most of them appear in the disclaimers, but some are in the code as well. --- COPYING | 2 +- examples/mares_nemo_test.c | 10 ++--- examples/mares_puck_test.c | 10 ++--- examples/oceanic_atom2_test.c | 10 ++--- examples/oceanic_veo250_test.c | 10 ++--- examples/oceanic_vtpro_test.c | 10 ++--- examples/reefnet_sensus_test.c | 10 ++--- examples/reefnet_sensuspro_test.c | 10 ++--- examples/reefnet_sensusultra_test.c | 10 ++--- examples/suunto_d9_test.c | 10 ++--- examples/suunto_eon_test.c | 10 ++--- examples/suunto_vyper2_test.c | 10 ++--- examples/suunto_vyper_test.c | 10 ++--- examples/utils.c | 10 ++--- examples/utils.h | 10 ++--- examples/uwatec_memomouse_test.c | 10 ++--- examples/uwatec_smart_test.c | 10 ++--- include/libdivecomputer/device.h | 10 ++--- include/libdivecomputer/mares.h | 10 ++--- include/libdivecomputer/mares_nemo.h | 10 ++--- include/libdivecomputer/mares_puck.h | 10 ++--- include/libdivecomputer/oceanic.h | 10 ++--- include/libdivecomputer/oceanic_atom2.h | 10 ++--- include/libdivecomputer/oceanic_veo250.h | 10 ++--- include/libdivecomputer/oceanic_vtpro.h | 10 ++--- include/libdivecomputer/parser.h | 10 ++--- include/libdivecomputer/reefnet.h | 10 ++--- include/libdivecomputer/reefnet_sensus.h | 10 ++--- include/libdivecomputer/reefnet_sensuspro.h | 10 ++--- include/libdivecomputer/reefnet_sensusultra.h | 10 ++--- include/libdivecomputer/suunto.h | 10 ++--- include/libdivecomputer/suunto_d9.h | 10 ++--- include/libdivecomputer/suunto_eon.h | 10 ++--- include/libdivecomputer/suunto_solution.h | 10 ++--- include/libdivecomputer/suunto_vyper.h | 10 ++--- include/libdivecomputer/suunto_vyper2.h | 10 ++--- include/libdivecomputer/units.h | 10 ++--- include/libdivecomputer/uwatec.h | 10 ++--- include/libdivecomputer/uwatec_aladin.h | 10 ++--- include/libdivecomputer/uwatec_memomouse.h | 10 ++--- include/libdivecomputer/uwatec_smart.h | 10 ++--- m4/pkg.m4 | 4 +- src/Makefile.am | 2 +- src/array.c | 10 ++--- src/array.h | 10 ++--- src/checksum.c | 22 +++++----- src/checksum.h | 10 ++--- src/device-private.h | 10 ++--- src/device.c | 10 ++--- src/irda.c | 26 ++++++------ src/irda.h | 10 ++--- src/mares_nemo.c | 10 ++--- src/mares_nemo_parser.c | 10 ++--- src/mares_puck.c | 10 ++--- src/oceanic_atom2.c | 12 +++--- src/oceanic_common.c | 10 ++--- src/oceanic_common.h | 10 ++--- src/oceanic_veo250.c | 12 +++--- src/oceanic_vtpro.c | 10 ++--- src/parser-private.h | 10 ++--- src/parser.c | 10 ++--- src/reefnet_sensus.c | 12 +++--- src/reefnet_sensus_parser.c | 12 +++--- src/reefnet_sensuspro.c | 12 +++--- src/reefnet_sensuspro_parser.c | 14 +++---- src/reefnet_sensusultra.c | 12 +++--- src/reefnet_sensusultra_parser.c | 14 +++---- src/ringbuffer.c | 10 ++--- src/ringbuffer.h | 10 ++--- src/serial.h | 12 +++--- src/serial_posix.c | 16 ++++---- src/serial_win32.c | 20 ++++----- src/suunto_common.c | 12 +++--- src/suunto_common.h | 10 ++--- src/suunto_d9.c | 10 ++--- src/suunto_d9_parser.c | 10 ++--- src/suunto_eon.c | 10 ++--- src/suunto_eon_parser.c | 10 ++--- src/suunto_solution.c | 10 ++--- src/suunto_solution_parser.c | 10 ++--- src/suunto_vyper.c | 58 +++++++++++++-------------- src/suunto_vyper2.c | 10 ++--- src/suunto_vyper_parser.c | 10 ++--- src/uwatec_aladin.c | 16 ++++---- src/uwatec_memomouse.c | 18 ++++----- src/uwatec_memomouse_parser.c | 10 ++--- src/uwatec_smart.c | 10 ++--- src/uwatec_smart_parser.c | 10 ++--- 88 files changed, 494 insertions(+), 494 deletions(-) diff --git a/COPYING b/COPYING index 5ab7695..602bfc9 100644 --- a/COPYING +++ b/COPYING @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/examples/mares_nemo_test.c b/examples/mares_nemo_test.c index 6a0d118..4028762 100644 --- a/examples/mares_nemo_test.c +++ b/examples/mares_nemo_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/mares_puck_test.c b/examples/mares_puck_test.c index c27a87a..c6e37e2 100644 --- a/examples/mares_puck_test.c +++ b/examples/mares_puck_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/oceanic_atom2_test.c b/examples/oceanic_atom2_test.c index 63ec51e..60aac1a 100644 --- a/examples/oceanic_atom2_test.c +++ b/examples/oceanic_atom2_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/oceanic_veo250_test.c b/examples/oceanic_veo250_test.c index d0b08a7..c26de85 100644 --- a/examples/oceanic_veo250_test.c +++ b/examples/oceanic_veo250_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/oceanic_vtpro_test.c b/examples/oceanic_vtpro_test.c index 8493ce6..d360059 100644 --- a/examples/oceanic_vtpro_test.c +++ b/examples/oceanic_vtpro_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/reefnet_sensus_test.c b/examples/reefnet_sensus_test.c index dc6a345..9d7d29e 100644 --- a/examples/reefnet_sensus_test.c +++ b/examples/reefnet_sensus_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/reefnet_sensuspro_test.c b/examples/reefnet_sensuspro_test.c index 0115708..a873589 100644 --- a/examples/reefnet_sensuspro_test.c +++ b/examples/reefnet_sensuspro_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/reefnet_sensusultra_test.c b/examples/reefnet_sensusultra_test.c index 96b5586..9ac9826 100644 --- a/examples/reefnet_sensusultra_test.c +++ b/examples/reefnet_sensusultra_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/suunto_d9_test.c b/examples/suunto_d9_test.c index 20b88c2..49a0ad3 100644 --- a/examples/suunto_d9_test.c +++ b/examples/suunto_d9_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/suunto_eon_test.c b/examples/suunto_eon_test.c index 141848b..d5821b9 100644 --- a/examples/suunto_eon_test.c +++ b/examples/suunto_eon_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/suunto_vyper2_test.c b/examples/suunto_vyper2_test.c index b7daeb0..368aae3 100644 --- a/examples/suunto_vyper2_test.c +++ b/examples/suunto_vyper2_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/suunto_vyper_test.c b/examples/suunto_vyper_test.c index 85b2295..aaf9927 100644 --- a/examples/suunto_vyper_test.c +++ b/examples/suunto_vyper_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/utils.c b/examples/utils.c index 5206bc0..9d0768f 100644 --- a/examples/utils.c +++ b/examples/utils.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/utils.h b/examples/utils.h index ff22a45..e43c06c 100644 --- a/examples/utils.h +++ b/examples/utils.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/uwatec_memomouse_test.c b/examples/uwatec_memomouse_test.c index d482ecd..e27cdac 100644 --- a/examples/uwatec_memomouse_test.c +++ b/examples/uwatec_memomouse_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/examples/uwatec_smart_test.c b/examples/uwatec_smart_test.c index fc9ba4f..c6ee688 100644 --- a/examples/uwatec_smart_test.c +++ b/examples/uwatec_smart_test.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/device.h b/include/libdivecomputer/device.h index 5dc57b3..7ba4bd6 100644 --- a/include/libdivecomputer/device.h +++ b/include/libdivecomputer/device.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/mares.h b/include/libdivecomputer/mares.h index 2aa1128..c7af850 100644 --- a/include/libdivecomputer/mares.h +++ b/include/libdivecomputer/mares.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/mares_nemo.h b/include/libdivecomputer/mares_nemo.h index 33891f3..4ced926 100644 --- a/include/libdivecomputer/mares_nemo.h +++ b/include/libdivecomputer/mares_nemo.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/mares_puck.h b/include/libdivecomputer/mares_puck.h index 4a45f83..6706474 100644 --- a/include/libdivecomputer/mares_puck.h +++ b/include/libdivecomputer/mares_puck.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/oceanic.h b/include/libdivecomputer/oceanic.h index 7f3a9d5..f889120 100644 --- a/include/libdivecomputer/oceanic.h +++ b/include/libdivecomputer/oceanic.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/oceanic_atom2.h b/include/libdivecomputer/oceanic_atom2.h index c8cce4f..4c52420 100644 --- a/include/libdivecomputer/oceanic_atom2.h +++ b/include/libdivecomputer/oceanic_atom2.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/oceanic_veo250.h b/include/libdivecomputer/oceanic_veo250.h index 53df7b2..aaeee46 100644 --- a/include/libdivecomputer/oceanic_veo250.h +++ b/include/libdivecomputer/oceanic_veo250.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/oceanic_vtpro.h b/include/libdivecomputer/oceanic_vtpro.h index e862694..ba693f6 100644 --- a/include/libdivecomputer/oceanic_vtpro.h +++ b/include/libdivecomputer/oceanic_vtpro.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/parser.h b/include/libdivecomputer/parser.h index 16ca2b3..65b18c9 100644 --- a/include/libdivecomputer/parser.h +++ b/include/libdivecomputer/parser.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/reefnet.h b/include/libdivecomputer/reefnet.h index e574c60..ad3fb36 100644 --- a/include/libdivecomputer/reefnet.h +++ b/include/libdivecomputer/reefnet.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/reefnet_sensus.h b/include/libdivecomputer/reefnet_sensus.h index ec7dfcd..96ff5ba 100644 --- a/include/libdivecomputer/reefnet_sensus.h +++ b/include/libdivecomputer/reefnet_sensus.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/reefnet_sensuspro.h b/include/libdivecomputer/reefnet_sensuspro.h index fc5571f..e092fef 100644 --- a/include/libdivecomputer/reefnet_sensuspro.h +++ b/include/libdivecomputer/reefnet_sensuspro.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/reefnet_sensusultra.h b/include/libdivecomputer/reefnet_sensusultra.h index 0eaf721..4cff902 100644 --- a/include/libdivecomputer/reefnet_sensusultra.h +++ b/include/libdivecomputer/reefnet_sensusultra.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto.h b/include/libdivecomputer/suunto.h index 8872ea0..337dffd 100644 --- a/include/libdivecomputer/suunto.h +++ b/include/libdivecomputer/suunto.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto_d9.h b/include/libdivecomputer/suunto_d9.h index 734efd8..d177c6c 100644 --- a/include/libdivecomputer/suunto_d9.h +++ b/include/libdivecomputer/suunto_d9.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto_eon.h b/include/libdivecomputer/suunto_eon.h index 31d8c7d..3ee1277 100644 --- a/include/libdivecomputer/suunto_eon.h +++ b/include/libdivecomputer/suunto_eon.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto_solution.h b/include/libdivecomputer/suunto_solution.h index 6f5b210..619eb88 100644 --- a/include/libdivecomputer/suunto_solution.h +++ b/include/libdivecomputer/suunto_solution.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto_vyper.h b/include/libdivecomputer/suunto_vyper.h index 651d5ec..a730b95 100644 --- a/include/libdivecomputer/suunto_vyper.h +++ b/include/libdivecomputer/suunto_vyper.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/suunto_vyper2.h b/include/libdivecomputer/suunto_vyper2.h index dabde04..8619b3d 100644 --- a/include/libdivecomputer/suunto_vyper2.h +++ b/include/libdivecomputer/suunto_vyper2.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/units.h b/include/libdivecomputer/units.h index f1c6a44..0636759 100644 --- a/include/libdivecomputer/units.h +++ b/include/libdivecomputer/units.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/uwatec.h b/include/libdivecomputer/uwatec.h index 572d1dd..4ab1eec 100644 --- a/include/libdivecomputer/uwatec.h +++ b/include/libdivecomputer/uwatec.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/uwatec_aladin.h b/include/libdivecomputer/uwatec_aladin.h index b73a755..73226a9 100644 --- a/include/libdivecomputer/uwatec_aladin.h +++ b/include/libdivecomputer/uwatec_aladin.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/uwatec_memomouse.h b/include/libdivecomputer/uwatec_memomouse.h index d6e2d2e..7eb5dc0 100644 --- a/include/libdivecomputer/uwatec_memomouse.h +++ b/include/libdivecomputer/uwatec_memomouse.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/include/libdivecomputer/uwatec_smart.h b/include/libdivecomputer/uwatec_smart.h index d0c9870..9f753eb 100644 --- a/include/libdivecomputer/uwatec_smart.h +++ b/include/libdivecomputer/uwatec_smart.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/m4/pkg.m4 b/m4/pkg.m4 index 9bb3e06..d9becf2 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -1,6 +1,6 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) -# +# # Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. # # This program is free software; you can redistribute it and/or modify @@ -121,7 +121,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs diff --git a/src/Makefile.am b/src/Makefile.am index 6a39b36..595f0c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,7 @@ if OS_WIN32 libdivecomputer_la_SOURCES += libdivecomputer.rc endif -libdivecomputer_la_DEPENDENCIES = libdivecomputer.exp +libdivecomputer_la_DEPENDENCIES = libdivecomputer.exp libdivecomputer.exp: libdivecomputer.symbols $(AM_V_GEN) sed -e '/^$$/d' $< > $@ diff --git a/src/array.c b/src/array.c index b51b47b..243ec34 100644 --- a/src/array.c +++ b/src/array.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/array.h b/src/array.h index 3d8ef47..b08ed2e 100644 --- a/src/array.h +++ b/src/array.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/checksum.c b/src/checksum.c index aa06edd..8caf563 100644 --- a/src/checksum.c +++ b/src/checksum.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -82,14 +82,14 @@ checksum_crc_ccitt_uint16 (const unsigned char data[], unsigned int size) 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, diff --git a/src/checksum.h b/src/checksum.h index f078ef8..4e54d45 100644 --- a/src/checksum.h +++ b/src/checksum.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/device-private.h b/src/device-private.h index 7ac530e..8e183fb 100644 --- a/src/device-private.h +++ b/src/device-private.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/device.c b/src/device.c index 41738a5..9fad7a2 100644 --- a/src/device.c +++ b/src/device.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/irda.c b/src/irda.c index 4b6b77b..c80a613 100644 --- a/src/irda.c +++ b/src/irda.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -99,12 +99,12 @@ irda_socket_open (irda_t **out, dc_context_t *context) // Confirm that the winsock dll supports version 2.2. // Note that if the dll supports versions greater than 2.2 in addition to // 2.2, it will still return 2.2 since that is the version we requested. - if (LOBYTE (wsaData.wVersion) != 2 || + if (LOBYTE (wsaData.wVersion) != 2 || HIBYTE (wsaData.wVersion) != 2) { ERROR (context, "Incorrect winsock version."); WSACleanup (); free (device); - return -1; + return -1; } #endif @@ -251,7 +251,7 @@ irda_socket_discover (irda_t *device, irda_callback_t callback, void *userdata) #ifdef _WIN32 for (unsigned int i = 0; i < list->numDevice; ++i) { unsigned int address = array_uint32_le (list->Device[i].irdaDeviceID); - unsigned int hints = (list->Device[i].irdaDeviceHints1 << 8) + + unsigned int hints = (list->Device[i].irdaDeviceHints1 << 8) + list->Device[i].irdaDeviceHints2; INFO (device->context, @@ -261,10 +261,10 @@ irda_socket_discover (irda_t *device, irda_callback_t callback, void *userdata) list->Device[i].irdaCharSet, hints); - callback (address, + callback (address, list->Device[i].irdaDeviceName, list->Device[i].irdaCharSet, - hints, + hints, userdata); } #else @@ -278,9 +278,9 @@ irda_socket_discover (irda_t *device, irda_callback_t callback, void *userdata) list->dev[i].charset, hints); - callback (list->dev[i].daddr, - list->dev[i].info, - list->dev[i].charset, + callback (list->dev[i].daddr, + list->dev[i].info, + list->dev[i].charset, hints, userdata); } diff --git a/src/irda.h b/src/irda.h index ff284f8..d83037a 100644 --- a/src/irda.h +++ b/src/irda.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/mares_nemo.c b/src/mares_nemo.c index c2052ea..e479b02 100644 --- a/src/mares_nemo.c +++ b/src/mares_nemo.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/mares_nemo_parser.c b/src/mares_nemo_parser.c index 5eee1f3..5d177b4 100644 --- a/src/mares_nemo_parser.c +++ b/src/mares_nemo_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/mares_puck.c b/src/mares_puck.c index b989b9a..361a753 100644 --- a/src/mares_puck.c +++ b/src/mares_puck.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 2f30721..b4a3e5d 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -580,7 +580,7 @@ oceanic_atom2_device_read (dc_device_t *abstract, unsigned int address, unsigned // Read the package. unsigned int number = address / PAGESIZE; unsigned char answer[PAGESIZE + 1] = {0}; - unsigned char command[4] = {0xB1, + unsigned char command[4] = {0xB1, (number >> 8) & 0xFF, // high (number ) & 0xFF, // low 0}; diff --git a/src/oceanic_common.c b/src/oceanic_common.c index 7b9f79d..f384f4c 100644 --- a/src/oceanic_common.c +++ b/src/oceanic_common.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/oceanic_common.h b/src/oceanic_common.h index af17cf3..a9286aa 100644 --- a/src/oceanic_common.h +++ b/src/oceanic_common.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/oceanic_veo250.c b/src/oceanic_veo250.c index 1e9f91d..53c9c89 100644 --- a/src/oceanic_veo250.c +++ b/src/oceanic_veo250.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -408,7 +408,7 @@ oceanic_veo250_device_read (dc_device_t *abstract, unsigned int address, unsigne unsigned int first = address / PAGESIZE; unsigned int last = first + npackets - 1; unsigned char answer[(PAGESIZE + 1) * MULTIPAGE + 1] = {0}; - unsigned char command[6] = {0x20, + unsigned char command[6] = {0x20, (first ) & 0xFF, // low (first >> 8) & 0xFF, // high (last ) & 0xFF, // low diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index cdc5ee7..41c25a1 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/parser-private.h b/src/parser-private.h index b6e83db..63f0f4f 100644 --- a/src/parser-private.h +++ b/src/parser-private.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/parser.c b/src/parser.c index 568bb94..7cc7f4e 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/reefnet_sensus.c b/src/reefnet_sensus.c index c2e68a4..6504342 100644 --- a/src/reefnet_sensus.c +++ b/src/reefnet_sensus.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -400,7 +400,7 @@ reefnet_sensus_extract_dives (dc_device_t *abstract, const unsigned char data[], // Current sample is complete. nsamples++; - // The end of a dive is reached when 17 consecutive + // The end of a dive is reached when 17 consecutive // depth samples of less than 3 feet have been found. if (depth < 13 + 3) { count++; diff --git a/src/reefnet_sensus_parser.c b/src/reefnet_sensus_parser.c index 74e55b3..8f1f8d4 100644 --- a/src/reefnet_sensus_parser.c +++ b/src/reefnet_sensus_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2009 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -262,7 +262,7 @@ reefnet_sensus_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback // Current sample is complete. nsamples++; - // The end of a dive is reached when 17 consecutive + // The end of a dive is reached when 17 consecutive // depth samples of less than 3 feet have been found. if (depth < SAMPLE_DEPTH_ADJUST + 3) { count++; diff --git a/src/reefnet_sensuspro.c b/src/reefnet_sensuspro.c index df6b717..e462b4c 100644 --- a/src/reefnet_sensuspro.c +++ b/src/reefnet_sensuspro.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -379,7 +379,7 @@ reefnet_sensuspro_extract_dives (dc_device_t *abstract, const unsigned char data current--; if (memcmp (data + current, header, sizeof (header)) == 0) { // Once a start marker is found, start searching - // for the corresponding stop marker. The search is + // for the corresponding stop marker. The search is // now limited to the start of the previous dive. int found = 0; unsigned int offset = current + 10; // Skip non-sample data. diff --git a/src/reefnet_sensuspro_parser.c b/src/reefnet_sensuspro_parser.c index 781d60a..8d7856f 100644 --- a/src/reefnet_sensuspro_parser.c +++ b/src/reefnet_sensuspro_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -230,8 +230,8 @@ reefnet_sensuspro_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb unsigned int interval = array_uint16_le (data + offset + 4); offset += 10; - while (offset + sizeof (footer) <= size && - memcmp (data + offset, footer, sizeof (footer)) != 0) + while (offset + sizeof (footer) <= size && + memcmp (data + offset, footer, sizeof (footer)) != 0) { unsigned int value = array_uint16_le (data + offset); unsigned int depth = (value & 0x01FF); diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c index 3e0f848..2fba0f0 100644 --- a/src/reefnet_sensusultra.c +++ b/src/reefnet_sensusultra.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -317,7 +317,7 @@ reefnet_sensusultra_page (reefnet_sensusultra_device_t *device, unsigned char *d unsigned int nretries = 0; dc_status_t rc = DC_STATUS_SUCCESS; while ((rc = reefnet_sensusultra_packet (device, data, size, 2)) != DC_STATUS_SUCCESS) { - // Automatically discard a corrupted packet, + // Automatically discard a corrupted packet, // and request a new one. if (rc != DC_STATUS_PROTOCOL) return rc; diff --git a/src/reefnet_sensusultra_parser.c b/src/reefnet_sensusultra_parser.c index 6329143..79aebfd 100644 --- a/src/reefnet_sensusultra_parser.c +++ b/src/reefnet_sensusultra_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -231,8 +231,8 @@ reefnet_sensusultra_parser_samples_foreach (dc_parser_t *abstract, dc_sample_cal unsigned int interval = array_uint16_le (data + offset + 8); offset += 16; - while (offset + sizeof (footer) <= size && - memcmp (data + offset, footer, sizeof (footer)) != 0) + while (offset + sizeof (footer) <= size && + memcmp (data + offset, footer, sizeof (footer)) != 0) { dc_sample_value_t sample = {0}; diff --git a/src/ringbuffer.c b/src/ringbuffer.c index e0da155..72318d0 100644 --- a/src/ringbuffer.c +++ b/src/ringbuffer.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/ringbuffer.h b/src/ringbuffer.h index f6401e8..3915739 100644 --- a/src/ringbuffer.h +++ b/src/ringbuffer.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/serial.h b/src/serial.h index 0962f4e..4b1e0f3 100644 --- a/src/serial.h +++ b/src/serial.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -81,7 +81,7 @@ int serial_configure (serial_t *device, int baudrate, int databits, int parity, // // * Timeout (timeout > 0): // -// The read function is blocked until all the requested bytes have +// The read function is blocked until all the requested bytes have // been received. If the requested number of bytes does not arrive // within the specified amount of time, the function will return // with the bytes that have already been received. diff --git a/src/serial_posix.c b/src/serial_posix.c index d44c51d..5e86fc3 100644 --- a/src/serial_posix.c +++ b/src/serial_posix.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -171,7 +171,7 @@ serial_open (serial_t **out, dc_context_t *context, const char* name) } #endif - // Retrieve the current terminal attributes, to + // Retrieve the current terminal attributes, to // be able to restore them when closing the device. // It is also used to check if the obtained // file descriptor represents a terminal device. @@ -244,9 +244,9 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int tty.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN); // Enable the receiver (CREAD) and ignore modem control lines (CLOCAL). - tty.c_cflag |= (CLOCAL | CREAD); + tty.c_cflag |= (CLOCAL | CREAD); - // VMIN is the minimum number of characters for non-canonical read + // VMIN is the minimum number of characters for non-canonical read // and VTIME is the timeout in deciseconds for non-canonical read. // Setting both of these parameters to zero implies that a read // will return immediately, only giving the currently available diff --git a/src/serial_win32.c b/src/serial_win32.c index 31b7368..e85f3d0 100644 --- a/src/serial_win32.c +++ b/src/serial_win32.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -182,7 +182,7 @@ serial_close (serial_t *device) return 0; // Restore the initial communication settings and timeouts. - if (!SetCommState (device->hFile, &device->dcb) || + if (!SetCommState (device->hFile, &device->dcb) || !SetCommTimeouts (device->hFile, &device->timeouts)) { SYSERROR (device->context, GetLastError ()); CloseHandle (device->hFile); @@ -232,7 +232,7 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int // Character size. if (databits >= 5 && databits <= 8) dcb.ByteSize = databits; - else + else return -1; // Parity checking. @@ -328,21 +328,21 @@ serial_set_timeout (serial_t *device, long timeout) // Update the settings. if (timeout < 0) { // Blocking mode. - timeouts.ReadIntervalTimeout = 0; + timeouts.ReadIntervalTimeout = 0; timeouts.ReadTotalTimeoutMultiplier = 0; timeouts.ReadTotalTimeoutConstant = 0; timeouts.WriteTotalTimeoutMultiplier = 0; timeouts.WriteTotalTimeoutConstant = 0; } else if (timeout == 0) { // Non-blocking mode. - timeouts.ReadIntervalTimeout = MAXDWORD; + timeouts.ReadIntervalTimeout = MAXDWORD; timeouts.ReadTotalTimeoutMultiplier = 0; timeouts.ReadTotalTimeoutConstant = 0; timeouts.WriteTotalTimeoutMultiplier = 0; timeouts.WriteTotalTimeoutConstant = 0; } else { // Standard timeout mode. - timeouts.ReadIntervalTimeout = 0; + timeouts.ReadIntervalTimeout = 0; timeouts.ReadTotalTimeoutMultiplier = 0; timeouts.ReadTotalTimeoutConstant = timeout; timeouts.WriteTotalTimeoutMultiplier = 0; diff --git a/src/suunto_common.c b/src/suunto_common.c index 91aa669..44c5299 100644 --- a/src/suunto_common.c +++ b/src/suunto_common.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -83,7 +83,7 @@ suunto_common_extract_dives (suunto_common_device_t *device, const suunto_common } // Validate the end-of-profile pointer. - if (eop < layout->rb_profile_begin || + if (eop < layout->rb_profile_begin || eop >= layout->rb_profile_end || data[eop] != 0x82) { diff --git a/src/suunto_common.h b/src/suunto_common.h index 9f40113..151fe45 100644 --- a/src/suunto_common.h +++ b/src/suunto_common.h @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_d9.c b/src/suunto_d9.c index 039ae98..c5520f6 100644 --- a/src/suunto_d9.c +++ b/src/suunto_d9.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_d9_parser.c b/src/suunto_d9_parser.c index 65e7e87..b00900a 100644 --- a/src/suunto_d9_parser.c +++ b/src/suunto_d9_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_eon.c b/src/suunto_eon.c index de7d2aa..1d1f761 100644 --- a/src/suunto_eon.c +++ b/src/suunto_eon.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_eon_parser.c b/src/suunto_eon_parser.c index b287710..d2c8f94 100644 --- a/src/suunto_eon_parser.c +++ b/src/suunto_eon_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_solution.c b/src/suunto_solution.c index 4647ac5..1d7b227 100644 --- a/src/suunto_solution.c +++ b/src/suunto_solution.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_solution_parser.c b/src/suunto_solution_parser.c index 2da6a7b..0d9e978 100644 --- a/src/suunto_solution_parser.c +++ b/src/suunto_solution_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_vyper.c b/src/suunto_vyper.c index 0e959d0..f421210 100644 --- a/src/suunto_vyper.c +++ b/src/suunto_vyper.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -187,16 +187,16 @@ suunto_vyper_send (suunto_vyper_device_t *device, const unsigned char command[], return EXITCODE (n); } - // If the interface sends an echo back (which is the case for many clone - // interfaces), this echo should be removed from the input queue before - // attempting to read the real reply from the dive computer. Otherwise, - // the data transfer will fail. Timing is also critical here! We have to - // wait at least until the echo appears (40ms), but not until the reply + // If the interface sends an echo back (which is the case for many clone + // interfaces), this echo should be removed from the input queue before + // attempting to read the real reply from the dive computer. Otherwise, + // the data transfer will fail. Timing is also critical here! We have to + // wait at least until the echo appears (40ms), but not until the reply // from the dive computer appears (600ms). - // The original suunto interface does not have this problem, because it - // does not send an echo and the RTS switching makes it impossible to - // receive the reply before RTS is cleared. We have to wait some time - // before clearing RTS (around 30ms). But if we wait too long (> 500ms), + // The original suunto interface does not have this problem, because it + // does not send an echo and the RTS switching makes it impossible to + // receive the reply before RTS is cleared. We have to wait some time + // before clearing RTS (around 30ms). But if we wait too long (> 500ms), // the reply disappears again. serial_sleep (device->port, 200); serial_flush (device->port, SERIAL_QUEUE_INPUT); @@ -351,13 +351,13 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc unsigned char answer[SZ_PACKET + 3] = {0}; int n = serial_read (device->port, answer, 2); if (n != 2) { - // If no data is received because a timeout occured, we assume - // the last package was already received and the transmission - // can be finished. Unfortunately this is not 100% reliable, - // because there is always a small chance that more data will - // arrive later (especially with a short timeout). But it works + // If no data is received because a timeout occured, we assume + // the last package was already received and the transmission + // can be finished. Unfortunately this is not 100% reliable, + // because there is always a small chance that more data will + // arrive later (especially with a short timeout). But it works // good enough in practice. - // Only for the very first package, we can be sure there was + // Only for the very first package, we can be sure there was // an error, because the DC always sends at least one package. if (n == 0 && npackages != 0) break; @@ -366,7 +366,7 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc } // Verify the header of the package. - if (answer[0] != command[0] || + if (answer[0] != command[0] || answer[1] > SZ_PACKET) { ERROR (abstract->context, "Unexpected answer start byte(s)."); return DC_STATUS_PROTOCOL; @@ -388,9 +388,9 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc return DC_STATUS_PROTOCOL; } - // The DC sends a null package (a package with length zero) when it - // has reached the end of its internal ring buffer. From this point on, - // the current dive has been overwritten with newer data. Therefore, + // The DC sends a null package (a package with length zero) when it + // has reached the end of its internal ring buffer. From this point on, + // the current dive has been overwritten with newer data. Therefore, // we discard the current (incomplete) dive and end the transmission. if (len == 0) { dc_buffer_clear (buffer); @@ -415,8 +415,8 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc nbytes += len; // If a package is smaller than $SZ_PACKET bytes, - // we assume it's the last packet and the transmission can be - // finished early. However, this approach does not work if the + // we assume it's the last packet and the transmission can be + // finished early. However, this approach does not work if the // last packet is exactly $SZ_PACKET bytes long! #if 0 if (len != SZ_PACKET) @@ -430,9 +430,9 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc return DC_STATUS_NOMEMORY; } - // The DC traverses its internal ring buffer backwards. The most recent - // dive is send first (which allows you to download only the new dives), - // but also the contents of each dive is reversed. Therefore, we reverse + // The DC traverses its internal ring buffer backwards. The most recent + // dive is send first (which allows you to download only the new dives), + // but also the contents of each dive is reversed. Therefore, we reverse // the bytes again before returning them to the application. array_reverse_bytes (dc_buffer_get_data (buffer), dc_buffer_get_size (buffer)); diff --git a/src/suunto_vyper2.c b/src/suunto_vyper2.c index 7289302..1b29b97 100644 --- a/src/suunto_vyper2.c +++ b/src/suunto_vyper2.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/suunto_vyper_parser.c b/src/suunto_vyper_parser.c index 9a33bab..d5e023e 100644 --- a/src/suunto_vyper_parser.c +++ b/src/suunto_vyper_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/uwatec_aladin.c b/src/uwatec_aladin.c index a1d157a..3464848 100644 --- a/src/uwatec_aladin.c +++ b/src/uwatec_aladin.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -313,10 +313,10 @@ uwatec_aladin_extract_dives (dc_device_t *abstract, const unsigned char* data, u int profiles = 1; // Both ring buffers are traversed backwards to retrieve the most recent - // dives first. This allows you to download only the new dives and avoids + // dives first. This allows you to download only the new dives and avoids // having to rely on the number of profiles in the ring buffer (which - // is buggy according to the documentation). During the traversal, the - // previous pointer does always point to the end of the dive data and + // is buggy according to the documentation). During the traversal, the + // previous pointer does always point to the end of the dive data and // we move the current pointer backwards until a start marker is found. unsigned int previous = eop; unsigned int current = eop; diff --git a/src/uwatec_memomouse.c b/src/uwatec_memomouse.c index 95b29b3..53ab7ba 100644 --- a/src/uwatec_memomouse.c +++ b/src/uwatec_memomouse.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -222,7 +222,7 @@ uwatec_memomouse_read_packet_outer (uwatec_memomouse_device_t *device, unsigned dc_status_t rc = DC_STATUS_SUCCESS; while ((rc = uwatec_memomouse_read_packet (device, data, size, result)) != DC_STATUS_SUCCESS) { - // Automatically discard a corrupted packet, + // Automatically discard a corrupted packet, // and request a new one. if (rc != DC_STATUS_PROTOCOL) return rc; @@ -375,7 +375,7 @@ uwatec_memomouse_dump_internal (uwatec_memomouse_device_t *device, dc_buffer_t * // Without this delay, the transfer will fail most of the time. serial_sleep (device->port, 50); - // Keep send the command to the device, + // Keep send the command to the device, // until the ACK answer is received. unsigned char answer = NAK; while (answer == NAK) { @@ -501,8 +501,8 @@ uwatec_memomouse_extract_dives (dc_device_t *abstract, const unsigned char data[ unsigned int previous = 0; unsigned int current = 5; while (current + 18 <= size) { - // Memomouse sends all the data twice. The first time, it sends - // the data starting from the oldest dive towards the newest dive. + // Memomouse sends all the data twice. The first time, it sends + // the data starting from the oldest dive towards the newest dive. // Next, it send the same data in reverse order (newest to oldest). // We abort the parsing once we detect the first duplicate dive. // The second data stream contains always exactly 37 dives, and not diff --git a/src/uwatec_memomouse_parser.c b/src/uwatec_memomouse_parser.c index 3609ef9..5dd7365 100644 --- a/src/uwatec_memomouse_parser.c +++ b/src/uwatec_memomouse_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/uwatec_smart.c b/src/uwatec_smart.c index bd6a0ae..b755880 100644 --- a/src/uwatec_smart.c +++ b/src/uwatec_smart.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c index dd4734e..254cbab 100644 --- a/src/uwatec_smart_parser.c +++ b/src/uwatec_smart_parser.c @@ -1,18 +1,18 @@ -/* +/* * libdivecomputer - * + * * Copyright (C) 2008 Jef Driesen - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -- 1.9.0

2 1

Oceanic OCS: No gaschange events
by Florian Klink 18 Mar '14

18 Mar '14

Hi, a friend of me diving with an Oceanic OCS recently started using subsurface to log her dives. Unfortunately, it seems like the atom2 parser doesn't support tank switch events on Oceanic OCS yet. We dumped all dives using the "universal test application". . In the xml sample at the time of the gas switch (at 21:45), there are two <vendor></vendor> elements generated, one starting with "AA", which looks like the gas switch event. The switch was done from air to EAN 52 (the 2nd mix): <sample> <time>21:45</time> <vendor type="5" size="8">AA0221296A033400</vendor> <vendor type="5" size="8">024E74039B000001</vendor> <temperature>25.56</temperature> <depth>16.84</depth> </sample> I attached the XML of this dive (sample from 21:45 starts at line 540) and the memory dump. What about the "34" at the end meaning 52% oxygen in the newly switched gas? Do you have other samples to verify that this theory or should I ask about some more dives with gaschanges to mixes with other amounts of oxygen? Florian

3 6

.NET version
by Gary Williams 15 Mar '14

15 Mar '14

I would be interested in the efforts to make a .NET version of your downloader code. My goal is that I want to go diving in the Philippines in late October, I want to download the dive computer into a Surface RT each day using the Diving Log software. That software is already .NET, so if libdivecomputer can also be a .NET assembly, then I stand a much better chance of achieving my goal, assuming I can get the Diving Log software to load and use the new assembly (not hard to do in .NET). How can I help you accomplish this?

2 1

Re: can't download Oceanic VT3 on linux
by Jef Driesen 12 Mar '14

12 Mar '14

On 2014-03-11 00:16, Hamish Moffatt wrote: > On 11/03/14 00:52, Jef Driesen wrote: >> >> The slowness is expected. The attached patch introduces a 100ms delay >> before each command. With 4096 packets (of only 16 bytes), that means >> a total delay of at least 409.6 seconds. That alone is already a very >> good reason not to apply this patch, especially because most users >> don't need it. But it does give a good indication that the real >> problem is likely something timing related. The question is of course >> what and where. >> >> Something else that is worth trying is increasing the 100ms delay in >> the oceanic_atom2_device_open() function. I don't really understand >> why, but some interfaces seem to need some extra time between setting >> up the serial port and sending the first data packet. I suspect that >> the OS or driver is async and returns before the settings are actually >> applied, causing us to send data before the device is ready. But I'm >> not really sure about that. Anyway, adding some extra delay there >> isn't that much of a problem because it's just a one time delay. >> > Increasing the delay in the oceanic_atom2_device_open() function > didn't help (tried 1 second even). A delay of 1ms inside > oceanic_atom2_send() was enough for a perfect transfer, but 0.5ms (via > usleep() for hack's sake) was not enough. Even a sleep of just 1ms per packet is pretty bad. If I remember correctly, the resolution of the Windows Sleep() function is in the order of 10-15ms only. So that would still be a delay of approximately 40.96 seconds. I wonder if this is another case where the tcdrain() function isn't waiting properly until all bytes have been send out. We had a similar problem with Suunto devices before. There we implemented a workaround with serial_set_halfduplex() function. Could you try that as well? Just call it somewhere in the oceanic_atom2_device_open() function, but before the call to the oceanic_atom2_device_open() function. How many wires does the Oceanic interface have? Just two or more? I have been looking at the kernel history for the ftdi usb-serial driver, and there have been some changes related to waiting until the TX buffer is empty, so there could be something there as well. Which kernel version do you have (uname -a)? PS: Don't forget to attach the logfiles. I want to have a look at the timings. Jef

3 17

Re: can't download Oceanic VT3 on linux
by Hamish Moffatt 12 Mar '14

12 Mar '14

Sorry, sent that last one to Jef only by mistake. On 13/03/14 00:52, Hamish Moffatt wrote: > > I'm starting to wonder if the dive computer needs that time and the > only reason it works on Windows and Mac is because the default latency > timer is higher which is adding that delay... > Aha. So, I increased the latency on linux (after first turning off the low_latency flag, which the driver sets by default): # setserial /dev/ttyUSB0 ^low_latency # echo 16 > /sys/bus/usb-serial/devices/ttyUSB0/latency_timer Now it works. With a value of 2 in there, it mostly works (glitches occasionally). Here's the timing: [0.000026] DATETIME 2014-03-12T13:58:50Z (1394632730) [0.000052] VERSION 0.5.0-devel (575f2e9016ac9baa2b1b031caa6fe0bc77cdbbee) [0.000057] DEVICE=/dev/ttyUSB0 [0.000065] oceanic_atom2_device_open [0.000073] INFO: Open: name=/dev/ttyUSB0 [0.000812] INFO: Configure: baudrate=38400, databits=8, parity=0, stopbits=1, flowcontrol=0 [0.000929] INFO: Timeout: value=3000 [0.000940] INFO: Sleep: value=100 [0.101016] INFO: Flush: queue=3, input=0, output=0 [0.101439] INFO: Write: size=1, data=84 [0.103600] INFO: Read: size=1, data=5A [0.107599] INFO: Read: size=17, data=4F43452056543320523244203531324BBF [0.107615] dc_device_dump [0.108581] INFO: Write: size=3, data=B10000 [0.109599] INFO: Read: size=1, data=5A [0.121477] INFO: Read: size=17, data=0416041120081001425800730000000075 [0.124581] INFO: Write: size=3, data=B10001 [0.124596] INFO: Read: size=1, data=5A [0.135469] INFO: Read: size=17, data=6701DA064204E506E206DC06FF0FAAFBF6 [0.136583] INFO: Write: size=3, data=B10002 [0.137476] INFO: Read: size=1, data=5A [0.149352] INFO: Read: size=17, data=0000DC06FF0FDC06FF0F00000000AA8A14 [0.152581] INFO: Write: size=3, data=B10003 [0.152595] INFO: Read: size=1, data=5A [0.163354] INFO: Read: size=17, data=890E370D00011B0B670542053250AAE1C2 [0.164588] INFO: Write: size=3, data=B10004 [0.165312] INFO: Read: size=1, data=5A [0.177359] INFO: Read: size=17, data=300220028003500530BEB0BB0000000085 [0.180580] INFO: Write: size=3, data=B10005 [0.180595] INFO: Read: size=1, data=5A [0.191212] INFO: Read: size=17, data=A014000300002C01980805A0022100024E [0.192580] INFO: Write: size=3, data=B10006 [0.193229] INFO: Read: size=1, data=5A With a value of 4 it downloaded the whole memory dump with no errors. Hamish

2 1

Ostc3 firmware update
by Anton Lundin 11 Mar '14

11 Mar '14

Hi! I was just playing around with trying to upgrade my ostc's firmware, and the mk2 got upgraded just fine. >From what i could see, there is no support for upgrading ostc3's firmware in libdivecomputer. I started to play around a bit and ran into problems right away. The firmware files doesn't look to be regular ihex as the ostc2 ones. Do anyone have any information on the fw upgrade procedure for the ostc3? //Anton -- Anton Lundin +46702-161604

5 5

can't download Oceanic VT3 on linux
by Hamish Moffatt 10 Mar '14

10 Mar '14

Hi, I'm trying to download from my VT3. I've built libdivecomputer 0.4.2 on Linux (64-bit) but downloading is very slow and eventually fails. I've tested with both Subsurface and using the "universal" example. It does retrieve some dive data ok though. Downloading my VT3 does work on Windows though, using Diving Log 5.0 (includes libdivecomputer 0.4.2, 32-bit) or the "universal" app binary which I downloaded directly from the libdivecomputer.org site. I've included a bit of the output log from "universal" on linux below. I checked that nothing else has the port open with lsof - earlier modem-manager was running but I've killed and removed that now. Any suggestions? Thanks, Hamish [0.000037] DATETIME 2014-03-07T01:56:02Z (1394157362) [0.000068] VERSION 0.4.2 [0.000092] Opening the device (Oceanic VT3, /dev/ttyUSB0). [0.000865] INFO: Configure: baudrate=38400, databits=8, parity=0, stopbits=1, flowcontrol=0 [0.001106] INFO: Timeout: value=3000 [0.001115] INFO: Sleep: value=100 [0.101194] INFO: Flush: queue=3, input=263, output=0 [0.101437] INFO: Write: size=2, data=8400 [0.103572] INFO: Read: size=1, data=00 [0.103586] ERROR: Unexpected answer start byte(s). [in oceanic_atom2.c:337 (oceanic_atom2_send)] [0.103602] INFO: Sleep: value=100 [0.203686] INFO: Flush: queue=1, input=118, output=0 [0.203937] INFO: Write: size=2, data=8400 [0.204913] INFO: Read: size=1, data=5A [0.208911] INFO: Read: size=17, data=4F43452056543320523244203531324BBF [0.208939] Registering the event handler. [0.208948] Registering the cancellation handler. [0.209039] Downloading the dives. [0.209046] Event: progress 0.00% (0/64992) [0.209067] Event: vendor=4F43452056543320523244203531324B [0.209269] INFO: Write: size=4, data=B1000000 [3.212314] INFO: Read: size=0, data= [3.212333] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [3.212341] INFO: Sleep: value=100 [3.312423] INFO: Flush: queue=1, input=0, output=0 [3.312656] INFO: Write: size=4, data=B1000000 [3.314042] INFO: Read: size=1, data=5A [3.324885] INFO: Read: size=17, data=0416041120081001425800730000000075 [3.324901] Event: progress 0.02% (16/64992) [3.324920] Event: model=16984 (0x00004258), firmware=0 (0x00000000), serial=7300 (0x00001c84) [3.325176] INFO: Write: size=4, data=B1000400 [6.328221] INFO: Read: size=0, data= [6.328240] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [6.328248] INFO: Sleep: value=100 [6.428331] INFO: Flush: queue=1, input=0, output=0 [6.428523] INFO: Write: size=4, data=B1000400 [6.430266] INFO: Read: size=1, data=5A [6.441137] INFO: Read: size=17, data=200210028003480530BE70B70000000019 [6.441154] Event: progress 0.05% (32/63408) [6.441357] INFO: Write: size=4, data=B1005400 [6.443109] INFO: Read: size=1, data=A5 [6.443125] ERROR: Unexpected answer start byte(s). [in oceanic_atom2.c:337 (oceanic_atom2_send)] [6.443133] INFO: Sleep: value=100 [6.543215] INFO: Flush: queue=1, input=0, output=0 [6.543519] INFO: Write: size=4, data=B1005400 [6.544642] INFO: Read: size=1, data=5A [6.555511] INFO: Read: size=17, data=39111F172E0CABB4258302172E4B7BB785 [6.555528] Event: progress 0.08% (48/63408) [6.555756] INFO: Write: size=4, data=B1005300 [9.558799] INFO: Read: size=0, data= [9.558818] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [9.558826] INFO: Sleep: value=100 [9.658909] INFO: Flush: queue=1, input=0, output=0 [9.659097] INFO: Write: size=4, data=B1005300 [9.660614] INFO: Read: size=1, data=5A [9.671487] INFO: Read: size=17, data=26861F1F16936AAD3389021F16D7BAB0DE [9.671502] Event: progress 0.10% (64/63408) [9.671799] INFO: Write: size=4, data=B1005200 [9.673490] INFO: Read: size=1, data=A5 [9.673521] ERROR: Unexpected answer start byte(s). [in oceanic_atom2.c:337 (oceanic_atom2_send)] [9.673530] INFO: Sleep: value=100 [9.773608] INFO: Flush: queue=1, input=0, output=0 [9.773854] INFO: Write: size=4, data=B1005200 [9.774985] INFO: Read: size=1, data=5A [9.785865] INFO: Read: size=17, data=02111F1E1BA689A22685021E1B292AA91E [9.785881] Event: progress 0.13% (80/63408) [9.786098] INFO: Write: size=4, data=B1005100 [12.789144] INFO: Read: size=0, data= [12.789163] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [12.789171] INFO: Sleep: value=100 [12.889257] INFO: Flush: queue=1, input=0, output=0 [12.889449] INFO: Write: size=4, data=B1005100 [12.890959] INFO: Read: size=1, data=5A [12.901835] INFO: Read: size=17, data=43861F0ACA45B9965088020ACA6C599A5D [12.901851] Event: progress 0.15% (96/63408) [12.902035] INFO: Write: size=4, data=B1005000 [12.903804] INFO: Read: size=1, data=A5 [12.903819] ERROR: Unexpected answer start byte(s). [in oceanic_atom2.c:337 (oceanic_atom2_send)] [12.903827] INFO: Sleep: value=100 [13.003939] INFO: Flush: queue=1, input=0, output=0 [13.004197] INFO: Write: size=4, data=B1005000 [13.005314] INFO: Read: size=1, data=5A [13.016331] INFO: Read: size=17, data=45100F18AAC6E88F09041F09CAFF48943D [13.016347] Event: progress 0.18% (112/63408) [13.016648] INFO: Write: size=4, data=B1004F00 [16.019691] INFO: Read: size=0, data= [16.019710] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [16.019718] INFO: Sleep: value=100 [16.119803] INFO: Flush: queue=1, input=0, output=0 [16.120080] INFO: Write: size=4, data=B1004F00 [16.121183] INFO: Read: size=1, data=5A [16.132159] INFO: Read: size=17, data=24060D18AA57088910090E18AA91588C3F [16.132168] Event: progress 0.20% (128/63408) [16.132373] INFO: Write: size=4, data=B1004E00 [19.135409] INFO: Read: size=0, data= [19.135429] ERROR: Failed to receive the answer. [in oceanic_atom2.c:331 (oceanic_atom2_send)] [19.135437] INFO: Sleep: value=100 [19.235521] INFO: Flush: queue=1, input=0, output=0 [19.235775] INFO: Write: size=4, data=B1004E00 [19.237157] INFO: Read: size=1, data=5A

3 6