MainWindow LHS Action Buttons gone

.. for Linux and Windows (will resolve OSX separately).

.gitignore

@@ -1,16 +1,49 @@
 Makefile
-
+.qmake.stash
+*.o
+*.so.*
+*.so
+*.a
+*~
+*.orig
+*.rej
 # old skool
 .svn
 *.pri
+*.prl
 
 # osx noise
 .DS_Store
 profile
 
+# qmake Xcode generator side-effects
+*.xcodeproj
+xcshareddata/
+*.xcworkspace
+*.pbxproj
+*.mak
+*.build/
+
+moc_*
 moc/
 obj/
 lib/
 bin/
 plugins/
 resources/
+src/debug/
+src/release/
+
+qwt/src/debug/
+qwt/src/release/
+src/Makefile.Debug
+src/Makefile.Release
+src/object_script.GoldenCheetah.Debug
+src/object_script.GoldenCheetah.Release
+qwt/src/object_script.libqwt.Release
+qwt/src/object_script.libqwtd.Debug
+qwt/src/Makefile.Release
+qwt/src/Makefile.Debug
+qwt/textengines/mathml/debug/
+qwt/textengines/mathml/release/
+build.pro.user

.travis.yml

@@ -0,0 +1,120 @@
+branches:
+- master
+language:
+- objective-c
+compiler:
+- clang
+- gcc
+env:
+  matrix:
+## Test 4.8 or 5.4.2
+  - BRANCH=master QT=qt4 QT_PATH=qt
+  - BRANCH=master QT=qt5 QT_PATH=qt5
+  global:
+  - secure: iqYW7f3//ZkMVzeCEarYn0S0DqKjFU9juBh0KF6WTlUsKX902Jtsk7dFoJlNDYBf63HLgV+wW2Hc6MxI9sGiUkom0gY9/To/aeGIJFGEX2sLm/e0Ok3qN521FA0Q/OiCFsD0RC6J+yrHxzI+rf8Z1rujceUsz2KgsrfAjYYv+BY=
+  - secure: C6f58PXwvvHeVOjCLbyDRjgyF0tk+bXjCNUDur8VJLhJEGNdnrt+rH+d3azYaX0n348ZnQZ14as4M4rHjN1A/3DRbdUdOS7PQZrkj/n363ck1tvYOG/tzYqkEcVoQyjIJ7ZoTuBXDQry/VJmLxQjM0glTa2upNFHMOMwqZNkF+I=
+  - secure: mgf181ok4rJTHxAdSaeIb/OzUx7PQc6UjJYfhJQcZDjN1Nou+Um6OHpnooMHeEq0CdGuLSiv2xVmuQnRjI5MfG5re/a3l39hSzi9tPLWi1y7uOLCtQFooJw3H+LhiKZcgAtEnkTmEhUCEu5uZ7cp4lWhrQZWCR5mCDNtJrGHjiw=
+  - secure: UkW6SpgeACb6enGZADTAtPPRe23Tffne/SRQoBsZ3kGbKzgv8kTCLY0G5N71B1xEGdLB/36piOa0yji2SMW1jbflxR7tdOsiNpfd9R5qYqWVZRulY0qite8ZCwU5dqgy87pp4ECC1hNSOTq17aa4Sc4G4egg9AOy8cntLBTtxJA=
+  - secure: rb/MKPHEK8yOK5uYpXq2o+MQ7h65ft+c/xE9XmLFk1jLnK0oxe6+KeoSFlQ0n5UwLSsHrytMXVaUHex6EEt0TheXFlohi7BcNFWRWXr+wLucuaPjMnU49VErrSigjJ5VW/rcR7fORmnDwn5y06r3Rer9SC1hImCxf/pqF8hFZps=
+  - secure: FXJzm98lwbc1R2eh9/CvVReVRHEPLDm+sCRjiV9HJgeCveIUauLasp9Skamz0c6OKLmkjLY8JERPT491ZgCG8YcQ9x1bM8HGbmRqnn9xSUxINIRzVmyTiLMBoT/ibHHeFjFpyiGfukOAkHwMNNsrSrbaekhiJuekaXo7iTwYQB0=
+before_install:
+- date
+- brew update
+##- sh travis/install-qt.sh
+- brew install $QT
+- brew install libical
+- brew install libusb libusb-compat
+- brew install srmio
+- brew install libsamplerate
+## Disable KML for now
+##- brew install --HEAD travis/libkml.rb
+- sudo chmod -R +w /usr/local
+- curl -O http://www.ftdichip.com/Drivers/D2XX/MacOSX/D2XX1.2.2.dmg
+- git clone --depth 1 https://github.com/sintegrial/qwtplot3d.git qwtplot3d
+- cd qwtplot3d
+- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+=-Wno-unused-private-field
+- CC=clang CXX=clang++ make -j2
+- cd ..
+- git clone --branch 0.98 https://github.com/kypeli/kQOAuth.git kQOAuth-0.98
+- cd kQOAuth-0.98
+- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+=-Wno-unused-private-field
+- CC=clang CXX=clang++ make -j2 qmake_all
+- CC=clang CXX=clang++ sudo make install
+- cd ..
+- hdiutil mount D2XX1.2.2.dmg
+before_script:
+- mkdir D2XX
+- cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib D2XX
+- sudo cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib /usr/local/lib
+- cp /Volumes/release/D2XX/bin/*.h D2XX
+- sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.2.2.dylib|"
+  src/D2XX.cpp
+- cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
+- cp src/gcconfig.pri.in src/gcconfig.pri
+- /usr/local/opt/$QT_PATH/bin/lupdate src/src.pro
+- sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri
+- sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/$QT_PATH/bin/lrelease|"
+  src/gcconfig.pri
+- sed -i "" "s|#\(QMAKE_CXXFLAGS\).*|\1_RELEASE += -mmacosx-version-min=10.7 -arch
+  x86_64|" src/gcconfig.pri
+- sed -i "" "s|^#CloudDB|CloudDB|" src/gcconfig.pri
+- sed -i "" "s|^#LIBZ|LIBZ|" src/gcconfig.pri
+- sed -i "" "s|#\(SRMIO_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
+- sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
+- sed -i "" "s|#\(D2XX_LIBS    =.*\)|\1 -L../D2XX -lftd2xx.1.2.2|" src/gcconfig.pri
+- sed -i "" "s|#\(KQOAUTH_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
+- sed -i "" "s|#\(KQOAUTH_INCLUDE =.*\)|\1 \$\$[QT_INSTALL_LIBS]/kqoauth.framework/Headers|"
+  src/gcconfig.pri
+- sed -i "" "s|#\(KQOAUTH_LIBS =.*\)|\1 -F\$\$[QT_INSTALL_LIBS] -framework kqoauth|"
+  src/gcconfig.pri
+- sed -i "" "s|#\(QWT3D_INSTALL =.*\)|\1 ../qwtplot3d|" src/gcconfig.pri
+## Disable KML for now
+##- sed -i "" "s|#\(KML_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
+##- sed -i "" "s|#\(KML_LIBS    =.*\)|\1 -L/usr/local/lib -lkmlxsd -lkmlregionator -lkmldom
+##  -lkmlconvenience -lkmlengine -lkmlbase|" src/gcconfig.pri
+- sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
+- sed -i "" "s|#\(ICAL_LIBS    =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
+- sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
+- sed -i "" "s|#\(LIBUSB_LIBS    =.*\)|\1 -L/usr/local/lib -lusb|" src/gcconfig.pri
+- sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
+- sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri
+- sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri
+- sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri
+- sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri
+- sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri
+- sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri
+- echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri
+- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Secrets.h
+- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Secrets.h
+- sed -i "" "s/__GC_DROPBOX_CLIENT_SECRET__/"$GC_DROPBOX_CLIENT_SECRET"/" src/Secrets.h
+- sed -i "" "s/__GC_CYCLINGANALYTICS_CLIENT_SECRET__/"$GC_CYCLINGANALYTICS_CLIENT_SECRET"/" src/Secrets.h
+- sed -i "" "s/__GC_TWITTER_CONSUMER_SECRET__/"$GC_TWITTER_CONSUMER_SECRET"/" src/Secrets.h
+- cat src/gcconfig.pri
+script:
+- CC=clang CXX=clang++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+=-Wno-unused-private-field
+- CC=clang CXX=clang++ make qmake_all
+- CC=clang CXX=clang++ make -j4 sub-qwt --silent
+- CC=clang CXX=clang++ make -j4 sub-src
+after_success:
+- cd src
+- ls -laR GoldenCheetah.app
+- GoldenCheetah.app/Contents/MacOS/GoldenCheetah --help
+- /usr/local/opt/$QT_PATH/bin/macdeployqt GoldenCheetah.app -verbose=2 -dmg
+## fix up the bundle with macdeployqtfix
+- python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/$QT_PATH
+- brew remove $QT
+- mv GoldenCheetah.dmg GoldenCheetah_$QT.dmg
+- hdiutil mount GoldenCheetah_$QT.dmg
+- cd /Volumes/GoldenCheetah
+- ls -laR GoldenCheetah.app
+- GoldenCheetah.app/Contents/MacOS/GoldenCheetah --help
+##deploy broken in travis, read-only filesystem error
+##before_deploy:
+##- gem install mime-types -v 2.6.2
+##deploy:
+##  provider: releases
+##  api_key: $GH_OAUTH_TOKEN
+##  file: GoldenCheetah_$QT.dmg
+##  skip_cleanup: true
+##  on:
+##    tags: true

COPYING

@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  "This License" refers to version 3 of the GNU General Public License.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  14. Revised Versions of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-			    NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-		     END OF TERMS AND CONDITIONS
+  16. Limitation of Liability.
 
-	    How to Apply These Terms to Your New Programs
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,31 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

INSTALL-LINUX

@@ -5,8 +5,8 @@
                                      Mark Liversedge
                                      John Ehrlinger
 
-                                        May 2011
-                                      Version 1.1
+                                        Jan 2015
+                                      Version 1.2
 
 A walkthrough of building GoldenCheetah from scratch on Ubuntu linux. This walkthrough
 should be largely the same for any Linux distro.
@@ -30,8 +30,6 @@ CONTENTS
      - bison
    - libical - Diary window and CalDAV support (google/mobileme calendar integration)
    - libvlc  - Video playback in training mode
-   - clucene - Indexing/Searching ride files
-
 
 1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
 =================================================
@@ -373,30 +371,3 @@ VLC_INSTALL = /usr/include/vlc/
 $ make clean
 $ qmake
 $ make
-
-CLUCENE - Indexing and Searching ride files (search box)
---------------------------------------------------------
-
-You will need clucene runtime and core libraries, we developed against 0.9.21b-2 but
-any 0.9 branch should work fine, let us know if you experience any issues. You may find
-that the libclucene0ldbl runtime is already installed, this is fine and typical since
-clucene is a very popular search library.
-
-$ sudo apt-get install libclucene-dev
-$ sudo apt-get install libclucene0ldbl
-
-By default, and this is deliberate, the clucene install places the config headers into
-a platform specific location. For my install I just copy the platform (linux) specific
-header config into the normal /usr/include/CLucene directory with the following:
-
-$ sudo cp /usr/lib/CLucene/clucene-config.h /usr/include/CLucene
-
-Next we need to comment out the two CLUCENE lines in gcconfig.pri and they should read:
-
-CLUCENE_INCLUDE = /usr/include/CLucene
-CLUCENE_LIBS    = -lclucene
-
-$ make clean
-$ qmake
-$ make
-

INSTALL-MAC

@@ -4,8 +4,8 @@
 
                                      Mark Liversedge
 
-                                        Nov 2011
-                                      Version 1.1
+                                        Jan 2015
+                                      Version 1.2
 
 A walkthrough of building GoldenCheetah from scratch on Mac OSX. This was performed
 on Mac OSX Lion (10.7) but the instructions are largely the same for all versions of
@@ -20,12 +20,11 @@ CONTENTS
 2. ADDING OPTIONAL DEPENDENCIES
    - FTDI D2XX
    - SRMIO
-   - liboauth
+   - kQOAuth
    - QwtPlot3d
    - libkml
    - libusb
    - libical
-   - libclucene
 
 
 1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
@@ -95,12 +94,12 @@ $ cd GoldenCheetah
 $ ls
 
 You should see a number of directories such as doc, qwt, src etc. If you are
-building the latest development release you may need to check it out. At the
-time of writing the latest development release is release_3.0.0dev, if you
-want to build version 3 then you should perform the next command, otherwise 
-skip to 1.5.
+wanting to build a particular release you need to checkout the release. To
+build a release you need to checkout the code at the tag for the release.
 
-$ checkout release_3.0.0dev
+A list of releases can be found at: https://github.com/GoldenCheetah/GoldenCheetah/tags
+
+$ git checkout V3.3-RC1
 $ ls
 
 You will now see an updated version of this walkthrough, please jump to using
@@ -228,7 +227,7 @@ And you're up and running.
 ===============================
 
    - SRMIO
-   - liboauth
+   - kQOAuth
    - QwtPlot3d
    - libkml
    - libusb
@@ -245,12 +244,13 @@ should be taken into account.
 SRMIO (git)
 ./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
 
-2.2 Liboauth - For Twitter support
-----------------------------------
+2.2 kQOAuth - For OAuth Authentication
+--------------------------------------
 
-oauth (0.8.8)
+kQOauth (0.98)
+
+qmake
 
-./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64 CURL_CFLAGS="-I/Developer/SDKs/MacOSX10.7.sdk/usr/include/curl"  CURL_LIBS="-lcurl" --disable-dependency-tracking
 
 2.3 QwtPlot3d - For 3d plot support
 -----------------------------------
@@ -297,15 +297,3 @@ libical (0.46)
 first run autogen.sh
 then
 ./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking
-
-2.7 clucene
------------
-
-DO NOT USE THE MACPORTS VERSION (0.9.23) IT DOES NOT WORK.
-
-git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene 
-cmake -G "Unix Makefiles"
-make
-sudo make install
-
-will install clucene into /usr/local/include/clucene and /usr/local/lib

README.md

@@ -2,8 +2,16 @@ Golden Cheetah install and build instructions are documented
 for each platform;
 
 INSTALL-WIN32   For building on Microsoft Windows
+
 INSTALL-LINUX   For building on Ubuntu Linux
+
 INSTALL-MAC     For building on Apple OS X
 
+
+[![Build Status](https://travis-ci.org/GoldenCheetah/GoldenCheetah.svg?branch=master)](https://travis-ci.org/GoldenCheetah/GoldenCheetah)
+
+[![Coverity Status](https://scan.coverity.com/projects/7503/badge.svg)](https://scan.coverity.com/projects/goldencheetah-goldencheetah)
+
 Alternatively official builds are available from http://www.goldencheetah.org
+
 whilst latest developer builds are available from http://goldencheetah.stand2surf.net

build.pro

@@ -1,3 +1,7 @@
 TEMPLATE = subdirs
-SUBDIRS = qwt src
+SUBDIRS = qwt
+unix:!macx {
+    SUBDIRS += kqoauth
+}
+SUBDIRS += src
 CONFIG += ordered

contrib/0001-Patch-LIBKML-Windows-MingGW-subset-for-GC.patch

@@ -0,0 +1,316 @@
+From 7be04e65a53b22ce382d640a6c409b5d3bfe5645 Mon Sep 17 00:00:00 2001
+From: Joern <joern.rm@gmail.com>
+Date: Sat, 20 Dec 2014 12:42:37 +0100
+Subject: [PATCH] Patch-Windows-MingGW-subset for GC
+
+... reduce the libs in Make to what GoldenCheetah needs
+... add two functions missing in MingGW standard libs
+---
+ Makefile.am                 |   2 +-
+ configure.ac                |  44 -------------------
+ src/Makefile.am             |   2 +-
+ src/kml/base/file_posix.cc  | 102 ++++++++++++++++++++++++++++++++++++++++++++
+ src/kml/base/string_util.cc |  17 ++++++++
+ third_party/Makefile.am     |  42 +++---------------
+ 6 files changed, 126 insertions(+), 83 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2be0803..e29201e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # Order is important:
+-SUBDIRS = third_party src testdata examples msvc xcode
++SUBDIRS = third_party src
+ 
+ EXTRA_DIST = \
+ 	AUTHORS \
+diff --git a/configure.ac b/configure.ac
+index d5fa75f..033128b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -203,23 +203,6 @@ AC_CHECK_LIB(pthread, pthread_create,,
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+-	examples/Makefile
+-	examples/domviewer/Makefile
+-	examples/engine/Makefile
+-	examples/gpx/Makefile
+-	examples/gx/Makefile
+-	examples/hellonet/Makefile
+-	examples/helloworld/Makefile
+-	examples/java/Makefile
+-	examples/kml/Makefile
+-	examples/python/Makefile
+-	examples/regionator/Makefile
+-	examples/wxregionator/Makefile
+-	examples/wxviewer/Makefile
+-	examples/xsd/Makefile
+-	msvc/Makefile
+-	msvc/examples/Makefile
+-	msvc/tests/Makefile
+ 	src/Makefile
+ 	src/kml/Makefile
+ 	src/kml/convenience/Makefile
+@@ -228,34 +211,7 @@ AC_CONFIG_FILES([
+ 	src/kml/regionator/Makefile
+ 	src/kml/base/Makefile
+ 	src/kml/xsd/Makefile
+-	src/swig/Makefile
+-	src/swig/java/Makefile
+-	src/swig/python/Makefile
+-	testdata/Makefile
+-	testdata/atom/Makefile
+-	testdata/balloon/Makefile
+-	testdata/csv/Makefile
+-	testdata/deprecated/Makefile
+-	testdata/gdata/Makefile
+-	testdata/gmaps/Makefile
+-	testdata/gpx/Makefile
+-	testdata/gx/Makefile
+-	testdata/kml/Makefile
+-	testdata/kmz/Makefile
+-	testdata/kmz/files/Makefile
+-	testdata/kmz/kmzfiles/Makefile
+-	testdata/kmz/rumsey/Makefile
+-	testdata/kmz/rumsey/kml/Makefile
+-	testdata/kmz/rumsey/imagery/Makefile
+-	testdata/links/Makefile
+-	testdata/style/Makefile
+-	testdata/style/weather/Makefile
+-	testdata/update/Makefile
+-	testdata/xal/Makefile
+-	testdata/xsd/Makefile
+ 	third_party/Makefile
+-	xcode/Makefile
+-	xcode/LibKML/Makefile
+ ])
+ 
+ AC_OUTPUT
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0bf15ac..721209e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = kml swig
++SUBDIRS = kml 
+ 
+ # TODO: use the phc files in msvc.
+ EXTRA_DIST = \
+diff --git a/src/kml/base/file_posix.cc b/src/kml/base/file_posix.cc
+index b9461c0..920a996 100644
+--- a/src/kml/base/file_posix.cc
++++ b/src/kml/base/file_posix.cc
+@@ -33,8 +33,110 @@
+ #include <sys/stat.h>
+ #include <unistd.h>  // For unlink, close.
+ 
++// START PATCH
++#include <fcntl.h>    
++#include <sys/time.h>
++#include <sys/stat.h>
++// END PATCH
++
+ namespace kmlbase {
+ 
++// START PATCH
++// Implementation of missing functions
++
++/* mkstemp extracted from libc/sysdeps/posix/tempname.c.  Copyright
++   (C) 1991-1999, 2000, 2001, 2006 Free Software Foundation, Inc.
++
++   The GNU C 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.  */
++
++static const char letters[] =
++"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
++
++/* Generate a temporary file name based on TMPL.  TMPL must match the
++   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
++   does not exist at the time of the call to mkstemp.  TMPL is
++   overwritten with the result.  */
++int
++mkstemp (char *tmpl)
++{
++  int len;
++  char *XXXXXX;
++  static unsigned long value;
++  unsigned long random_time_bits;
++  unsigned int count;
++  int fd = -1;
++  int save_errno = errno;
++
++  /* A lower bound on the number of temporary files to attempt to
++     generate.  The maximum total number of temporary file names that
++     can exist for a given template is 62**6.  It should never be
++     necessary to try all these combinations.  Instead if a reasonable
++     number of names is tried (we define reasonable as 62**3) fail to
++     give the system administrator the chance to remove the problems.  */
++#define ATTEMPTS_MIN (62 * 62 * 62)
++
++  /* The number of times to attempt to generate a temporary file.  To
++     conform to POSIX, this must be no smaller than TMP_MAX.  */
++#if ATTEMPTS_MIN < TMP_MAX
++  unsigned int attempts = TMP_MAX;
++#else
++  unsigned int attempts = ATTEMPTS_MIN;
++#endif
++
++  len = strlen (tmpl);
++  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
++    {
++      errno = EINVAL;
++      return -1;
++    }
++
++/* This is where the Xs start.  */
++  XXXXXX = &tmpl[len - 6];
++
++  /* Get some more or less random data.  */
++  {
++    struct timeval tv;
++    gettimeofday (&tv, NULL);
++    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
++  }
++  value += random_time_bits ^ getpid ();
++
++  for (count = 0; count < attempts; value += 7777, ++count)
++    {
++      unsigned long v = value;
++
++      /* Fill in the random bits.  */
++      XXXXXX[0] = letters[v % 62];
++      v /= 62;
++      XXXXXX[1] = letters[v % 62];
++      v /= 62;
++      XXXXXX[2] = letters[v % 62];
++      v /= 62;
++      XXXXXX[3] = letters[v % 62];
++      v /= 62;
++      XXXXXX[4] = letters[v % 62];
++      v /= 62;
++      XXXXXX[5] = letters[v % 62];
++
++      fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, _S_IREAD | _S_IWRITE);
++      if (fd >= 0)
++    {
++      errno = save_errno;
++      return fd;
++    }
++      else if (errno != EEXIST)
++    return -1;
++    }
++
++  /* We got out of the loop because we ran out of combinations to try.  */
++  errno = EEXIST;
++  return -1;
++}
++// END PATCH
++
+ // Internal to the POSIX File class.
+ static bool StatFile(const char* path, struct stat* stat_data) {
+   struct stat tmp;
+diff --git a/src/kml/base/string_util.cc b/src/kml/base/string_util.cc
+index b3a9654..3fdba2b 100644
+--- a/src/kml/base/string_util.cc
++++ b/src/kml/base/string_util.cc
+@@ -31,6 +31,23 @@
+ 
+ namespace kmlbase {
+ 
++// START PATCH
++int strncasecmp(const char *s1, const char *s2, size_t n) { 
++    while (*s1 != 0 && tolower(*s1) == tolower(*s2)) { 
++        ++s1; 
++        ++s2; 
++    } 
++  
++    return 
++    (*s2 == 0) 
++    ? (*s1 != 0) 
++    : (*s1 == 0) 
++        ? -1 
++        : (tolower(*s1) - tolower(*s2)); 
++}
++
++// ENDPATCH
++
+ void b2a_hex(uint32_t i, char* out) {
+   char map[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                   'a', 'b', 'c', 'd', 'e', 'f'};
+diff --git a/third_party/Makefile.am b/third_party/Makefile.am
+index b73dec3..fe34dea 100644
+--- a/third_party/Makefile.am
++++ b/third_party/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
+ 	      -I$(top_srcdir)/third_party/gtest-1.7.0/include
+ 
+ lib_LTLIBRARIES = libminizip.la liburiparser.la
+-noinst_LTLIBRARIES = libgtest.la libgtest_main.la
++#noinst_LTLIBRARIES = libgtest.la libgtest_main.la
+ 
+ libminizip_la_SOURCES = \
+ 	zlib-1.2.3/contrib/minizip/unzip.c \
+@@ -83,11 +83,11 @@ libboostconfigplatforminclude_HEADERS = \
+ 	$(boost)/config/platform/linux.hpp \
+ 	$(boost)/config/platform/macos.hpp
+ 
+-libgtest_la_SOURCES = \
+-	gtest-1.7.0/src/gtest-all.cc
++#libgtest_la_SOURCES = \
++#	gtest-1.7.0/src/gtest-all.cc
+ 
+-libgtest_main_la_SOURCES = gtest-1.7.0/src/gtest_main.cc
+-libgtest_main_la_LIBADD = libgtest.la
++#libgtest_main_la_SOURCES = gtest-1.7.0/src/gtest_main.cc
++#libgtest_main_la_LIBADD = libgtest.la
+ 
+ # TODO: add the new gtest libs for windows.
+ #	gtest-1.7.0.win32/debug/gtest.lib \
+@@ -149,38 +149,6 @@ EXTRA_DIST = \
+ 	$(boost)/config/stdlib/sgi.hpp \
+ 	$(boost)/config/stdlib/stlport.hpp \
+ 	$(boost)/config/stdlib/vacpp.hpp \
+-	gtest-1.7.0/include/gtest/gtest-death-test.h \
+-	gtest-1.7.0/include/gtest/gtest-message.h \
+-	gtest-1.7.0/include/gtest/gtest-param-test.h \
+-	gtest-1.7.0/include/gtest/gtest-param-test.h.pump \
+-	gtest-1.7.0/include/gtest/gtest-printers.h \
+-	gtest-1.7.0/include/gtest/gtest-spi.h \
+-	gtest-1.7.0/include/gtest/gtest-test-part.h \
+-	gtest-1.7.0/include/gtest/gtest-typed-test.h \
+-	gtest-1.7.0/include/gtest/gtest.h \
+-	gtest-1.7.0/include/gtest/gtest_pred_impl.h \
+-	gtest-1.7.0/include/gtest/gtest_prod.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-death-test-internal.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-filepath.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-internal.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-linked_ptr.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-param-util-generated.h.pump \
+-	gtest-1.7.0/include/gtest/internal/gtest-param-util.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-port.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-string.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-tuple.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-tuple.h.pump \
+-	gtest-1.7.0/include/gtest/internal/gtest-type-util.h \
+-	gtest-1.7.0/include/gtest/internal/gtest-type-util.h.pump \
+-	gtest-1.7.0/src/gtest-death-test.cc \
+-	gtest-1.7.0/src/gtest-filepath.cc \
+-	gtest-1.7.0/src/gtest-internal-inl.h \
+-	gtest-1.7.0/src/gtest-port.cc \
+-	gtest-1.7.0/src/gtest-printers.cc \
+-	gtest-1.7.0/src/gtest-test-part.cc \
+-	gtest-1.7.0/src/gtest-typed-test.cc \
+-	gtest-1.7.0/src/gtest.cc \
+ 	uriparser-0.7.5/COPYING \
+ 	uriparser-0.7.5.win32/debug/uriparser.lib \
+ 	uriparser-0.7.5.win32/release/uriparser.lib \
+-- 
+1.9.5.github.0
+

contrib/RideLogger/.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

contrib/RideLogger/.gitignore

@@ -0,0 +1,12 @@
+# Ignores for Eclipse
+/.settings/
+
+# Ignores for Android Projects
+/bin/
+/gen/
+/publish/
+/local.properties
+/secure.properties
+
+# Ignores for Mac machines
+.DS_Store

contrib/RideLogger/AndroidManifest.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE AndroidXML>
+<manifest 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
+    package="com.ridelogger"
+    android:versionCode="040000"
+    android:versionName="4.0.0"
+    android:icon="@drawable/ic_launcher" >
+    <uses-sdk android:minSdkVersion="14"
+          android:targetSdkVersion="21" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.DeviceDefault.Light" >
+        <service
+           android:name="com.ridelogger.RideService"
+           android:icon="@drawable/ic_launcher"
+           android:label="@string/service_name" >
+        </service>
+        <activity
+            android:name="com.ridelogger.StartActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.ridelogger.SettingsActivity"
+            android:label="@string/setting_title" >
+        </activity>
+    </application>
+</manifest>

contrib/RideLogger/lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

contrib/RideLogger/proguard-android-optimize.txt

@@ -0,0 +1,68 @@
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+
+# Optimizations: If you don't want to optimize, use the
+# proguard-android.txt configuration file instead of this one, which
+# turns off the optimization flags.  Adding optimization introduces
+# certain risks, since for example not all optimizations performed by
+# ProGuard works on all versions of Dalvik.  The following flags turn
+# off various optimizations known to have issues, but the list may not
+# be complete or up to date. (The "arithmetic" optimization can be
+# used if you are only targeting Android 2.0 or later.)  Make sure you
+# test thoroughly if you go this route.
+-optimizations code/simplification/arithmetic,code/simplification/cast,field/*,class/merging/*
+-optimizationpasses 24 
+-allowaccessmodification
+-dontpreverify
+
+# The remainder of this file is identical to the non-optimized version
+# of the Proguard configuration file (except that the other file has
+# flags to turn off optimization).
+
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-verbose
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
+}
+
+# We want to keep methods in Activity that could be used in the XML attribute onClick
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+-keep public class com.ridelogger.SettingsActivity$GeneralFragment
+-keep public class com.ridelogger.SettingsActivity$AntFragment
+-keep public class com.ridelogger.SettingsActivity$SensorsFragment

contrib/RideLogger/project.properties

@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+proguard.config=proguard-android-optimize.txt
+
+# Project target.
+target=android-21
+min=android-14

contrib/RideLogger/res/layout/activity_dashboard.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE AndroidXML>
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/LayoutData"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:numColumns="auto_fit"
+    android:stretchMode="columnWidth"
+    android:gravity="right"
+/>

contrib/RideLogger/res/layout/settings.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<preference-headers
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <header android:fragment="com.ridelogger.SettingsActivity$GeneralFragment"
+        android:title="@string/setting_general_title"
+        android:summary="@string/setting_general_note" />
+    <header android:fragment="com.ridelogger.SettingsActivity$AntFragment"
+        android:title="@string/setting_ant_title"
+        android:summary="@string/setting_ant_note" />
+    <header android:fragment="com.ridelogger.SettingsActivity$SensorsFragment"
+        android:title="@string/setting_sensors_title"
+        android:summary="@string/setting_sensors_note" />
+</preference-headers>

contrib/RideLogger/res/menu/start_activity.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    
+    <item android:id="@+id/Start"
+          android:title="@string/start" />
+    <item android:id="@+id/Stop"
+          android:title="@string/stop" />
+    <item android:id="@+id/Settings"
+          android:title="@string/edit_settings"
+          android:showAsAction="never" />
+</menu>

contrib/RideLogger/res/values/strings.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE AndroidXML>
+<resources>
+    <string name="app_name">Ride Logger</string>
+    <string name="service_name">Logging Ride</string>
+    
+    <string name="emergency_contact_dialog_title">Emergency Contact</string>
+    <string name="emergency_contact_dialog_note">Should a text messesage be sent on ride start and periodically to let your emergency contact know you are alright?</string>
+
+    <string name="sms_period_dialog_title">Emergency Contact SMS Period</string>
+    <string name="sms_period_dialog_note">Period in Minutes:</string>
+    
+    <string name="crash_detection_dialog_title">Crash Detection</string>
+    <string name="crash_detection_dialog_note">Should a text messesage be sent on crash detction to your emergency contact?</string>
+    
+    <string name="emergency_contact_number_dialog_title">Emergency Contact Number</string>
+    <string name="emergency_contact_number_dialog_note">Emergency phone number to update position on crash detection</string>
+    
+    <string name="ant_setup_title">Set Ant+</string>
+    <string name="ant_setup_note">Pair your Ant+ devices now?</string>
+    
+    <string name="ant_pair_dialog_title">Select Ant Devices</string>
+    <string name="ant_pair_dialog_button_note">Pair</string>    
+  
+    <string name="gc_rider_name_dialog_title">Enter Rider Name</string>
+    <string name="gc_rider_name_dialog_note">What is your Golder Cheata Rider Name?</string>
+  
+    <string name="save_setting_button">Next</string>
+    <string name="skip_setting_button">Skip</string>
+    
+    <string name="boolean_dialog_yes">Yes</string>
+    <string name="boolean_dialog_no">No</string>
+    
+    <string name="starting_ride">Starting Ride!</string>
+    <string name="stopping_ride">Stoping Ride!</string>
+    
+    <string name="ride_on">Ride On</string>
+    <string name="building_ride">Building ride: </string>
+    
+    <string name="click_to_stop"> Click to stop ride.</string>
+
+    <string name="ride_start_title">Start Ride</string>
+    <string name="ride_start_note">Make sure locations is turned on.  Internet connection is NOT required.</string>
+  
+    <string name="start">Start Logging</string>
+    <string name="edit_settings">Settings</string>
+    
+    <string name="ride_stop_title">Ride in Progress</string>
+    <string name="ride_stop_note">Would you like to stop the ride or view current values.</string>
+  
+    <string name="stop">Stop Logging</string>
+    <string name="view">View</string>
+    
+    <string name="crash_warning">WARNING CRASH!</string>
+    <string name="crash_confirm">CRASH CONFIRMED!</string>
+    <string name="crash_unknow_location">Unknow location.</string>
+    <string name="crash_magnitude">Mag</string>
+    
+    <string name="ride_start_sms">I\'m starting my ride.</string>
+    <string name="ride_stop_sms">I have finished my ride.</string>
+    <string name="riding_ok_sms">I\'m ok.</string>
+    
+    <string name="setting_title">Settings</string>
+    
+    <string name="setting_general_title">General</string>
+    <string name="setting_general_note">Settings</string>
+    
+    <string name="setting_ant_title">Ant+</string>
+    <string name="setting_ant_note">Setup your Ant+ Devices</string>
+    
+    <string name="searching_for_ants">Searching for Ant+ Devices...</string>
+    <string name="found_ants">Found Ant+ Devices, Press to Pair.</string>
+    <string name="no_found_ants">Nothing found to pair.</string>
+    
+    <string name="setting_sensors_title">Display Sensors</string>
+    <string name="setting_sensors_note">List of Sensors Display</string>
+    
+    <string name="setting_wheel_size">Wheel Circumference in Meters</string>
+
+    <string name="imperial_units_title">Imperial Units</string>
+    <string name="imperial_units_note">Show Measurements in Imperial Units</string>
+    
+    <string name="setting_size_title">Display Text Size</string>
+    
+    <string name="PREFS_NAME">RideLogger</string>      
+    <string name="PREF_RIDER_NAME">RiderName</string>       
+    <string name="PREF_EMERGENCY_NUMBER">EmergencyNumbuer</string>
+    <string name="PREF_DETECT_CRASH">DetectCrash</string>     
+    <string name="PREF_PHONE_HOME">PhoneHome</string>       
+    <string name="PREF_PAIRED_ANTS">PairedAnts</string>      
+    <string name="PREF_PHONE_HOME_PERIOD">PhoneHomePeriod</string>
+    <string name="PREF_TRACKING_SENSORS">TrackingSensors</string>
+    <string name="PREF_TRACKING_SIZE">TrackingSize</string>
+    <string name="PREF_TRACKING_IMPERIAL_UNITS">TrackingImperialUnits</string>
+    <string name="PREF_WHEEL_SIZE">WheelSize</string>
+    
+</resources>

contrib/RideLogger/res/xml/ant_settings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+        <PreferenceCategory
+            android:title="@string/PREFS_NAME">
+
+        <MultiSelectListPreference
+            android:key="@string/PREF_PAIRED_ANTS"
+            android:title="@string/ant_pair_dialog_title"
+            android:summary="@string/ant_pair_dialog_button_note"
+            />
+        
+        <EditTextPreference 
+            android:key="@string/PREF_WHEEL_SIZE"
+            android:title="@string/setting_wheel_size"
+            android:defaultValue="2.096"
+            />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>

contrib/RideLogger/res/xml/general_settings.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+        <PreferenceCategory
+            android:title="@string/PREFS_NAME"
+            android:persistent="true">
+
+        <EditTextPreference
+                android:key="@string/PREF_RIDER_NAME"
+                android:title="@string/gc_rider_name_dialog_title"
+                android:summary="@string/gc_rider_name_dialog_note" />
+        
+        <EditTextPreference
+                android:key="@string/PREF_EMERGENCY_NUMBER"
+                android:title="@string/emergency_contact_number_dialog_title"
+                android:summary="@string/emergency_contact_number_dialog_note" />
+
+        <CheckBoxPreference
+                android:layout="?android:attr/preferenceLayoutChild"
+                android:dependency="@string/PREF_EMERGENCY_NUMBER"
+                android:key="@string/PREF_DETECT_CRASH"
+                android:title="@string/crash_detection_dialog_title"
+                android:summary="@string/crash_detection_dialog_note" />
+        
+        <!-- The visual style of a child is defined by this styled theme attribute. -->
+        <CheckBoxPreference
+                android:layout="?android:attr/preferenceLayoutChild"
+                android:dependency="@string/PREF_EMERGENCY_NUMBER"
+                android:key="@string/PREF_PHONE_HOME"
+                android:title="@string/emergency_contact_dialog_title"
+                android:summary="@string/emergency_contact_dialog_note" />
+        
+        <EditTextPreference
+                android:layout="?android:attr/preferenceLayoutChild"
+                android:dependency="@string/PREF_PHONE_HOME"
+                android:key="@string/PREF_PHONE_HOME_PERIOD"
+                android:title="@string/sms_period_dialog_title"
+                android:summary="@string/sms_period_dialog_note"
+                android:defaultValue="20" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>

contrib/RideLogger/res/xml/sensors_settings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+        <PreferenceCategory
+            android:title="@string/PREFS_NAME">
+
+        <MultiSelectListPreference
+            android:key="@string/PREF_TRACKING_SENSORS"
+            android:title="@string/setting_sensors_title"
+            android:summary="@string/setting_sensors_note"
+            />
+        <CheckBoxPreference 
+            android:key="@string/PREF_TRACKING_IMPERIAL_UNITS"
+            android:title="@string/imperial_units_title"
+            android:summary="@string/imperial_units_note"
+            />
+        
+        <EditTextPreference 
+            android:key="@string/PREF_TRACKING_SIZE"
+            android:title="@string/setting_size_title"
+            android:defaultValue="20"
+            />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>

contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java

@@ -0,0 +1,281 @@
+package com.ridelogger;
+
+import java.util.Set;
+
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.preference.PreferenceManager;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+public class CurrentValuesAdapter extends BaseAdapter {
+    private StartActivity    context;
+    
+    private int[]             keys;
+    private String[]          values;
+    private String[]          keyLabels;
+    private int               size      = 20;
+    private boolean           imperial  = false;
+    private SharedPreferences settings  = null;
+
+    private GridView layout;
+
+    public CurrentValuesAdapter(StartActivity c, GridView pLayout) {
+        context                    = c;
+        layout                     = pLayout;
+        
+        layout.setBackgroundColor(Color.BLACK);
+        layout.setVerticalSpacing(4);
+        layout.setHorizontalSpacing(4);
+        
+        settings            = PreferenceManager.getDefaultSharedPreferences(context);
+        Set<String> sensors = settings.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
+        
+        size                = Integer.valueOf(settings.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20"));
+        imperial            = settings.getBoolean(context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS), false);
+        
+        initKeys(sensors);
+        initKeyLables();
+        initValues();
+        
+        settings.registerOnSharedPreferenceChangeListener(
+            new SharedPreferences.OnSharedPreferenceChangeListener() {
+                @Override
+                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String pkey) {
+                    if(pkey == context.getString(R.string.PREF_TRACKING_SIZE)) {
+                        size = Integer.valueOf(sharedPreferences.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20"));
+                        setupWidth();
+                        notifyDataSetChanged();
+                    } else if (pkey == context.getString(R.string.PREF_TRACKING_SENSORS)) {
+                        Set<String> sensors = sharedPreferences.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
+                        
+                        initKeys(sensors);
+                        initKeyLables();
+                        initValues();
+                        
+                        layout.setAdapter(CurrentValuesAdapter.this);
+                        notifyDataSetChanged();
+                    } else if (pkey == context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS)) {
+                        imperial = sharedPreferences.getBoolean(pkey, false);
+                        
+                        initKeyLables();
+                        initValues();
+                        
+                        notifyDataSetChanged();
+                    }
+                }
+            }
+        );
+    }
+    
+    
+    private void initKeys(Set<String> sensors) {
+        if(sensors != null && sensors.size() > 0) {
+            keys  = new int[sensors.size()];
+            int i = 0;
+            for(String sensor : sensors) {
+                keys[i]   = Integer.parseInt(sensor);
+                i++;
+            }
+        } else {
+            keys = new int[RideService.KEYS.length];
+            for (int i = 0; i < RideService.KEYS.length; i++) {
+                keys[i] = i;
+            }
+        }        
+    }
+    
+    private void initKeyLables() {
+        keyLabels = new String[keys.length];
+        
+        if(!imperial) {
+            for(int key : keys) {
+                keyLabels[key] = RideService.KEYS[key].toString().toLowerCase();
+            }
+        } else {
+            for(int key : keys) {
+                switch (key) {
+                    case RideService.ALTITUDE:
+                        keyLabels[key] = "ft";
+                        break;
+                        
+                    case RideService.KPH:
+                        keyLabels[key] = "mph";
+                        break;
+                        
+                    case RideService.KM:
+                        keyLabels[key] = "m";
+                        break;
+        
+                    default:
+                        keyLabels[key] = RideService.KEYS[key].toString().toLowerCase();
+                        break;
+                }
+            }
+        }
+    }
+    
+    private void initValues() {
+        values    = new String[keys.length];
+        for (int key : keys) {
+            if(key == RideService.SECS) { 
+                values[key] = "00:00:00";
+            } else {
+                values[key] = "0.0";
+            }
+        }
+    }
+    
+    private RelativeLayout newRelativeLayout(int key) {
+        RelativeLayout view = new RelativeLayout(context);
+        view.setBackgroundColor(Color.WHITE);
+        
+        TextView valueView = newValueTv(key);
+        TextView keyView   = newKeyTv(key);
+        
+        RelativeLayout.LayoutParams valueLayoutParams = new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.WRAP_CONTENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT
+        );
+        
+        valueLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        valueLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        
+        view.addView(valueView, valueLayoutParams);
+        
+        RelativeLayout.LayoutParams keyLayoutParams = new RelativeLayout.LayoutParams(
+                RelativeLayout.LayoutParams.WRAP_CONTENT,
+                RelativeLayout.LayoutParams.WRAP_CONTENT
+        );
+        
+        keyLayoutParams.addRule(RelativeLayout.BELOW, valueView.getId());
+        keyLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+        keyLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        
+        view.addView(keyView, keyLayoutParams);
+        
+        return view;
+    }
+    
+    
+    private TextView newValueTv(int key){
+        TextView tv = new TextView(context);
+        tv.setTextAppearance(context, android.R.attr.textAppearanceLarge);
+        tv.setTypeface(Typeface.MONOSPACE, Typeface.BOLD);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+        tv.setText(values[key]);
+        tv.setId(key + 1);
+        return tv;
+    }
+    
+    
+    private TextView newKeyTv(int key){
+        TextView tv = new TextView(context);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
+        tv.setBackgroundColor(Color.LTGRAY);
+        tv.setTypeface(Typeface.MONOSPACE, Typeface.BOLD);
+        tv.setPadding(4, 1, 4, 1);
+        tv.setText(keyLabels[key]);
+        return tv;
+    }
+    
+    
+    @Override
+    public int getCount() {
+        return keys.length;
+    }
+    
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+    
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+    
+
+    @Override    
+    public View getView(int position, View convertView, ViewGroup parent) {        
+        if (convertView == null) {
+            return newRelativeLayout(keys[position]);
+        } else {
+            RelativeLayout view = (RelativeLayout) convertView;
+            TextView valueView  = (TextView) (view.getChildAt(0));
+            TextView valueKey   = (TextView) (view.getChildAt(1));
+            
+            if(valueView.getText() != values[keys[position]])
+                valueView.setText(values[keys[position]]);
+            
+            valueView.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+            
+            if(valueKey.getText() != keyLabels[keys[position]])
+                valueKey.setText(keyLabels[keys[position]]);
+            
+            return convertView;
+        }
+    }
+    
+    
+    public void update(float[] current_float_values) {
+        for (int key: keys) {
+            if(key == RideService.SECS) {
+                int hr = (int) (current_float_values[key]/3600);
+                int rem = (int) (current_float_values[key]%3600);
+                int mn = rem/60;
+                int sec = rem%60;
+                
+                values[key] = (hr<10 ? "0" : "") + hr + ":" + (mn<10 ? "0" : "") + mn + ":" + (sec<10 ? "0" : "")+sec;
+            } else if(!imperial) {
+                values[key] = String.format("%.1f", current_float_values[key]);
+            } else {
+                switch (key) {
+                    case RideService.ALTITUDE:
+                        values[key] = String.format("%.1f", current_float_values[key] * 3.28084);
+                        break;
+                    
+                    case RideService.KPH:
+                        values[key] = String.format("%.1f", current_float_values[key] * 0.621371);
+                        break;
+
+                    case RideService.KM:
+                        values[key] = String.format("%.1f", current_float_values[key] * 0.621371);
+                        break;
+        
+                    default:
+                        values[key] = String.format("%.1f", current_float_values[key]);
+                        break;
+                }
+            }
+        }
+        
+        notifyDataSetChanged();
+    }
+
+    /**
+     * returns the size of the cell basted on 8 chars wide and the configured size param
+     * @return int
+     */
+    private void setupWidth() {
+        TextView tv = new TextView(context);
+        tv.setTextAppearance(context, android.R.attr.textAppearanceLarge);
+        tv.setTypeface(Typeface.MONOSPACE, Typeface.BOLD);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
+        tv.setText(String.format("%.1f", 1111.11));
+        
+        Rect bounds = new Rect();
+        tv.getPaint().getTextBounds("00:00:00", 0, "00:00:00".length(), bounds);
+
+        layout.setColumnWidth(bounds.width() + 16);
+    }
+}

contrib/RideLogger/src/com/ridelogger/GzipWriter.java

@@ -0,0 +1,28 @@
+package com.ridelogger;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.GZIPOutputStream;
+
+public class GzipWriter extends GZIPOutputStream {
+    public GzipWriter(OutputStream os) throws IOException {
+        super(os);
+    }
+
+    public void write(String data) throws IOException {
+        super.write(data.getBytes());
+    }
+    
+    public void write(float data) throws IOException {
+        super.write(Float.floatToIntBits(data));
+    }
+
+    public void write(CharSequence data) throws IOException {
+        byte[] barr = new byte[data.length()];
+        for (int i = 0; i < barr.length; i++) {
+            barr[i] = (byte) data.charAt(i);
+        }
+        
+        super.write(barr);
+    }
+}

contrib/RideLogger/src/com/ridelogger/RideService.java

@@ -0,0 +1,417 @@
+package com.ridelogger;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import com.dsi.ant.plugins.antplus.pcc.defines.DeviceType;
+import com.dsi.ant.plugins.utility.log.LogAnt;
+import com.ridelogger.formats.BaseFormat;
+import com.ridelogger.formats.JsonFormat;
+import com.ridelogger.listners.Base;
+import com.ridelogger.listners.Gps;
+import com.ridelogger.listners.HeartRate;
+import com.ridelogger.listners.Power;
+import com.ridelogger.listners.Sensors;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.app.TaskStackBuilder;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.SmsManager;
+
+
+/**
+ * RideService
+ * @author Chet Henry
+ * Performs ride logging from sensors as an android service
+ */
+public class RideService extends Service
+{    
+    public static final int notifyID     = 1;                  //Id of the notification in the top android bar that this class creates and alters   
+    
+    public static final int SECS         = 0;
+    public static final int KPH          = 1;
+    public static final int ALTITUDE     = 2;
+    public static final int bearing      = 3;
+    public static final int gpsa         = 4;
+    public static final int LAT          = 5;
+    public static final int LON          = 6;
+    public static final int HR           = 7;
+    public static final int WATTS        = 8;
+    public static final int NM           = 9;
+    public static final int CAD          = 10;
+    public static final int KM           = 11;
+    public static final int LTE          = 12;
+    public static final int RTE          = 13;
+    public static final int SNPLC        = 14;
+    public static final int SNPR         = 15;
+    public static final int ms2x         = 16;
+    public static final int ms2y         = 17;
+    public static final int ms2z         = 18;
+    public static final int temp         = 19;
+    public static final int uTx          = 20;
+    public static final int uTy          = 21;
+    public static final int uTz          = 22;
+    public static final int press        = 23;
+    public static final int lux          = 24;
+    
+    public static CharSequence[] KEYS    = {
+        "SECS", 
+        "KPH", 
+        "ALTITUDE", 
+        "bearing", 
+        "gpsa", 
+        "LAT", 
+        "LON",
+        "HR",
+        "WATTS",
+        "NM",
+        "CAD",
+        "KM",
+        "LTE",
+        "RTE",
+        "SNPLC",
+        "SNPR",
+        "ms2x",
+        "ms2y",
+        "ms2z",
+        "temp",
+        "uTx",
+        "uTy",
+        "uTz",
+        "press",
+        "lux"
+    };
+
+    public GzipWriter          buf;                                                //writes to log file buffered
+    public long                startTime;                                          //start time of the ride
+    public float[]             currentValues = new float[RideService.KEYS.length]; //float array of current values
+    private Messenger          mMessenger    = null;                               //class to send back current values if needed
+    private boolean            rideStarted   = false;                              //have we started logging the ride
+    private int                sensor_index  = 0;                                  //current index of sensors
+    private String             emergencyNumbuer;                                   //the number to send the messages to
+    private Timer              timer;                                              //timer class to control the periodic messages
+    private Timer              timerUI;                                            //timer class to control the periodic messages
+    private Base<?>[]          sensors;                                            //list of sensors tracking
+    public BaseFormat<?>       fileFormat;
+
+    
+    /**
+     * starts the ride on service start
+     */
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        startRide();
+        return Service.START_NOT_STICKY;
+    }
+    
+    
+    /**
+     * returns the messenger to talk to the app with
+     */
+    @Override
+    public IBinder onBind(Intent arg0) {
+        mMessenger = new Messenger(new Handler() { // Handler of incoming messages from clients.
+            Messenger replyTo;
+            @Override
+            public void handleMessage(Message msg) {
+                if(timerUI != null) {
+                    timerUI.cancel();
+                    timerUI = null;
+                }
+                
+                timerUI = new Timer();
+                
+                if(msg.replyTo != null) {
+                    replyTo = msg.replyTo;
+                    timerUI.scheduleAtFixedRate(
+                        new TimerTask() {              
+                            @Override  
+                            public void run() {                    
+                                Message msg = Message.obtain(null, 2, 0, 0);
+                                Bundle bundle = new Bundle();
+                                bundle.putSerializable("currentValues", currentValues);
+                                msg.setData(bundle);
+                                try {
+                                    replyTo.send(msg);
+                                } catch (RemoteException e) {}
+                            }
+                        },
+                        1000, 
+                        1000
+                    ); //every second update the screen
+                }
+            }
+        }); // Target we publish for clients to send messages to IncomingHandler.
+        
+        return mMessenger.getBinder();
+    }
+    
+    
+    /**
+     * releases the timer that sends messages to the app
+     */
+    @Override
+    public boolean onUnbind (Intent intent) {
+        if(timerUI != null) {
+            timerUI.cancel();
+            timerUI = null;
+        }
+        
+        mMessenger = null;
+        
+        return true;
+    }
+    
+    
+    /**
+     * stop the ride on service stop
+     */
+    @Override
+    public void onDestroy() {
+        stopRide();
+        super.onDestroy();
+    }
+    
+    /**
+     * start a ride if there is not one started yet
+     */
+    protected void startRide() {
+        if(rideStarted) return;
+        
+        SharedPreferences settings  = PreferenceManager.getDefaultSharedPreferences(this);
+        emergencyNumbuer            = settings.getString(getString(R.string.PREF_EMERGENCY_NUMBER), "");
+        currentValues[SECS]         = (float) 0.0;
+        
+        startTime                   = System.currentTimeMillis();
+        
+        
+        Date startDate              = new Date(startTime);        
+        
+        SimpleDateFormat startTimef = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        SimpleDateFormat filef      = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+        SimpleDateFormat month      = new SimpleDateFormat("MMMMM");
+        SimpleDateFormat year       = new SimpleDateFormat("yyyy");
+        SimpleDateFormat day        = new SimpleDateFormat("EEEEE");
+        
+        startTimef.setTimeZone(TimeZone.getTimeZone("UTC"));
+        filef.setTimeZone(TimeZone.getTimeZone("UTC"));     
+        month.setTimeZone(TimeZone.getTimeZone("UTC"));     
+        year.setTimeZone(TimeZone.getTimeZone("UTC"));      
+        day.setTimeZone(TimeZone.getTimeZone("UTC"));       
+        
+        final String fileName       = filef.format(startDate) + ".json.gz";
+
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            fileFormat = new JsonFormat(this);
+            fileFormat.createFile();
+            fileFormat.writeHeader();
+            
+            LogAnt.setDebugLevel(LogAnt.DebugLevel.NONE, this);
+            
+            final Set<String> pairedAnts = settings.getStringSet(getString(R.string.PREF_PAIRED_ANTS), null);
+            
+            if(pairedAnts != null && !pairedAnts.isEmpty()){
+                sensors = new Base<?>[pairedAnts.size() + 2];
+                for(String deviceNumber: pairedAnts) {
+                    DeviceType deviceType =  DeviceType.getValueFromInt(settings.getInt(deviceNumber, 0));
+                    switch (deviceType) {
+                        case BIKE_CADENCE:
+                            break;
+                        case BIKE_POWER:
+                            sensors[sensor_index++] = new Power(Integer.valueOf(deviceNumber), this);
+                            break;
+                        case BIKE_SPD:
+                            break;
+                        case BIKE_SPDCAD:
+                            break;
+                        case BLOOD_PRESSURE:
+                            break;
+                        case ENVIRONMENT:
+                            break;
+                        case WEIGHT_SCALE:
+                            break;
+                        case HEARTRATE:
+                            sensors[sensor_index++] = new HeartRate(Integer.valueOf(deviceNumber), this);            
+                            break;
+                        case STRIDE_SDM:
+                            break;
+                        case FITNESS_EQUIPMENT:
+                            break;
+                        case GEOCACHE:
+                        case CONTROLLABLE_DEVICE:
+                            break;
+                        case UNKNOWN:
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            } else {
+                sensors = new Base<?>[4];
+                sensors[sensor_index++] = new HeartRate(0, this);
+                sensors[sensor_index++] = new Power(0, this);
+            }
+            
+            sensors[sensor_index++] = new Gps(this);
+            sensors[sensor_index++] = new Sensors(this);
+        }
+        rideStarted = true;
+        
+        if(settings.getBoolean(getString(R.string.PREF_PHONE_HOME), false)) {
+            timer = new Timer();
+            int period = Integer.parseInt(settings.getString(getString(R.string.PREF_PHONE_HOME_PERIOD), "10"));
+            
+            timer.scheduleAtFixedRate(
+                new TimerTask() {              
+                    @Override  
+                    public void run() {
+                        phoneHome();
+                    }  
+                },
+                60000 * period, 
+                60000 * period
+            ); //every ten min let them know where you are at
+            phoneStart();
+        }
+        
+        //build the notification in the top android drawer
+        NotificationCompat.Builder mBuilder = new NotificationCompat
+            .Builder(this)
+            .setSmallIcon(R.drawable.ic_launcher)
+            .setContentTitle(getString(R.string.ride_on))
+            .setContentText(getString(R.string.building_ride) + " " + fileName + " " + getString(R.string.click_to_stop))
+            .setProgress(0, 0, true)
+            .setContentIntent(
+                TaskStackBuilder
+                    .create(this)
+                    .addParentStack(StartActivity.class)
+                    .addNextIntent(new Intent(this, StartActivity.class))
+                    .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
+            );
+
+        startForeground(notifyID, mBuilder.build());
+    }
+    
+    
+    /**
+     * let a love one know where you are at about every 10 min
+     */
+    public void phoneCrash(double mag) {
+        smsHome(
+                getString(R.string.crash_warning) + "\n" + getLocationLink()
+                + "\n " + getString(R.string.crash_magnitude) + ": " + String.valueOf(mag)
+        );
+    }
+    
+    
+    /**
+     * confirm the crash if we are not moving
+     */
+    public void phoneCrashConfirm() {
+        smsHome(getString(R.string.crash_confirm) + "!\n" + getLocationLink());
+    }
+    
+   
+    /**
+     * let them know we are starting
+     */
+    public void phoneStart() {
+        smsWithLocation(getString(R.string.ride_start_sms));
+    }
+    
+    
+    /**
+     * let them know we are stopping
+     */
+    public void phoneStop() {
+        smsWithLocation(getString(R.string.ride_stop_sms));
+    }
+    
+    
+    /**
+     * send an sms with location
+     */
+    public void smsWithLocation(String body) {        
+        smsHome(body + "\n " + getLocationLink());
+    }
+    
+    
+    /**
+     * let a love one know where you are at about every 10 min
+     */
+    public void phoneHome() {
+        smsWithLocation(getString(R.string.riding_ok_sms));
+    }
+    
+    
+    /**
+     * send a sms message
+     */
+    public void smsHome(String body) {
+        SmsManager smsManager = SmsManager.getDefault();
+        if(emergencyNumbuer != null && PhoneNumberUtils.isWellFormedSmsAddress(emergencyNumbuer)) {
+            smsManager.sendTextMessage(emergencyNumbuer, null, body, null, null);
+        }
+    }
+    
+    public String getLocationLink() {
+        if(currentValues[LAT] != 0.0 || currentValues[LON] != 0.0) {
+            return "https://www.google.com/maps/place/" + currentValues[LAT] + "," + currentValues[LON];
+        }
+        return getString(R.string.crash_unknow_location);
+    }
+    
+    
+    //stop the ride and clean up resources
+    protected void stopRide() {
+        if(!rideStarted) return;
+        
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
+        if(settings.getBoolean(getString(R.string.PREF_PHONE_HOME), false)) {
+            phoneStop();
+        }
+
+        for(Base<?> sensor: sensors) {
+            if(sensor != null) {
+                sensor.onDestroy();
+            }
+        }
+        
+        //stop the phoneHome timer if we need to.
+        if(timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        
+        if(timerUI != null) {
+            timerUI.cancel();
+            timerUI = null;
+        }
+        
+        fileFormat.writeFooter();
+        
+        rideStarted = false;
+        NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mNotificationManager.cancel(notifyID);
+    }
+}
+
+

contrib/RideLogger/src/com/ridelogger/SettingsActivity.java

@@ -0,0 +1,274 @@
+package com.ridelogger;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import com.dsi.ant.plugins.antplus.pcc.defines.DeviceType;
+import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult;
+import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch;
+import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch.MultiDeviceSearchResult;
+import com.dsi.ant.plugins.utility.log.LogAnt;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.MultiSelectListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+
+public class SettingsActivity extends PreferenceActivity {
+    
+    static ArrayList<MultiDeviceSearchResult> foundDevices = new ArrayList<MultiDeviceSearchResult>();
+    
+    /**
+     * This fragment contains a second-level set of preference that you
+     * can get to by tapping an item in the first preferences fragment.
+     */
+    public static class GeneralFragment extends PreferenceFragment {
+        
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.xml.general_settings);
+        }
+        
+        
+        @Override
+        public void onResume() {
+            // TODO Auto-generated method stub
+            super.onResume();
+            
+            if(((SettingsActivity) getActivity()).getServiceRunning(RideService.class) != null) {
+                Preference pref = findPreference(getString(R.string.PREF_RIDER_NAME));
+                pref.setEnabled(false);
+                
+                pref = findPreference(getString(R.string.PREF_EMERGENCY_NUMBER));
+                pref.setEnabled(false);
+            }
+        }
+    }
+    
+    
+    /**
+     * This fragment contains a second-level set of preference that you
+     * can get to by tapping an item in the first preferences fragment.
+     */
+    public static class SensorsFragment extends PreferenceFragment {        
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            addPreferencesFromResource(R.xml.sensors_settings);
+            MultiSelectListPreference mMultiSelectListPreference = (MultiSelectListPreference) findPreference(getString(R.string.PREF_TRACKING_SENSORS));
+            mMultiSelectListPreference.setEntries( RideService.KEYS );
+            
+            CharSequence[] keys = new CharSequence[RideService.KEYS.length];
+            
+            for (int i = 0; i < RideService.KEYS.length; i++) {
+                keys[i] = String.valueOf(i);
+            }
+            mMultiSelectListPreference.setEntryValues(keys);
+        }
+    }
+    
+    
+    @Override
+    public boolean isValidFragment(String fragment) {
+        return true;
+    }
+    
+    
+    /**
+     * This fragment contains a second-level set of preference that you
+     * can get to by tapping an item in the first preferences fragment.
+     */
+    public static class AntFragment extends PreferenceFragment {
+        private MultiDeviceSearch mSearch;
+        private MultiSelectListPreference mMultiSelectListPreference;
+        
+        @Override
+        public void onConfigurationChanged(Configuration newConfig) {
+            // TODO Auto-generated method stub
+            super.onConfigurationChanged(newConfig);
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            
+            addPreferencesFromResource(R.xml.ant_settings);
+            mMultiSelectListPreference = (MultiSelectListPreference) findPreference(getString(R.string.PREF_PAIRED_ANTS));
+        }
+        
+        @Override
+        public void onResume() {
+            // TODO Auto-generated method stub
+            super.onResume();
+            initAntSearch();
+        }
+
+        
+        /**
+         * search for ant+ if we are not recording
+         */
+        public void initAntSearch() {
+            mMultiSelectListPreference.setEnabled(false);
+            if(((SettingsActivity) getActivity()).getServiceRunning(RideService.class) == null) {
+                mMultiSelectListPreference.setSummary(R.string.searching_for_ants);
+                
+                setupAnt();
+
+                Timer timer = new Timer();
+                final Handler handler = new Handler();
+                
+                timer.schedule(
+                    new TimerTask() {
+                        @Override  
+                        public void run() {
+                            if(mMultiSelectListPreference.getEntryValues().length > 0) {
+                                handler.post(new Runnable() {
+                                    public void run() {
+                                        mMultiSelectListPreference.setEnabled(true);
+                                        mMultiSelectListPreference.setSummary(R.string.found_ants);
+                                    }
+                                });
+                            } else {
+                                handler.post(new Runnable() {
+                                    public void run() {
+                                        mMultiSelectListPreference.setEnabled(true);
+                                        mMultiSelectListPreference.setSummary(R.string.no_found_ants);
+                                    }
+                                });
+                            }
+                        }
+                    },
+                    5000
+                );      
+            }
+        }
+        
+
+        /**
+         * try to pair some ant+ devices
+         */
+        protected void setupAnt() {
+            MultiDeviceSearch.SearchCallbacks        mCallback;
+            MultiDeviceSearch.RssiCallback           mRssiCallback;
+            
+            updateList(foundDevices);
+            
+            LogAnt.setDebugLevel(LogAnt.DebugLevel.NONE, this.getActivity());
+            
+            mCallback = new MultiDeviceSearch.SearchCallbacks(){
+                public void onDeviceFound(final MultiDeviceSearchResult deviceFound)
+                {
+                    if(!foundDevices.contains(deviceFound)) {
+                        foundDevices.add(deviceFound);
+                        updateList(foundDevices);
+                    }
+                }
+
+                @Override
+                public void onSearchStopped(RequestAccessResult arg0) {}
+            };
+            
+            mRssiCallback = new MultiDeviceSearch.RssiCallback() {
+                @Override
+                public void onRssiUpdate(final int resultId, final int rssi){}
+            };
+
+            // start the multi-device search
+            mSearch = new MultiDeviceSearch(this.getActivity(), EnumSet.allOf(DeviceType.class), mCallback, mRssiCallback);
+        }
+        
+        
+        /**
+         * dialog of soon to be paired ant devices
+         * @param foundDevices
+         */
+        protected void updateList(final ArrayList<MultiDeviceSearchResult> foundDevices) {
+            ArrayList<CharSequence> foundDevicesString = new ArrayList<CharSequence>();
+            ArrayList<CharSequence> foundDevicesValues = new ArrayList<CharSequence>();
+            
+            for(MultiDeviceSearchResult device : foundDevices) { 
+                foundDevicesString.add(device.getAntDeviceType() + ": " + String.valueOf(device.getAntDeviceNumber()));
+            }
+            
+            for(MultiDeviceSearchResult device : foundDevices) { 
+                foundDevicesValues.add(String.valueOf(device.getAntDeviceNumber()));
+            }
+            
+            if(mMultiSelectListPreference != null) {
+                mMultiSelectListPreference.setEntries(
+                    foundDevicesString.toArray(new CharSequence[foundDevicesString.size()])
+                );
+                mMultiSelectListPreference.setEntryValues(
+                    foundDevicesValues.toArray(new CharSequence[foundDevicesValues.size()])
+                );
+            }
+        }
+        
+        
+        @Override
+        public void onDestroy() {
+            if(mSearch != null) mSearch.close();
+            super.onDestroy();
+        }
+    }
+    
+    /**
+     * Populate the activity with the top-level headers.
+     */
+    @Override
+    public void onBuildHeaders(List<Header> target) {
+        loadHeadersFromResource(R.layout.settings, target);
+        
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
+        settings.registerOnSharedPreferenceChangeListener(
+                new SharedPreferences.OnSharedPreferenceChangeListener() {
+                    @Override
+                    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String pkey) {
+                        if (pkey == getString(R.string.PREF_PAIRED_ANTS)) {
+                            Set<String> sensors = sharedPreferences.getStringSet(pkey, null);
+                            if(sensors != null && sensors.size() > 0) {
+                                Editor editor = sharedPreferences.edit();
+                                for(MultiDeviceSearchResult result : foundDevices) {
+                                    sensors.contains(String.valueOf(result.getAntDeviceNumber()));
+                                    editor.putInt(String.valueOf(result.getAntDeviceNumber()), result.getAntDeviceType().getIntValue());
+                                }
+                                editor.commit();
+                            }
+                        }
+                    }
+                }
+            );
+    }
+    
+    
+    /**
+     * is a service running or not
+     * @param serviceClass
+     * @return
+     */
+    public RunningServiceInfo getServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return service;
+            }
+        }
+        return null;
+    }
+}

contrib/RideLogger/src/com/ridelogger/StartActivity.java

@@ -0,0 +1,215 @@
+package com.ridelogger;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.support.v4.app.FragmentActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.GridView;
+import android.widget.Toast;
+
+public class StartActivity extends FragmentActivity
+{                
+    private MenuItem startMenu;
+    private MenuItem stopMenu;
+    
+    private ServiceConnection mConnection;
+    static CurrentValuesAdapter currentValuesAdapter;
+
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu items for use in the action bar
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.start_activity, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle presses on the action bar items
+        if(item.getItemId() == R.id.Settings) {
+            setupSettings();
+        } else if(item.getItemId() == R.id.Start) {
+            startRide();
+        } else {
+            stopRide();
+        }
+        
+        return true;
+    }
+
+    
+    /**
+     * start up our class
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {    
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dashboard);
+        
+        GridView layout = (GridView) findViewById(R.id.LayoutData);
+        currentValuesAdapter = new CurrentValuesAdapter(this, layout);
+        layout.setAdapter(currentValuesAdapter);
+    }
+    
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        bindToService();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unBindToService();
+    }
+    
+    @Override
+    protected void onStop() {
+        super.onStop();
+        unBindToService();
+    }
+    
+    
+    /**
+     * setup the settings for the user
+     */
+    private void setupSettings() {
+        Intent intent = new Intent(this, SettingsActivity.class);
+        startActivity(intent);
+    }
+
+    
+    /**
+     * stop ride and clean up references 
+     */
+    private void stopRide() {
+        Toast toast = Toast.makeText(getApplicationContext(), getString(R.string.stopping_ride), Toast.LENGTH_LONG);
+        toast.show();
+        
+        Intent rsi = new Intent(this, RideService.class);
+        this.stopService(rsi);
+        finish();
+    }
+    
+    static final Handler mHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg_internal) {
+            updateValues(msg_internal.getData());
+        }
+    };
+    
+    
+    /**
+     * tell the service to start sending us messages with current values
+     */
+    private void bindToService() {
+        RunningServiceInfo service = getServiceRunning(RideService.class);
+        
+        if(service != null) {
+            mConnection = new ServiceConnection() {
+                public void onServiceConnected(ComponentName className, IBinder service) {
+                    Messenger mService = new Messenger(service);
+                    try {
+                        Message msg = Message.obtain();
+                        msg.replyTo = new Messenger(mHandler);
+                        
+                        mService.send(msg);
+                    } catch (RemoteException e) {
+                        // In this case the service has crashed before we could even do anything with it
+                    }
+                }
+
+                public void onServiceDisconnected(ComponentName className) {}
+            };
+            
+            bindService(new Intent(StartActivity.this, RideService.class), mConnection, Context.BIND_AUTO_CREATE);
+        }
+    }
+    
+    
+    /**
+     * tell the service to stop sending us messages with current values
+     */
+    private void unBindToService() {
+        if (mConnection != null) {
+            // Detach our existing connection.
+            unbindService(mConnection);
+            mConnection = null;
+        }
+    }
+    
+    
+    /**
+     * update the text fields with current values
+     * @param bundle 
+     */
+    private static void updateValues(Bundle bundle) {
+        currentValuesAdapter.update((float[]) bundle.getSerializable("currentValues"));       
+    }
+    
+    
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        
+        RunningServiceInfo service = getServiceRunning(RideService.class);
+        startMenu = menu.findItem(R.id.Start);
+        stopMenu  = menu.findItem(R.id.Stop);
+        if(service == null) {
+            startMenu.setVisible(true);
+            stopMenu.setVisible(false);
+        } else {
+            startMenu.setVisible(false);
+            stopMenu.setVisible(true);
+        }
+        return true;
+    }
+    
+
+    /**
+     * start the ride and notify the user of success
+     */
+    private void startRide() {
+        Intent rsi = new Intent(this, RideService.class);
+        this.startService(rsi);
+        
+        startMenu.setVisible(false);
+        stopMenu.setVisible(true);
+        
+        bindToService();
+        
+        Toast toast = Toast.makeText(getApplicationContext(), getString(R.string.starting_ride), Toast.LENGTH_LONG);
+        toast.show();
+    }
+    
+    
+    /**
+     * is a service running or not
+     * @param serviceClass
+     * @return
+     */
+    private RunningServiceInfo getServiceRunning(Class<?> serviceClass) {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (serviceClass.getName().equals(service.service.getClassName())) {
+                return service;
+            }
+        }
+        return null;
+    }
+}

contrib/RideLogger/src/com/ridelogger/formats/BaseFormat.java

@@ -0,0 +1,71 @@
+package com.ridelogger.formats;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import android.os.Environment;
+
+import com.ridelogger.GzipWriter;
+import com.ridelogger.RideService;
+
+
+public class BaseFormat<T> {
+    protected GzipWriter  buf;
+    protected RideService context;
+    protected String      subExt = "";
+    
+    public BaseFormat(RideService rideService) {
+        context = rideService;
+    }
+    
+    
+    public void createFile() {
+        File dir = new File(
+            Environment.getExternalStorageDirectory(), 
+            "Rides"
+        );
+        
+        dir.mkdirs();
+        
+        Date             startDate = new Date(context.startTime);
+        SimpleDateFormat filef     = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+        String           fileName  = filef.format(startDate) + subExt + ".gz";
+        
+        try {
+            buf = new GzipWriter(new BufferedOutputStream(new FileOutputStream(new File(dir, fileName))));
+        } catch (Exception e) {}
+    }
+    
+    
+    public void writeHeader(){
+        try {
+            synchronized (buf) {
+                for(CharSequence key : RideService.KEYS) {
+                    buf.write(key);
+                    buf.write(",");
+                }
+            }
+        } catch (Exception e) {}
+    }
+    
+    
+    public void writeValues() {
+        try {
+            synchronized (buf) {
+                for(float value : context.currentValues) {
+                    buf.write(value);
+                }
+            }
+        } catch (Exception e) {}
+    }
+
+
+    public void writeFooter() {
+        try {
+            buf.close();
+        } catch (Exception e) {}
+    }
+}

contrib/RideLogger/src/com/ridelogger/formats/JsonFormat.java

@@ -0,0 +1,93 @@
+package com.ridelogger.formats;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+import com.ridelogger.R;
+import com.ridelogger.RideService;
+
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class JsonFormat extends BaseFormat<Object> {
+    public JsonFormat(RideService rideService) {
+        super(rideService);
+        subExt = ".json";
+    }
+    
+    public void writeHeader() {
+        SharedPreferences settings  = PreferenceManager.getDefaultSharedPreferences(context);
+        Date startDate              = new Date(context.startTime);        
+        
+        SimpleDateFormat startTimef = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        SimpleDateFormat filef      = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+        SimpleDateFormat month      = new SimpleDateFormat("MMMMM");
+        SimpleDateFormat year       = new SimpleDateFormat("yyyy");
+        SimpleDateFormat day        = new SimpleDateFormat("EEEEE");
+        
+        startTimef.setTimeZone(TimeZone.getTimeZone("UTC"));
+        filef.setTimeZone(TimeZone.getTimeZone("UTC"));     
+        month.setTimeZone(TimeZone.getTimeZone("UTC"));     
+        year.setTimeZone(TimeZone.getTimeZone("UTC"));      
+        day.setTimeZone(TimeZone.getTimeZone("UTC")); 
+        
+        try {
+            buf.write("{" +
+                    "\"RIDE\":{" +
+                        "\"STARTTIME\":\"" + startTimef.format(startDate) + " UTC\"," +
+                        "\"RECINTSECS\":1," +
+                        "\"DEVICETYPE\":\"Android\"," +
+                        "\"IDENTIFIER\":\"\"," +
+                        "\"TAGS\":{" +
+                            "\"Athlete\":\"" + settings.getString(context.getString(R.string.PREF_RIDER_NAME), "") + "\"," +
+                            "\"Calendar Text\":\"Auto Recored Android Ride\"," +
+                            "\"Change History\":\"\"," +
+                            "\"Data\":\"\"," +
+                            "\"Device\":\"\"," +
+                            "\"Device Info\":\"\"," +
+                            "\"File Format\":\"\"," +
+                            "\"Filename\":\"\"," +
+                            "\"Month\":\"" + month.format(startDate) +"\"," +
+                            "\"Notes\":\"\"," +
+                            "\"Objective\":\"\"," +
+                            "\"Sport\":\"Bike\"," +
+                            "\"Weekday\":\"" + day.format(startDate) + "\"," +
+                            "\"Workout Code\":\"\"," +
+                            "\"Year\":\"" + year.format(startDate) + "\"" +
+                        "}," +
+                        "\"SAMPLES\":[{\"SECS\":0}");
+        } catch (Exception e) {}
+    }
+    
+    
+    public void writeValues() {
+        try {
+            synchronized (buf) {                    
+                buf.write(",{");
+                buf.write("\"");
+                buf.write(RideService.KEYS[0]);
+                buf.write("\":");
+                buf.write(String.format("%f", context.currentValues[0]));
+                
+                for (int i = 1; i < context.currentValues.length; i++) {
+                    buf.write(",\"");
+                    buf.write(RideService.KEYS[i]);
+                    buf.write("\":");
+                    buf.write(String.format("%f", context.currentValues[i]));
+                }
+
+                buf.write("}");
+            }
+        } catch (Exception e) {}
+    }
+    
+    
+    public void writeFooter() {
+        try {
+            buf.write("]}}");
+            
+        } catch (Exception e) {}
+        super.writeFooter();
+    }
+}

contrib/RideLogger/src/com/ridelogger/listners/Ant.java

@@ -0,0 +1,54 @@
+package com.ridelogger.listners;
+
+import com.dsi.ant.plugins.antplus.pcc.defines.DeviceState;
+import com.dsi.ant.plugins.antplus.pccbase.PccReleaseHandle;
+import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IDeviceStateChangeReceiver;
+import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IPluginAccessResultReceiver;
+import com.ridelogger.RideService;
+
+
+/**
+ * Ant
+ * @author Chet Henry
+ * Listen to and log Ant+ events base class
+ */
+public abstract class Ant extends Base<Object>
+{
+    protected PccReleaseHandle<?>            releaseHandle;    //Handle class
+    public    IPluginAccessResultReceiver<?> mResultReceiver;  //Receiver class
+    protected int                            deviceNumber = 0;
+    
+    
+    //setup listeners and logging 
+    public Ant(int pDeviceNumber, RideService mContext)
+    {
+        super(mContext);
+        deviceNumber = pDeviceNumber;
+    }
+    
+    
+    public IDeviceStateChangeReceiver mDeviceStateChangeReceiver = new IDeviceStateChangeReceiver()
+    {
+        @Override
+        public void onDeviceStateChange(final DeviceState newDeviceState){
+            //if we lose a device zero out its values
+            if(newDeviceState.equals(DeviceState.DEAD)) {
+                zeroReadings();
+            }
+        }
+    };
+    
+    
+    abstract protected void requestAccess();
+
+    
+    @Override
+    public void onDestroy()
+    {
+        if(releaseHandle != null) {
+            releaseHandle.close();
+        }
+    }
+}
+
+

contrib/RideLogger/src/com/ridelogger/listners/Base.java

@@ -0,0 +1,58 @@
+package com.ridelogger.listners;
+
+import com.ridelogger.RideService;
+
+/**
+ * Base
+ * @author Chet Henry
+ * Base sensor class that has methods to time stamp are write to buffer
+ */
+public class Base<T>
+{    
+    public RideService context;
+        
+    public Base(RideService mContext) {
+        context       = mContext;
+    }
+
+
+    public void alterCurrentData(int key, float value)
+    {
+        synchronized (context.currentValues) {
+            context.currentValues[RideService.SECS] = getTs();
+            context.currentValues[key] = value;
+            context.fileFormat.writeValues();
+        }
+    }
+
+    
+    public void alterCurrentData(int[] keys, float[] values)
+    {
+        synchronized (context.currentValues) {
+            context.currentValues[RideService.SECS] = getTs();
+            
+            int i = 0;
+            for (int key : keys) {
+                context.currentValues[key] = values[i];
+                i++;
+            }
+            
+            context.fileFormat.writeValues();
+        }
+    }
+    
+    
+    //get current time stamp
+    public float getTs() {
+        return (float) ((System.currentTimeMillis() - context.startTime) / 1000.0);   
+    }
+    
+    
+    //Clean up my listeners here
+    public void onDestroy() {}
+    
+    //zero any of my values
+    public void zeroReadings() {}
+}
+
+

contrib/RideLogger/src/com/ridelogger/listners/Gps.java

@@ -0,0 +1,61 @@
+package com.ridelogger.listners;
+
+import com.ridelogger.RideService;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+
+import android.os.Bundle;
+
+/**
+ * Gps 
+ * @author henry
+ * Listen and log gps events
+ */
+public class Gps extends Base<Gps>
+{
+    public Gps(RideService mContext) 
+    {
+        super(mContext);
+        
+        LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+
+        //listen to gps events and log them
+        LocationListener locationListener = new LocationListener() {
+                public void onLocationChanged(Location location) {
+                    int[] keys = {
+                            RideService.ALTITUDE,
+                            RideService.KPH,
+                            RideService.bearing,
+                            RideService.gpsa,
+                            RideService.LAT,
+                            RideService.LON
+                    };
+                    
+                    float[] values = {
+                            (float) location.getAltitude(),
+                            location.getSpeed(),    
+                            location.getBearing(),  
+                            location.getAccuracy(), 
+                            (float) location.getLatitude(), 
+                            (float) location.getLongitude()
+                    };
+                    
+                    alterCurrentData(keys, values);
+                }
+            
+                @Override
+                public void onStatusChanged(String provider, int status, Bundle extras) {}
+            
+                @Override
+                public void onProviderEnabled(String provider) {}
+            
+                @Override
+                public void onProviderDisabled(String provider) {}
+          };
+          
+          locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, locationListener);
+    }
+}

contrib/RideLogger/src/com/ridelogger/listners/HeartRate.java

@@ -0,0 +1,69 @@
+package com.ridelogger.listners;
+
+import com.dsi.ant.plugins.antplus.pcc.AntPlusHeartRatePcc;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusHeartRatePcc.DataState;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusHeartRatePcc.IHeartRateDataReceiver;
+import com.dsi.ant.plugins.antplus.pcc.defines.DeviceState;
+import com.dsi.ant.plugins.antplus.pcc.defines.EventFlag;
+import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult;
+import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IPluginAccessResultReceiver;
+import com.ridelogger.RideService;
+import java.math.BigDecimal;
+import java.util.EnumSet;
+
+/**
+ * HeartRate
+ * @author Chet Henry
+ * Listen to and log Ant+ HearRate events
+ */
+public class HeartRate extends Ant
+{
+    public IPluginAccessResultReceiver<AntPlusHeartRatePcc> mResultReceiver;
+    
+    public HeartRate(int pDeviceNumber, RideService mContext) {
+        super(pDeviceNumber, mContext);
+        
+        mResultReceiver = new IPluginAccessResultReceiver<AntPlusHeartRatePcc>() {
+            //Handle the result, connecting to events on success or reporting failure to user.
+            @Override
+            public void onResultReceived(AntPlusHeartRatePcc result, RequestAccessResult resultCode, DeviceState initialDeviceState)
+            {
+                if(resultCode == com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult.SUCCESS) {
+                    deviceNumber = result.getAntDeviceNumber();
+                    result.subscribeHeartRateDataEvent(
+                        new IHeartRateDataReceiver() {
+                            @Override
+                            public void onNewHeartRateData(final long estTimestamp, EnumSet<EventFlag> eventFlags, final int computedHeartRate, final long heartBeatCount, final BigDecimal heartBeatEventTime, final DataState dataState) {
+                                alterCurrentData(RideService.HR, (float) computedHeartRate);
+                            }
+                        }
+                    );
+                } else if(resultCode == com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult.SEARCH_TIMEOUT) {
+                    if(deviceNumber != 0) {
+                        requestAccess();
+                    }
+                }
+            }
+        };
+        
+        
+        requestAccess();
+    }
+    
+    
+    
+    @Override
+    protected void requestAccess() {
+        releaseHandle = AntPlusHeartRatePcc.requestAccess(context, deviceNumber, 0, mResultReceiver, mDeviceStateChangeReceiver);
+    }
+    
+    
+    
+    
+    
+    @Override
+    public void zeroReadings()
+    {
+        alterCurrentData(RideService.HR, (float) 0.0);
+    }
+}

contrib/RideLogger/src/com/ridelogger/listners/Power.java

@@ -0,0 +1,223 @@
+package com.ridelogger.listners;
+import android.preference.PreferenceManager;
+
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.CalculatedWheelDistanceReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.CalculatedWheelSpeedReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.DataSource;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.ICalculatedCrankCadenceReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.ICalculatedPowerReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.ICalculatedTorqueReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.IInstantaneousCadenceReceiver;
+import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.IRawPowerOnlyDataReceiver;
+import com.dsi.ant.plugins.antplus.pcc.defines.DeviceState;
+import com.dsi.ant.plugins.antplus.pcc.defines.EventFlag;
+import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult;
+import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IPluginAccessResultReceiver;
+import com.ridelogger.R;
+import com.ridelogger.RideService;
+
+import java.math.BigDecimal;
+import java.util.EnumSet;
+
+/**
+ * Power
+ * @author Chet Henry
+ * Listen to and log Ant+ Power events
+ */
+public class Power extends Ant
+{
+    public BigDecimal wheelCircumferenceInMeters; //size of wheel to calculate speed
+    public IPluginAccessResultReceiver<AntPlusBikePowerPcc> mResultReceiver;
+    
+    //setup listeners and logging 
+    public Power(int pDeviceNumber, RideService mContext) {
+        super(pDeviceNumber, mContext);
+        
+        wheelCircumferenceInMeters = new BigDecimal(
+                PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.PREF_WHEEL_SIZE), "2.096")
+        );
+        
+        //Handle messages
+        mResultReceiver = new IPluginAccessResultReceiver<AntPlusBikePowerPcc>() {
+           //Handle the result, connecting to events on success or reporting failure to user.
+           @Override
+           public void onResultReceived(AntPlusBikePowerPcc result, RequestAccessResult resultCode, DeviceState initialDeviceState) {
+               if(resultCode == com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult.SUCCESS) {
+                   deviceNumber = result.getAntDeviceNumber();
+                   
+                   result.subscribeCalculatedPowerEvent(new ICalculatedPowerReceiver() {
+                           @Override
+                           public void onNewCalculatedPower(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final BigDecimal calculatedPower) {
+                               alterCurrentData(RideService.WATTS, calculatedPower.floatValue());
+                           }
+                       }
+                   );
+
+                   result.subscribeCalculatedTorqueEvent(
+                       new ICalculatedTorqueReceiver() {
+                           @Override
+                           public void onNewCalculatedTorque(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final BigDecimal calculatedTorque) {
+                               alterCurrentData(RideService.NM, calculatedTorque.floatValue());
+                           }
+                       }
+                   );
+
+                   result.subscribeCalculatedCrankCadenceEvent(
+                       new ICalculatedCrankCadenceReceiver() {
+                           @Override
+                           public void onNewCalculatedCrankCadence(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final BigDecimal calculatedCrankCadence) {
+                               alterCurrentData(RideService.CAD, calculatedCrankCadence.floatValue());
+                           }
+                       }
+                   );
+
+                   result.subscribeCalculatedWheelSpeedEvent(
+                       new CalculatedWheelSpeedReceiver(wheelCircumferenceInMeters) {
+                           @Override
+                           public void onNewCalculatedWheelSpeed(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final BigDecimal calculatedWheelSpeed)
+                           {
+                               alterCurrentData(RideService.KPH, calculatedWheelSpeed.floatValue());
+                           }
+                       }
+                   );
+
+                   result.subscribeCalculatedWheelDistanceEvent(
+                       new CalculatedWheelDistanceReceiver(wheelCircumferenceInMeters) {
+                           @Override
+                           public void onNewCalculatedWheelDistance(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final BigDecimal calculatedWheelDistance) 
+                           {
+                               alterCurrentData(RideService.KM, calculatedWheelDistance.floatValue());
+                           }
+                       }
+                   );
+
+                   result.subscribeInstantaneousCadenceEvent(
+                       new IInstantaneousCadenceReceiver() {
+                           @Override
+                           public void onNewInstantaneousCadence(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final DataSource dataSource, final int instantaneousCadence)
+                           {
+                               alterCurrentData(RideService.CAD, (float) instantaneousCadence);
+                           }
+                       }
+                   );
+
+                   result.subscribeRawPowerOnlyDataEvent(
+                       new IRawPowerOnlyDataReceiver() {
+                           @Override
+                           public void onNewRawPowerOnlyData(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final long powerOnlyUpdateEventCount, final int instantaneousPower, final long accumulatedPower)
+                           {
+                               alterCurrentData(RideService.WATTS, (float) instantaneousPower);
+                           }
+                       }
+                   );
+
+                   /*result.subscribePedalPowerBalanceEvent(
+                       new IPedalPowerBalanceReceiver() {
+                           @Override
+                           public void onNewPedalPowerBalance(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final boolean rightPedalIndicator, final int pedalPowerPercentage)
+                           {
+                               alterCurrentData(RideService.LTE, pedalPowerPercentage);
+                           }
+                       }
+                   );
+
+                   result.subscribeRawWheelTorqueDataEvent(
+                       new IRawWheelTorqueDataReceiver() {
+                           @Override
+                           public void onNewRawWheelTorqueData(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final long wheelTorqueUpdateEventCount, final long accumulatedWheelTicks, final BigDecimal accumulatedWheelPeriod, final BigDecimal accumulatedWheelTorque)
+                           {
+                               alterCurrentData(RideService.NM, accumulatedWheelTorque);
+                           }
+                       }
+                   );
+
+                   result.subscribeRawCrankTorqueDataEvent(
+                       new IRawCrankTorqueDataReceiver() {
+                           @Override
+                           public void onNewRawCrankTorqueData(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final long crankTorqueUpdateEventCount, final long accumulatedCrankTicks, final BigDecimal accumulatedCrankPeriod, final BigDecimal accumulatedCrankTorque)
+                           {
+                               alterCurrentData(RideService.NM, accumulatedCrankTorque);
+                           }
+                       }
+                   );
+
+                   result.subscribeTorqueEffectivenessEvent(
+                       new ITorqueEffectivenessReceiver() {
+                           @Override
+                           public void onNewTorqueEffectiveness(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final long powerOnlyUpdateEventCount, final BigDecimal leftTorqueEffectiveness, final BigDecimal rightTorqueEffectiveness)
+                           {                            
+                               int[] keys = {
+                                       RideService.LTE,
+                                       RideService.RTE
+                               };
+                               
+                               float[] values = {
+                                       leftTorqueEffectiveness,
+                                       rightTorqueEffectiveness
+                               }
+                               
+                               alterCurrentData(keys, values);
+                           }
+       
+                       }
+                   );
+
+                   result.subscribePedalSmoothnessEvent(new IPedalSmoothnessReceiver() {
+                           @Override
+                           public void onNewPedalSmoothness(final long estTimestamp, final EnumSet<EventFlag> eventFlags, final long powerOnlyUpdateEventCount, final boolean separatePedalSmoothnessSupport, final BigDecimal leftOrCombinedPedalSmoothness, final BigDecimal rightPedalSmoothness)
+                           {
+                               int[] keys = {
+                                       RideService.SNPLC,
+                                       RideService.SNPR
+                               };
+                               
+                               float[] values = {
+                                       leftOrCombinedPedalSmoothness,
+                                       rightPedalSmoothness
+                               }
+
+                               alterCurrentData(map);
+                           }
+                       }
+                   );*/
+               } else if(resultCode == com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult.SEARCH_TIMEOUT) {                   
+                   if(deviceNumber != 0) {
+                       requestAccess();
+                   }
+               }
+           }
+       };
+       
+       requestAccess();
+    }
+    
+    protected void requestAccess() {
+        releaseHandle = AntPlusBikePowerPcc.requestAccess(context, deviceNumber, 0, mResultReceiver, mDeviceStateChangeReceiver);
+    }
+    
+    
+    @Override
+    public void zeroReadings()
+    {   
+        int[] keys = {
+                RideService.WATTS,
+                RideService.NM, 
+                RideService.CAD,
+                RideService.KPH,
+                RideService.KM
+        };
+        
+        float[] values = {
+                (float) 0.0,
+                (float) 0.0,
+                (float) 0.0,
+                (float) 0.0,
+                (float) 0.0
+        };
+        
+        alterCurrentData(keys, values);
+    }
+}
+
+

contrib/RideLogger/src/com/ridelogger/listners/Sensors.java

@@ -0,0 +1,222 @@
+package com.ridelogger.listners;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import com.ridelogger.R;
+import com.ridelogger.RideService;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.preference.PreferenceManager;
+
+/**
+ * Sensors
+ * @author Chet Henry
+ * Listen to android sensor events and log them
+ */
+public class Sensors extends Base<Object>
+{
+    public static final double  CRASHMAGNITUDE = 30.0;
+    
+    private SensorEventListener luxListner;
+    private SensorEventListener accelListner;
+    private SensorEventListener pressListner;
+    private SensorEventListener tempListner;
+    private SensorEventListener fieldListner;
+    
+    public Sensors(RideService mContext) 
+    {
+        super(mContext);
+        
+        SensorManager mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        
+        Sensor mLight         = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+        Sensor mAccel         = mSensorManager.getDefaultSensor(Sensor.TYPE_LINEAR_ACCELERATION);
+        Sensor mPress         = mSensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE);
+        Sensor mTemp          = mSensorManager.getDefaultSensor(Sensor.TYPE_AMBIENT_TEMPERATURE);
+        Sensor mField         = mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
+          
+        if(mLight != null) {
+          luxListner = new SensorEventListener() {
+              @Override
+              public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+              
+              @Override
+              public final void onSensorChanged(SensorEvent event) {
+                  // The light sensor returns a single value.
+                  // Many sensors return 3 values, one for each axis.
+                  alterCurrentData(RideService.lux,  event.values[0]);
+              }
+            };
+            
+            mSensorManager.registerListener(luxListner,   mLight, 3000000);
+        }
+        
+        if(mAccel != null) {
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
+            if(settings.getBoolean(context.getString(R.string.PREF_DETECT_CRASH), false)) {
+                accelListner = new SensorEventListener() {
+                    private boolean crashed = false;
+                    private Timer   timer   = new Timer();
+                    private double[] St     = new double[3];
+        
+                    @Override
+                    public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+                      
+                    @Override
+                    public final void onSensorChanged(SensorEvent event) {                
+                        int[] keys = {
+                                RideService.ms2x,
+                                RideService.ms2y,
+                                RideService.ms2z
+                        };
+
+                        alterCurrentData(keys, event.values);
+                        
+                        if(St.length == 0) {
+                            St[0] = event.values[0];
+                            St[1] = event.values[1];
+                            St[2] = event.values[2];
+                        }
+                        
+                        St[0] = 0.6 * event.values[0] + 0.4 * St[0];
+                        St[1] = 0.6 * event.values[1] + 0.4 * St[1];
+                        St[2] = 0.6 * event.values[2] + 0.4 * St[2];
+                        
+                        double amag = Math.sqrt(St[0]*St[0] + St[1]*St[1] + St[2]*St[2]);
+                        
+                        if(amag > CRASHMAGNITUDE && !crashed) {
+                            crashed = true;
+                            context.phoneCrash(amag);
+
+                            if(!Float.isNaN(context.currentValues[RideService.KPH])) {
+                                timer.schedule(
+                                    new TimerTask() {              
+                                        @Override  
+                                        public void run() {
+                                            //if we are traveling less then 1km/h at 5 seconds after crash detection
+                                            // confirm the crash
+                                            if(1.0 > context.currentValues[RideService.KPH]) {
+                                                context.phoneCrashConfirm();
+                                            } else {
+                                                crashed = false;
+                                                context.phoneHome();
+                                            }
+                                        }  
+                                    }, 
+                                    5000
+                                ); //in five sec reset
+                            } else {
+                                timer.schedule(
+                                    new TimerTask() {              
+                                        @Override  
+                                        public void run() {
+                                            crashed = false;
+                                        }  
+                                    }, 
+                                    180000
+                                ); //in three min reset
+                            }
+                        }
+                    }
+                };
+            } else {
+                accelListner = new SensorEventListener() {
+                    @Override
+                    public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+                      
+                    @Override
+                    public final void onSensorChanged(SensorEvent event) {                                        
+                        int[] keys = {
+                                RideService.ms2x,
+                                RideService.ms2y,
+                                RideService.ms2z
+                        };
+                        
+                        alterCurrentData(keys, event.values);
+                    }
+                };
+            }
+
+            mSensorManager.registerListener(accelListner, mAccel, SensorManager.SENSOR_DELAY_NORMAL);
+        }
+        
+        if(mPress != null) {
+            pressListner = new SensorEventListener() {
+              @Override
+              public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+              
+              @Override
+              public final void onSensorChanged(SensorEvent event) {
+                  // The light sensor returns a single value.
+                  // Many sensors return 3 values, one for each axis.
+                  alterCurrentData(RideService.press,  event.values[0]);
+              }
+            };
+            
+            mSensorManager.registerListener(pressListner, mPress, 3000000);
+        }
+        
+        if(mTemp != null) {
+            tempListner = new SensorEventListener() {
+              @Override
+              public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+              
+              @Override
+              public final void onSensorChanged(SensorEvent event) {
+                  // The light sensor returns a single value.
+                  // Many sensors return 3 values, one for each axis.
+                  alterCurrentData(RideService.temp,  event.values[0]);
+              }
+            };
+            
+            mSensorManager.registerListener(tempListner,  mTemp,  3000000);
+        }
+        
+        if(mField != null) {
+            fieldListner = new SensorEventListener() {
+              @Override
+              public final void onAccuracyChanged(Sensor sensor, int accuracy) {}
+              
+              @Override
+              public final void onSensorChanged(SensorEvent event) {                  
+                  int[] keys = {
+                          RideService.uTx,
+                          RideService.uTy,
+                          RideService.uTz
+                  };
+                  
+                  alterCurrentData(keys, event.values);
+              }
+            };
+            
+            mSensorManager.registerListener(fieldListner, mField, SensorManager.SENSOR_DELAY_NORMAL);
+        }
+    }
+    
+    @Override
+    public void onDestroy()
+    {
+        SensorManager mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        if(luxListner != null) {
+            mSensorManager.unregisterListener(luxListner);
+        }
+        if(accelListner != null) {
+            mSensorManager.unregisterListener(accelListner);
+        }
+        if(pressListner != null) {
+            mSensorManager.unregisterListener(pressListner);
+        }
+        if(tempListner != null) {
+            mSensorManager.unregisterListener(tempListner);
+        }
+        if(fieldListner != null) {
+            mSensorManager.unregisterListener(fieldListner);
+        }
+    }
+}

doc/design/user metric dialog.bmml

@@ -0,0 +1,161 @@
+<mockup version="1.0" skin="sketch" fontFace="Balsamiq Sans" measuredW="654" measuredH="544" mockupW="499" mockupH="529">
+  <controls>
+    <control controlID="2" controlTypeID="com.balsamiq.mockups::TitleWindow" x="155" y="15" w="499" h="529" measuredW="450" measuredH="400" zOrder="0" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>User%20Defined%20Metric</text>
+      </controlProperties>
+    </control>
+    <control controlID="3" controlTypeID="com.balsamiq.mockups::Canvas" x="170" y="237" w="471" h="228" measuredW="100" measuredH="70" zOrder="1" locked="false" isInGroup="-1"/>
+    <control controlID="4" controlTypeID="com.balsamiq.mockups::Label" x="170" y="213" w="77" h="-1" measuredW="33" measuredH="21" zOrder="2" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Code</text>
+      </controlProperties>
+    </control>
+    <control controlID="5" controlTypeID="com.balsamiq.mockups::Button" x="552" y="479" w="88" h="27" measuredW="41" measuredH="27" zOrder="3" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>OK</text>
+      </controlProperties>
+    </control>
+    <control controlID="7" controlTypeID="com.balsamiq.mockups::Button" x="449" y="479" w="88" h="27" measuredW="64" measuredH="27" zOrder="4" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>Cancel</text>
+      </controlProperties>
+    </control>
+    <control controlID="8" controlTypeID="com.balsamiq.mockups::Label" x="171" y="487" w="77" h="-1" measuredW="60" measuredH="21" zOrder="5" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Evaluates</text>
+      </controlProperties>
+    </control>
+    <control controlID="9" controlTypeID="com.balsamiq.mockups::Label" x="246" y="489" w="27" h="-1" measuredW="25" measuredH="21" zOrder="6" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>false</bold>
+        <text>200</text>
+      </controlProperties>
+    </control>
+    <control controlID="10" controlTypeID="com.balsamiq.mockups::Label" x="273" y="489" w="50" h="-1" measuredW="34" measuredH="21" zOrder="7" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>false</bold>
+        <text>Watts</text>
+      </controlProperties>
+    </control>
+    <control controlID="11" controlTypeID="com.balsamiq.mockups::Label" x="246" y="468" w="77" h="-1" measuredW="41" measuredH="21" zOrder="8" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Metric</text>
+      </controlProperties>
+    </control>
+    <control controlID="12" controlTypeID="com.balsamiq.mockups::Label" x="333" y="489" w="27" h="-1" measuredW="25" measuredH="21" zOrder="9" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>false</bold>
+        <text>200</text>
+      </controlProperties>
+    </control>
+    <control controlID="13" controlTypeID="com.balsamiq.mockups::Label" x="360" y="489" w="74" h="-1" measuredW="34" measuredH="21" zOrder="10" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>false</bold>
+        <text>Watts</text>
+      </controlProperties>
+    </control>
+    <control controlID="14" controlTypeID="com.balsamiq.mockups::Label" x="333" y="468" w="77" h="-1" measuredW="51" measuredH="21" zOrder="11" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Imperial</text>
+      </controlProperties>
+    </control>
+    <control controlID="15" controlTypeID="com.balsamiq.mockups::Label" x="176" y="239" w="451" h="-1" measuredW="312" measuredH="224" zOrder="12" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>%23%20Average%20Power%20%5Cr%23%20Calculated%20using%20samples%20and%20should%20work%20with%5Cr%23%20variable%20sample%20rates%20since%20it%20%5Cr%23%20accumulates%20joules%20and%20duration.%20%5Crrelevant%20%7B%20Data%20contains%20%22P%22%3B%20%7D%5Crinit%20%7B%20joules%20%3C-%200%3B%20secs%20%3C-%200%3B%20%7D%20%5Cr%5Crsample%20%7B%5Cr%09joules%20%3C-%20joules%20+%20%28POWER%20*%20RECINTSECS%29%3B%5Cr%09secs%20%3C-%20secs%20+%20RECINTSECS%3B%5Cr%20%7D%5Cr%5Crvalue%20%7B%20joules%20/%20seconds%3B%20%7D%5Crcount%20%7B%20seconds%3B%20%7D</text>
+      </controlProperties>
+    </control>
+    <control controlID="16" controlTypeID="com.balsamiq.mockups::Label" x="170" y="50" w="77" h="-1" measuredW="46" measuredH="21" zOrder="13" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Symbol</text>
+      </controlProperties>
+    </control>
+    <control controlID="17" controlTypeID="com.balsamiq.mockups::Label" x="345" y="50" w="77" h="-1" measuredW="72" measuredH="21" zOrder="14" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Description</text>
+      </controlProperties>
+    </control>
+    <control controlID="18" controlTypeID="com.balsamiq.mockups::TextInput" x="243" y="47" w="82" h="-1" measuredW="31" measuredH="27" zOrder="15" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>AP</text>
+      </controlProperties>
+    </control>
+    <control controlID="20" controlTypeID="com.balsamiq.mockups::TextArea" x="434" y="48" w="207" h="91" measuredW="200" measuredH="140" zOrder="16" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>Average%20Power%20computed%20via%20Joules%20to%20account%20for%20variable%20sample%20rates.</text>
+      </controlProperties>
+    </control>
+    <control controlID="21" controlTypeID="com.balsamiq.mockups::Label" x="170" y="159" w="77" h="-1" measuredW="77" measuredH="21" zOrder="17" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Metric%20Units</text>
+      </controlProperties>
+    </control>
+    <control controlID="22" controlTypeID="com.balsamiq.mockups::Label" x="324" y="159" w="104" h="-1" measuredW="87" measuredH="21" zOrder="18" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Imperial%20Units</text>
+      </controlProperties>
+    </control>
+    <control controlID="23" controlTypeID="com.balsamiq.mockups::Label" x="465" y="144" w="80" h="-1" measuredW="68" measuredH="37" zOrder="19" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Conversion%5CrFactor</text>
+      </controlProperties>
+    </control>
+    <control controlID="24" controlTypeID="com.balsamiq.mockups::Label" x="567" y="144" w="77" h="-1" measuredW="68" measuredH="37" zOrder="20" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Conversion%5CrSum</text>
+      </controlProperties>
+    </control>
+    <control controlID="25" controlTypeID="com.balsamiq.mockups::TextInput" x="170" y="180" w="129" h="-1" measuredW="48" measuredH="27" zOrder="21" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>Watts</text>
+      </controlProperties>
+    </control>
+    <control controlID="26" controlTypeID="com.balsamiq.mockups::TextInput" x="324" y="180" w="119" h="-1" measuredW="48" measuredH="27" zOrder="22" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>Watts</text>
+      </controlProperties>
+    </control>
+    <control controlID="27" controlTypeID="com.balsamiq.mockups::TextInput" x="465" y="180" w="80" h="-1" measuredW="38" measuredH="27" zOrder="23" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>1.00</text>
+      </controlProperties>
+    </control>
+    <control controlID="28" controlTypeID="com.balsamiq.mockups::TextInput" x="564" y="180" w="78" h="-1" measuredW="41" measuredH="27" zOrder="24" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>0.00</text>
+      </controlProperties>
+    </control>
+    <control controlID="29" controlTypeID="com.balsamiq.mockups::Label" x="170" y="118" w="77" h="-1" measuredW="57" measuredH="21" zOrder="25" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Precision</text>
+      </controlProperties>
+    </control>
+    <control controlID="30" controlTypeID="com.balsamiq.mockups::TextInput" x="243" y="115" w="82" h="-1" measuredW="23" measuredH="27" zOrder="26" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>2</text>
+      </controlProperties>
+    </control>
+    <control controlID="31" controlTypeID="com.balsamiq.mockups::Label" x="170" y="86" w="77" h="-1" measuredW="31" measuredH="21" zOrder="27" locked="false" isInGroup="-1">
+      <controlProperties>
+        <bold>true</bold>
+        <text>Type</text>
+      </controlProperties>
+    </control>
+    <control controlID="32" controlTypeID="com.balsamiq.mockups::ComboBox" x="243" y="82" w="-1" h="-1" measuredW="77" measuredH="24" zOrder="28" locked="false" isInGroup="-1">
+      <controlProperties>
+        <text>Average</text>
+      </controlProperties>
+    </control>
+  </controls>
+</mockup>

doc/user/GC3-FAQ.info

@@ -1,7 +1,7 @@
-This is GC3-FAQ.info, produced by makeinfo version 4.13 from
+This is GC3-FAQ.info, produced by makeinfo version 5.2 from
 GC3-FAQ.texinfo.
 
-This manual is for Golden Cheetah, version 3.0.
+This manual is for Golden Cheetah, version 3.1.
 
 Copyright (C) 2013 Mark Liversedge
 
@@ -11,7 +11,7 @@ File: GC3-FAQ.info,  Node: Top,  Next: Top,  Prev: Top
 title
 *****
 
-This manual is for GoldenCheetah, version 3.0.
+This manual is for GoldenCheetah, version 3.1.
 
 * Menu:
 
@@ -33,29 +33,30 @@ File: GC3-FAQ.info,  Node: MOST COMMON QUESTIONS OF ALL,  Next: GENERAL,  Prev:
 1.1 How do I override / manually enter TSS for a ride?
 ======================================================
 
-The details chart on the analysis view allows you to override metrics
-on the metrics tab.  By default the most common metrics are listed,
-including average HR, distance and so on.  From v3.0 the default setup
+The details chart on the analysis view allows you to override metrics on
+the metrics tab.  By default the most common metrics are listed,
+including average HR, distance and so on.  From v3.1 the default setup
 will also include TSS as a metric you can override here.
 
 If the metric is not there you will need to configure GoldenCheetah to
 allow it to be shown.  This is simple to do and described in 3.9 below.
+The 3.1 upgrade process should have added it to the Metric tab if it was
+not already there.
 
 1.2 How do I add or remove a chart?
 ===================================
 
-To add a new chart to the view you can select from the + menu on the
-right hand side of the scope bar (the scope bar is underneath the
-toolbar and lets you select from Home, Analysis, Train etc).
+To add a new chart to the view you can select from the hamburger menu on
+the right hand side of the chart bar.
 
 Depending upon which view you are on the charts available will differ.
 For example realtime plots only appear on the Train view, whilst charts
 that work with individual rides will only appear on the analysis view.
 
-To remove a chart, when you mouse over a chart (in tabbed or tiled
-mode) a small triangle will appear in the top left of the chart. This
-is a menu drop down, if you click on it you will see a `Close' option.
-This is the option to remove (close) the chart.
+To remove a chart, when you mouse over a chart (in tabbed or tiled mode)
+the word 'More...'  will appear in the top left of the chart.  This is a
+menu drop down, if you click on it you will see a 'Close' option.  This
+is the option to remove (close) the chart.
 
 1.3 Can I enter my weight and track/plot it?
 ============================================
@@ -63,16 +64,16 @@ This is the option to remove (close) the chart.
 Weight can be maintained in 3 ways;
 
    * Every athlete is setup with a weight value - this is the fallback
-     value should no     other weight measure be available. It can be
-     found under preferences and athlete.
+     value should no other weight measure be available.  It can be found
+     under preferences and athlete.
 
-   * The 'Weight' field can be maintained in the details screen. This
-     is found on the     'Workout' tab in the details screen by
-     default. Any entry here will be used for this ride     ONLY.
+   * The 'Weight' field can be maintained in the details screen.  This
+     is found on the 'Workout' tab in the details screen by default.
+     Any entry here will be used for this ride ONLY.
 
-   * You can download weight from a withings scale. This is performed
-     manually via the     menu option Tools->Get Withings Data. This is
-     then used to update the local measures     database.
+   * You can download weight from a withings scale.  This is performed
+     manually via the menu option Tools->Get Withings Data.  This is
+     then used to update the local measures database.
 
 When calculating W/KG the Activity value is used if present, if not we
 then fall back to the last Withing measure that was collected, and if
@@ -85,20 +86,25 @@ plotted separately in the LTM plots.
 1.4 How do I plot x sec power best?
 ===================================
 
-As of v3.0 it is still not possible to plot custom durations for power
-bests. We are looking to add this in version 3.1, but for now you can
-only plot 1s, 5s, 10s, 15s, 20s, 30s, 1min, 2min, 5min, 10min, 20min,
-30min and 60min bests.
+In v3.1 it is now possible to plot custom durations for any data series
+on a metric trends chart in the Trends view.  You will need to add a
+curve for the data series and select 'Best' instead of 'Metric' or
+'Estimate' on the curve settings.
+
+For v3.0 or earlier it is still not possible to plot custom durations
+for power bests.  We are looking to add this in version 3.1, but for now
+you can only plot 1s, 5s, 10s, 15s, 20s, 30s, 1min, 2min, 5min, 10min,
+20min, 30min and 60min bests.
 
 1.5 I can't find Aerolab / Performance Manager?
 ===============================================
 
-By default we do not add these charts to the layout. Aerolab can be
-added to the Analysis view via the '+' menu found to the right hand
-side of the GoldenCheetah scope bar.
+By default we do not add these charts to the layout.  Aerolab can be
+added to the Analysis view via the '+' menu found to the right hand side
+of the GoldenCheetah scope bar.
 
 Similarly, the Performance manager can be added to the Home layout via
-the '+' menu. We may deprecate this chart in the near future since the
+the '+' menu.  We may deprecate this chart in the near future since the
 LTM charts can be used to plot a PMC and we expect to implement an
 interactive PMC for planning in v3.1.
 
@@ -107,31 +113,31 @@ interactive PMC for planning in v3.1.
 
 It has been deprecated since the Diary view allows you to summarise by
 day, week and month and add charts to the view that summarise for the
-selection. As the weekly summary was fixed on specific charts and did
-not handle other selections (e.g. monthly) it has been deprecated in
+selection.  As the weekly summary was fixed on specific charts and did
+not handle other selections (e.g.  monthly) it has been deprecated in
 view of the diary view.
 
 At present you can treat the Diary view as you would have the weekly
-summary - they offer the same functionality. We expect the diary view
+summary - they offer the same functionality.  We expect the diary view
 to extend to planned workouts when we implement planning functionality
 in v3.1.
 
 1.7 Where are all the chart settings?
 =====================================
 
-All chart settings can be found under the drop down menu that appears
-in the top left hand corner of a chart when you mouse over it. They
-will appear as a popup dialog box.
+All chart settings can be found under the drop down menu that appears in
+the top left hand corner of a chart when you mouse over it, titled
+'More...'.  They will appear as a popup dialog box.
 
-Additionally, when you move the cursor towards the title of a chart in
-a view that is tabbed (not tiled) then a small selection of the most
+Additionally, when you move the cursor towards the title of a chart in a
+view that is tabbed (not tiled) then a small selection of the most
 important settings for the chart will appear for convenience.
 
 1.8 Where is the preferences / options panel?
 =============================================
 
 On a Mac the configurations page can be found under 'GoldenCheetah ->
-Preferences' on the main menu. Whilst on all other platforms it is
+Preferences' on the main menu.  Whilst on all other platforms it is
 found via 'Tools -> Options'.
 
 We do this to match the general guidelines for the operating system.
@@ -142,15 +148,35 @@ We do this to match the general guidelines for the operating system.
 Activities are coloured according to keywords embedded in their details
 (metadata) you can configure the field that is used and the values that
 are matched and the colours they are shown in from the preferences pane
-via the 'Data Fields' toolbar option then select Notes Processing. The
+via the 'Data Fields' toolbar option then select Notes Processing.  The
 keywords and related words are scanned for to determine if the
 associated colour should be used for this ride.
 
 They are processed in the order they are defined with the first match
-being returned. Take care when using values such as 'TT' and 'race'
-since these can also be part of an English word (e.g. ATTEMPT contains
+being returned.  Take care when using values such as 'TT' and 'race'
+since these can also be part of an English word (e.g.  ATTEMPT contains
 'TT' and graceful contains 'race'.
 
+1.10 GoldenCheetah doesn't find my PowerTap on Ubuntu Linux.
+============================================================
+
+If you're using the USB cradle (as opposed to the older, serial one),
+the FTDI driver sometimes conflicts with the braille terminal in the
+default Ubuntu installation.  Try unplugging the PT cradle from the
+computer and uninstalling brltty: sudo apt-get remove brltty Then plug
+the device back in and it should work.
+
+1.11 GoldenCheetah.dmg installation didn't seem to work.
+========================================================
+
+Are you running OS X Snow Leopard (10.6) or later?  You need to be.  If
+you are, and you're still having this problem, open Terminal (in
+Applications -> Utilities) and type this at the prompt:
+
+/Applications/GoldenCheetah.app/Contents/MacOS/GoldenCheetah then press
+<return> and send an email to the mailing list with whatever it prints
+out.  We'll help you debug it.
+
 
 File: GC3-FAQ.info,  Node: GENERAL,  Next: METRICS,  Prev: MOST COMMON QUESTIONS OF ALL,  Up: Top
 
@@ -161,31 +187,31 @@ File: GC3-FAQ.info,  Node: GENERAL,  Next: METRICS,  Prev: MOST COMMON QUESTIONS
 ==========================
 
 GoldenCheetah is primarily a program for cyclists that own a power
-meter. It allows them to record, track and review their performance
-against recorded data. It also allows you to ride your turbo and
+meter.  It allows them to record, track and review their performance
+against recorded data.  It also allows you to ride your turbo and
 collect data as you ride.
 
-If you do not have a power meter then some of the functionality will
-not be of use to you as a cyclist. But you can still record and track
-progress. We support HR based TRIMP metrics for a HR based PMC for
+If you do not have a power meter then some of the functionality will not
+be of use to you as a cyclist.  But you can still record and track
+progress.  We support HR based TRIMP metrics for a HR based PMC for
 example.
 
 2.2 What is a good book or resource on training with power?
 ===========================================================
 
 Unquestionably the bible for working with a power meter is Training and
-Racing with a Power Meter by Hunter Allan and Andy Coggan. Make sure
+Racing with a Power Meter by Hunter Allan and Andy Coggan.  Make sure
 you look at the 2nd edition since it is revised quite dramatically.
-Whilst it is heavily  biased towards WKO+ as a software package most of
+Whilst it is heavily biased towards WKO+ as a software package most of
 the functions of note are also available in GoldenCheetah.
 
 2.3 Where can I download the installer for GoldenCheetah ?
 ==========================================================
 
-Stable releases are available from `http://www.goldencheetah.org'
-whilst the latest and greatest code build is available from
-`http://goldencheetah.stand2surf.net'. Development builds are for the
-brave, since they may contain bugs. In reality the development builds
+Stable releases are available from <http://www.goldencheetah.org> whilst
+the latest and greatest code build is available from
+<http://goldencheetah.stand2surf.net>.  Development builds are for the
+brave, since they may contain bugs.  In reality the development builds
 are a changing feast and often contain latest fixes too.
 
 2.4 Where can I get the source code?
@@ -193,23 +219,23 @@ are a changing feast and often contain latest fixes too.
 
 The GoldenCheetah source code is hosted on github and can be cloned
 using the following url;
-`git://github.com/GoldenCheetah/GoldenCheetah.git'
+'git://github.com/GoldenCheetah/GoldenCheetah.git'
 
 2.5 I am a triathlete is GoldenCheetah appropriate for me?
 ==========================================================
 
-GoldenCheetah is not a multi-sport program. For tracking cycling
-performance it is a good choice. But if you are looking for running and
+GoldenCheetah is not a multi-sport program.  For tracking cycling
+performance it is a good choice.  But if you are looking for running and
 swimming metrics and tracking then these features are not available at
-present. It is an excellent choice for analysing cycling aspects of
+present.  It is an excellent choice for analysing cycling aspects of
 triathlon, or working on the trainer.
 
 2.6 Is there a mailing list?
 ============================
 
-The mailing list for GoldenCheetah users is maintained via Google
-Groups at
-`http://groups.google.com/forum/?fromgroups=#forum/golden-cheetah-users'
+The mailing list for GoldenCheetah users is maintained via Google Groups
+at
+<http://groups.google.com/forum/?fromgroups=#forum/golden-cheetah-users>
 the first post you make is moderated and may take a while to appear.
 Once your first post is made you can make future posts without
 moderation.
@@ -217,16 +243,16 @@ moderation.
 2.7 How do I report a bug or request a new feature?
 ===================================================
 
-We use Github issues to record bugs and feature requests. You will need
+We use Github issues to record bugs and feature requests.  You will need
 to create an account on github and then post a new request or bug at
-`http://www.github.com/GoldenCheetah/GoldenCheetah/issues'
+<http://www.github.com/GoldenCheetah/GoldenCheetah/issues>
 
 2.8 How can I contribute?
 =========================
 
 Patches are most welcome via the mailing list or a pull request in
-github. Of equal importance is the timely reporting of bugs and help in
-testing fixes. We also desperately need volunteers to translate into
+github.  Of equal importance is the timely reporting of bugs and help in
+testing fixes.  We also desperately need volunteers to translate into
 non-English languages and help with writing documentation including the
 maintenance of this FAQ.
 
@@ -236,8 +262,8 @@ list.
 2.9 Can I donate to the project?
 ================================
 
-We are an open source project. Our software is developed by a
-community. We do not have any facility to collect funding or spend it!
+We are an open source project.  Our software is developed by a
+community.  We do not have any facility to collect funding or spend it!
 We would rather you spread the word if you think our software is good,
 and maybe help out with documentation, tutorials or translations if you
 can.
@@ -251,70 +277,70 @@ File: GC3-FAQ.info,  Node: METRICS,  Next: DATA,  Prev: GENERAL,  Up: Top
 3.1 What is the difference between xPower, NP and Daniels EqP?
 ==============================================================
 
-They all serve the same purpose - to express the variable power you
-have generated over a given period of time as a single value. This is
-so you can quantify the intensity of the ride and therefore the
-training stress of the ride.
+They all serve the same purpose - to express the variable power you have
+generated over a given period of time as a single value.  This is so you
+can quantify the intensity of the ride and therefore the training stress
+of the ride.
 
 In practice, NP and xPower are largely the same, whilst Daniels EqP
-place much higher emphasise on upper intensity work. For more info on
+place much higher emphasise on upper intensity work.  For more info on
 xPower see Dr Skiba's paper on BikeScore
-`http://www.physfarm.com/bikescore.pdf'
+<http://www.physfarm.com/bikescore.pdf>
 
 3.2 What is the difference between CP and FTP?
 ==============================================
 
 CP is a shorthand for CP60 in GoldenCheetah, and is computed using the
-Scherer/Monod protocol using 3 and 20 minutes. Functional Threshold
-Power (FTP) is an actual measure of the power an athlete sustains for
-60 minutes.
+Scherer/Monod protocol using 3 and 20 minutes.  Functional Threshold
+Power (FTP) is an actual measure of the power an athlete sustains for 60
+minutes.
 
 Since it is very difficult for an athlete to maintain the desired
 intensity FTP 'reality' tends to result in a number that is much lower
-than CP 'theory'. Often users will consider the two as the same.
+than CP 'theory'.  Often users will consider the two as the same.
 
-In GC we compute TSS and BikeScore using your 'CP' value. If you set it
-to your FTP value TSS will be accurate, BikeScore is likely to be
-lower. And if you set it to your CP value BikeScore will be accurate,
-but TSS will be overstated.
+In GC we compute TSS and BikeScore using your 'CP' value.  If you set it
+to your FTP value TSS will be accurate, BikeScore is likely to be lower.
+And if you set it to your CP value BikeScore will be accurate, but TSS
+will be overstated.
 
 3.3 Why does my CP chart show higher watts for a longer duration?
 =================================================================
 
 A higher power average for a longer time is possible if an effort has
-been "book ended".  If, for example, you did a massive 30 second
-effort, followed by freewheeling for 29:30 then another massive 30
-second effort, then your best average for a continuous 30 minutes would
-in fact be lower that your best average for a continuous 30minutes and
-30 seconds.  (Thanks for Jon Hill from the Golden Cheetah Users mailing
+been "book ended".  If, for example, you did a massive 30 second effort,
+followed by freewheeling for 29:30 then another massive 30 second
+effort, then your best average for a continuous 30 minutes would in fact
+be lower that your best average for a continuous 30minutes and 30
+seconds.  (Thanks for Jon Hill from the Golden Cheetah Users mailing
 list for this example).
 
 3.4 Can I set a different CP/FTP for different reasons e.g. CP/FTP on a trainer?
 ================================================================================
 
-We allow you to override the CP value for a specific ride by setting
-the "CP" field to the value you wish to use for the ride in question.
-We do not have a concept of 'separate' Cps for different purposes - you
-will need to specify the CP when the data is imported into GC. But this
+We allow you to override the CP value for a specific ride by setting the
+"CP" field to the value you wish to use for the ride in question.  We do
+not have a concept of 'separate' Cps for different purposes - you will
+need to specify the CP when the data is imported into GC. But this
 allows you to make manual adjustments.
 
 We provide this functionality at user request - we do not endorse the
-concept of multiple CP values. But we do recognise the ongoing debate
+concept of multiple CP values.  But we do recognise the ongoing debate
 regarding physiological stress from working on a trainer vs on the road.
 
 3.5 How do I seed the CTL for my PMC?
 =====================================
 
 You can seed the starting CTL (we call it LTS, for long term stress)
-when you define a season. That way it is re-usable in a number of
-places. To do this you edit the season (date range) in the Home View
+when you define a season.  That way it is re-usable in a number of
+places.  To do this you edit the season (date range) in the Home View
 and can set the Starting LTS.
 
 3.6 Why is elevation different in GoldenCheetah to my other training software / website?
 ========================================================================================
 
 Different programs will use different hysteresis values to smooth the
-small changes in altitude. In GC we use a hysteresis value of 3m.
+small changes in altitude.  In GC we use a hysteresis value of 3m.
 
 If this is of great concern you can adjust the hysteresis value in
 preferences under the general tab.
@@ -322,70 +348,70 @@ preferences under the general tab.
 3.7 Why is a metric e.g. TSS or average power different in GoldenCheetah to Garmin Connect?
 ===========================================================================================
 
-The algorithms for calculating TSS, AP etc are static. They are
+The algorithms for calculating TSS, AP etc are static.  They are
 implemented exactly the same way in GoldenCheetah, Garmin Connect,
-TrainingPeaks etc. The algorithms are extremely simple and not prone to
+TrainingPeaks etc.  The algorithms are extremely simple and not prone to
 difficulty in implementation.
 
 However, how each application treats pauses and stops or loss of data
-accounts for most differences. In GoldenCheetah we always calculate
-AP,TSS etc including stop time. Other applications choose to ignore or
+accounts for most differences.  In GoldenCheetah we always calculate
+AP,TSS etc including stop time.  Other applications choose to ignore or
 smooth segments of short duration.
 
 In addition, if there are anomalies in your data, with large gaps or
 even time going backwards, this will drastically affect GoldenCheetah's
 calculations.
 
-We NEVER attempt to interpret data anomalies - if the results are not
-as you would expect you will need to correct the data. We do not
-'silently' fix the data for you. There is no secret sauce in
+We NEVER attempt to interpret data anomalies - if the results are not as
+you would expect you will need to correct the data.  We do not
+'silently' fix the data for you.  There is no secret sauce in
 GoldenCheetah, we are open and transparent with your data.
 
 3.8 How do I set the metrics shown for intervals in the various summaries?
 ==========================================================================
 
 In the GoldenCheetah preference pane under the Metrics tab you can
-choose the metrics that will be shown in the ride summary charts and
-the metrics that will be shown in the interval summary in the analysis
+choose the metrics that will be shown in the ride summary charts and the
+metrics that will be shown in the interval summary in the analysis
 sidebar.
 
 3.9 How do I add a metric to the details screen (so I can override it) ?
 ========================================================================
 
-If the metric you want (e.g. TSS) is not shown then you will need to
-add it via the GoldenCheetah preferences pane. On Mac this is from the
-menu option GoldenCheetah->Preferences whilst on Windows and Linux it
-is under Tools->Options.
+If the metric you want (e.g.  TSS) is not shown then you will need to
+add it via the GoldenCheetah preferences pane.  On Mac this is from the
+menu option GoldenCheetah->Preferences whilst on Windows and Linux it is
+under Tools->Options.
 
 You will need to select 'Data Fields' option from preferences toolbar
-and then the 'fields' tab. You will see a list of fields that are
-associated with a particular screen tab. If you scroll down you should
+and then the 'fields' tab.  You will see a list of fields that are
+associated with a particular screen tab.  If you scroll down you should
 find entries for the 'Metrics' screen tab, you can insert a new entry
-here with the '+' button. You should make sure the new entry is called
+here with the '+' button.  You should make sure the new entry is called
 exactly the same thing as the metric in question.
 
-For 'TSS' this is relatively straight forward. For others, e.g.
+For 'TSS' this is relatively straight forward.  For others, e.g.
 'Average Heart Rate' you must make sure that the name includes spaces
-etc. Once your metric has been added to the configuration you should
+etc.  Once your metric has been added to the configuration you should
 save that and return to the details screen where you can now maintain
 it.
 
-If you are creating a manual entry then there is no 'details' tab in
-the dialog. Once you have created the entry (and again in this case TSS
-can be entered in the dialog) you should go to the details tab to
-maintain any other specific fields. The manual entry dialog is designed
-to be simple and accept only the most common of entries.
+If you are creating a manual entry then there is no 'details' tab in the
+dialog.  Once you have created the entry (and again in this case TSS can
+be entered in the dialog) you should go to the details tab to maintain
+any other specific fields.  The manual entry dialog is designed to be
+simple and accept only the most common of entries.
 
 3.10 Can you calculate gradient, virtual power or other derived series from the ride data?
 ==========================================================================================
 
-Not in 3.0. We may introduce derived data series in the future.
+Not in 3.1.  We plan to extend this functionality in v3.2.
 
 3.11 Can I export metrics or access the metric database GC uses?
 ================================================================
 
 The metrics are stored within a Sqlite 3 Database called 'metricDBv3'
-that can be found in the athlete directory. You can use any Sqlite 3
+that can be found in the athlete directory.  You can use any Sqlite 3
 tools to query and work with the db.
 
 Alternatively you can export the db in its entirety using the
@@ -408,19 +434,19 @@ To join two rides together (making one longer ride from two rides) you
 can copy rows in the activity editor and paste special in the ride
 editor (right click) and then select append mode.
 
-If you wish to merge rides, that is much harder and would need to be
-performed outside of GC or by cutting and pasting columns in the
-activity editor.
+If you wish to merge rides, in v3.1 there is a new Activity->Merge
+wizard that will walk you through merging ride files and also provide
+the ability to synchronise timestamps.
 
 4.2 How can I find 'spikes' or specific values in activity data?
 ================================================================
 
-The activity editor has a function to find data on its toolbar. You can
+The activity editor has a function to find data on its toolbar.  You can
 specify a range or upper or lower limit and find values less than,
 greater than or between a range of values.
 
 Additionally, the editor will scan the file looking for anomalies -
-where the data appears to be out of normal ranges. These are shown with
+where the data appears to be out of normal ranges.  These are shown with
 a wiggly red line in the editor and can also be listed by clicking on
 the anomalies icon on the editor toolbar.
 
@@ -430,24 +456,24 @@ anomalies in the currently selected ride.
 4.3 How can I fix 'spikes' or 'anomalies' in activity data?
 ===========================================================
 
-You can either manually edit the values in the activity editor (there
-is full undo and redo in the editor). Or you can use the fix tools that
+You can either manually edit the values in the activity editor (there is
+full undo and redo in the editor).  Or you can use the fix tools that
 are listed under the tool menu option (fix power spikes, fix gaps in
 recording, fix gps errors, fix torque.
 
-Each of the fix tools opens a dialog that displays texts to explain
-what the fix tool does.
+Each of the fix tools opens a dialog that displays texts to explain what
+the fix tool does.
 
 4.4 How can I add/remove a field to edit on the details screen?
 ===============================================================
 
 The fields (metadata) that is editable can be configured in the
-preferences pane under the data fields tab. Where no screen is
+preferences pane under the data fields tab.  Where no screen is
 specified (its left blank) it will not be made available.
 
 GoldenCheetah ships with a number of fields defined in the config but
 with no screen set.  If you wish to use them simply set the screen tab
-to the tab you would like it to be shown on. To remove a field set the
+to the tab you would like it to be shown on.  To remove a field set the
 field tab to blank.
 
 4.5 What are 'special fields' ?
@@ -459,10 +485,9 @@ purposes.
 
 Some examples include;
 
-Weight - used in W/KG calculations, Sport and Workout code are     used
-when exporting to other file formats, Identifier is used to assign a
-UUID to the     activity when it is uploaded to online services and so
-on.
+Weight - used in W/KG calculations, Sport and Workout code are used when
+exporting to other file formats, Identifier is used to assign a UUID to
+the activity when it is uploaded to online services and so on.
 
 There is a full list of special fields and their meaning in the Golden
 Cheetah user guide appendices.
@@ -470,8 +495,8 @@ Cheetah user guide appendices.
 4.6 How do I find/add/sort/delete/edit intervals ?
 ==================================================
 
-The context menu (on the right hand side of the splitter handle) for
-the interval sidebar in Analysis view contains a number of options for
+The context menu (on the right hand side of the splitter handle) for the
+interval sidebar in Analysis view contains a number of options for
 working with intervals.
 
 Additionally, you can click and drag on the performance (aka ride) plot
@@ -486,13 +511,13 @@ Activity->Export allows you to export the activity to csv, fitlog, gc
 4.8 Can I use GC to convert data from one format to another on the command line?
 ================================================================================
 
-No. It is something we may add in v3.1
+No.  It is something we may add in v3.2
 
 4.9 Can I delete an athlete and all his/her data?
 =================================================
 
-No. It must be done manually by removing the athlete directory via the
-operating system. Please ensure you do this when GoldenCheetah is not
+No.  It must be done manually by removing the athlete directory via the
+operating system.  Please ensure you do this when GoldenCheetah is not
 running.
 
 
@@ -505,7 +530,7 @@ File: GC3-FAQ.info,  Node: UPLOADING AND DOWNLOADING,  Next: SEASONS AND EVENTS,
 ==================================================
 
 The Sport field in TrainingPeaks must have very specific values,
-although this is not documented in the XML Schema. We recommend using a
+although this is not documented in the XML Schema.  We recommend using a
 sport of "Bike" if you plan on uploading rides to training peaks.
 
 5.2 Why does download from TrainingPeaks say I need a premium account?
@@ -514,48 +539,32 @@ sport of "Bike" if you plan on uploading rides to training peaks.
 Training Peaks only allow paid up members to get access to their data.
 If you are using a free service they do not let you retrieve your data.
 
-5.3 Upload/Download with Strava fails?
-======================================
-
-Strava have switched off their v1 and v2 APIs before providing access
-to their v3 APIs. We have requested access to the new v3 API but it has
-not been granted.  In the meantime to upload to Strava you can send an
-email to <upload@strava.com> from you registered email account
-attaching the ride in a format Strava supports.
-
-We remain committed to helping cyclists download their power data to
-the computer of their choice, analyze it in whatever way they see fit,
-and share their methods of analysis with others.
-
-We will be deprecating support for Strava upload/download in v3 SP1 and
-have no immediate plans to provide support for it in the future.
-
-5.4 What settings do I need to get GoldenCheetah to upload to my Google Calendar?
+5.3 What settings do I need to get GoldenCheetah to upload to my Google Calendar?
 =================================================================================
 
 The upload to Google Calendar uses their CalDAV API, and as such needs
-to specify a collection. This means when entering the details in the
+to specify a collection.  This means when entering the details in the
 passwords pane of preferences you should use the following for the
 caldav url:
 
-`https://www.google.com/calendar/dav/xxxx@gmail.com/events/'
+<https://www.google.com/calendar/dav/xxxx@gmail.com/events/>
 
-Where xxxx is your username. The username will need to be repeated in
+Where xxxx is your username.  The username will need to be repeated in
 the username field and obviously set the password too.
 
-5.5 When setting up my Withings wifi scales where do I get the userid and key ?
+5.4 When setting up my Withings wifi scales where do I get the userid and key ?
 ===============================================================================
 
 You will need to login to your Withings account
-(`http://my.withings.com') and click on the `share' button at the top
-of the dashboard. From there you will get a popup box with lots of
+(<http://my.withings.com>) and click on the 'share' button at the top of
+the dashboard.  From there you will get a popup box with lots of
 options.
 
-If you click on `share on my website' you will be greeted with a number
-of code snippets you can embed in a web page. If you look closely in
-the top right hand corner there will be a box containing the user id
-and public key. These are the two values you need to enter into the
-options dialog.
+If you click on 'share on my website' you will be greeted with a number
+of code snippets you can embed in a web page.  If you look closely in
+the top right hand corner there will be a box containing the user id and
+public key.  These are the two values you need to enter into the options
+dialog.
 
 You will now be able to retrieve withings data via the tools menu.
 
@@ -568,31 +577,31 @@ File: GC3-FAQ.info,  Node: SEASONS AND EVENTS,  Next: CHARTS,  Prev: UPLOADING A
 6.1 Why are there different types of seasons?
 =============================================
 
-This is to help with planning functions. As of v3 there is no real
+This is to help with planning functions.  As of v3 there is no real
 distinction made.  Adhoc seasons are expected to be used solely as date
 ranges and have no associated plan.  Whilst other season types may
-contain plans. This is only relevant for planning functions that are
+contain plans.  This is only relevant for planning functions that are
 not available yet.
 
 6.2 What is event used for?
 ===========================
 
 It is only used to annotate a LTM chart - so you can show an 'event'
-that happened at a particular date. There are no rules about what
-constitutes and event. It could be a race, a training camp or just a
-day that was particularly meaningful e.g. illness, crash.
+that happened at a particular date.  There are no rules about what
+constitutes and event.  It could be a race, a training camp or just a
+day that was particularly meaningful e.g.  illness, crash.
 
 6.3 How do create/edit/delete seasons and events?
 =================================================
 
 Seasons and Events are created and edited in the sidebar for the Home
-view. Seasons are listed under date ranges, whilst events are listed
-under the events sidebar item. In both cases they can be created and
+view.  Seasons are listed under date ranges, whilst events are listed
+under the events sidebar item.  In both cases they can be created and
 deleted from the sidebar item's drop down menu.
 
-Please note that in v3.0 events can only be created when a user season
-is selected, since events are associated with a particular season. This
-constraint will be removed in v3.1.
+Please note that in v3.1 events can only be created when a user season
+is selected, since events are associated with a particular season.  This
+constraint will be removed in v3.2.
 
 
 File: GC3-FAQ.info,  Node: CHARTS,  Next: INDEX,  Prev: SEASONS AND EVENTS,  Up: Top
@@ -610,85 +619,70 @@ similarly 'This' 'month' and prior '2' is a month 2 months ago, whilst
 
 'This' 'month' prior and 0 is just this month.
 
-7.2 How does the mean max chart calculate CP when showing power?
-================================================================
-
-The CP algorithm searches your best power for two durations; for
-anaerobic efforts it looks between 15s and 1min, for aerobic it looks
-for best efforts between 10mins and an hour.
-
-Once it has found these two best values it will curve fit the two to
-enable the 60min value to be extracted. Bear in mind this is a
-theoretical number and as described above is applicable to the
-BikeScore algorithm. The value for FTP that the TSS algorithm requires
-is simply the highest value for 60mins for the time period, assuming
-you have performed a 60minute test recently.
-
-7.3 How should I use Aerolab?
+7.2 How should I use Aerolab?
 =============================
 
 The following is a brief piece of advice from Robert Chung, from a
 discussion on the Golden Cheetah Users mailing list:
 
-Ideally, you'll want calm conditions (both in terms of wind and
-traffic) but here's a     quickie test you can do just to get a handle
-on what to do. Try to find a loop without     stop signs, or an
-out-and-back with maybe a little dip or something in the middle. Make
- sure you won't get hit by a car and have good sight lines. I just go
-around my block a     few times. Do a loop in the drops, then another
-loop faster, then a loop slower; then     repeat with your hands on the
-hoods.
+Ideally, you'll want calm conditions (both in terms of wind and traffic)
+but here's a quickie test you can do just to get a handle on what to do.
+Try to find a loop without stop signs, or an out-and-back with maybe a
+little dip or something in the middle.  Make sure you won't get hit by a
+car and have good sight lines.  I just go around my block a few times.
+Do a loop in the drops, then another loop faster, then a loop slower;
+then repeat with your hands on the hoods.
 
 Weigh yourself and the bike and ballpark the air density.
 
 See whether you can come close to modeling the "true" elevation profile
-by sliding the     CdA slider around. Even with this informal test, as
-long as the wind isn't blowing too     hard, you ought to be able to
-see a difference between the loops where you were in the     drops and
-the loops where you on the hoods, and to spot little bumps and dips in
-the road.
+by sliding the CdA slider around.  Even with this informal test, as long
+as the wind isn't blowing too hard, you ought to be able to see a
+difference between the loops where you were in the drops and the loops
+where you on the hoods, and to spot little bumps and dips in the road.
 
 There is also an overview of Virtual Elevation to measure aerodynamics
 in this YouTube video from the power seminar at Interbike 2011 given by
 Jim Meyer the founder of Quarq:
 
-`http://www.youtube.com/watch?v=b8tJnFE_BFg&feature=youtu.be&t=27m58s'
+<http://www.youtube.com/watch?v=b8tJnFE_BFg&feature=youtu.be&t=27m58s>
 
 Finally, Robert Chung's original paper is included in the docs section
-of the GoldenCheetah repository, you can it up here (click on 'View
-Raw' to download):
+of the GoldenCheetah repository, you can it up here (click on 'View Raw'
+to download):
 
-`https://github.com/GoldenCheetah/GoldenCheetah/blob/master/doc/contrib/ChungVE.pdf'
+<https://github.com/GoldenCheetah/GoldenCheetah/blob/master/doc/contrib/ChungVE.pdf>
 
-7.4 My map doesn't show?
+7.3 My map doesn't show?
 ========================
 
 This is most likely because you have a proxy that requires
-authentication or session details. We do not have sophisticated support
-for internet proxy servers. We will re-use the operating system
+authentication or session details.  We do not have sophisticated support
+for internet proxy servers.  We will re-use the operating system
 settings where they are configured.
 
-7.5 What is the treemap plot used for?
+7.4 What is the treemap plot used for?
 ======================================
 
-Typically it is used to visualise where you spend your time or where
-you get best results.  It is not particularly useful if you do not
-maintain details for each ride e.g. workout code, sport et al.
+Typically it is used to visualise where you spend your time or where you
+get best results.  It is not particularly useful if you do not maintain
+details for each ride e.g.  workout code, sport et al.
 
-7.6 Can I change the colors in plot x ?
+7.5 Can I change the colors in plot x ?
 =======================================
 
 With the exception of the Long Term Metric plots the colours on the
-charts are configured in the GoldenCheetah preferences pane.
+charts are configured in the GoldenCheetah preferences pane.  It is
+possible to apply a theme or change each individual color.
 
 We want to use the same colours to plot each data series across the
 charts, so you can change them globally.
 
-The only colours you cannot change are the colours assigned to
-intervals when plotting them on scatterplot or PfPv. These colours are
-assigned according to their sequence.
+The only colours you cannot change are the colours assigned to intervals
+when plotting them on scatterplot or PfPv.  These colours are assigned
+according to their sequence.
 
-7.7 How do you zoom in on a chart?
+7.6 How do you zoom in on a chart?
 ==================================
 
 You can zoom in on the distribution, scatterplot and PfPv charts by
@@ -699,17 +693,17 @@ bottom of the chart (if you select the full plot in the chart settings).
 
 There are no other zoom options for the other charts.
 
-7.8 I zoomed in but can't zoom out?
+7.7 I zoomed in but can't zoom out?
 ===================================
 
 Right click will zoom back out to the previous zoom level (in the case
 of zooming multiple times).  If you select another activity the chart
 will return to fully zoomed out.
 
-7.9 GoldenCheetah is saying there is no data for a chart, but I'm sure there is?
+7.8 GoldenCheetah is saying there is no data for a chart, but I'm sure there is?
 ================================================================================
 
-You should check in the editor if the data series is present. if the
+You should check in the editor if the data series is present.  if the
 activity is a manual activity entry it will contain no data.
 
 
@@ -722,106 +716,118 @@ Index
 * Menu:
 
 * add:                                   MOST COMMON QUESTIONS OF ALL.
-                                                              (line  20)
+                                                              (line  22)
 * adhoc:                                 SEASONS AND EVENTS.  (line   9)
-* Aerolab <1>:                           CHARTS.              (line  33)
 * Aerolab:                               MOST COMMON QUESTIONS OF ALL.
-                                                              (line  69)
-* algorithm:                             CHARTS.              (line  19)
+                                                              (line  75)
+* Aerolab <1>:                           CHARTS.              (line  19)
 * anomalies:                             DATA.                (line  23)
+* anomalies <1>:                         DATA.                (line  38)
 * AP:                                    METRICS.             (line  80)
 * best:                                  MOST COMMON QUESTIONS OF ALL.
-                                                              (line  61)
+                                                              (line  62)
 * bug:                                   GENERAL.             (line  66)
-* Chung:                                 CHARTS.              (line  33)
+* cervo:                                 MOST COMMON QUESTIONS OF ALL.
+                                                              (line 136)
+* Chung:                                 CHARTS.              (line  19)
 * clone:                                 GENERAL.             (line  40)
-* colour <1>:                            CHARTS.              (line  84)
 * colour:                                MOST COMMON QUESTIONS OF ALL.
-                                                              (line 115)
+                                                              (line 121)
+* colour <1>:                            CHARTS.              (line  68)
 * contribute:                            GENERAL.             (line  73)
-* CP <1>:                                CHARTS.              (line  19)
 * CP:                                    METRICS.             (line  22)
-* CSV:                                   DATA.                (line  88)
+* CP <1>:                                METRICS.             (line  39)
+* CP <2>:                                METRICS.             (line  50)
+* CSV:                                   DATA.                (line  87)
 * CTL:                                   METRICS.             (line  63)
 * cycle:                                 SEASONS AND EVENTS.  (line   9)
 * Daniels:                               METRICS.             (line   9)
 * donate:                                GENERAL.             (line  85)
+* download:                              GENERAL.             (line  31)
 * download <1>:                          UPLOADING AND DOWNLOADING.
                                                               (line  16)
-* download:                              GENERAL.             (line  31)
 * elevation:                             METRICS.             (line  71)
 * EqP:                                   METRICS.             (line   9)
 * event:                                 SEASONS AND EVENTS.  (line  18)
+* event <1>:                             SEASONS AND EVENTS.  (line  26)
 * feature:                               GENERAL.             (line  66)
-* FITLOG:                                DATA.                (line  88)
+* FITLOG:                                DATA.                (line  87)
 * FTP:                                   METRICS.             (line  22)
+* FTP <1>:                               METRICS.             (line  50)
 * Garmin Connect:                        METRICS.             (line  80)
 * github:                                GENERAL.             (line  40)
 * Google:                                UPLOADING AND DOWNLOADING.
-                                                              (line  38)
+                                                              (line  22)
 * install:                               GENERAL.             (line  31)
 * join:                                  DATA.                (line   9)
-* JSON:                                  DATA.                (line  88)
+* JSON:                                  DATA.                (line  87)
 * LTS:                                   METRICS.             (line  63)
 * mail:                                  GENERAL.             (line  56)
-* map:                                   CHARTS.              (line  69)
+* map:                                   CHARTS.              (line  53)
 * merge:                                 DATA.                (line   9)
 * month:                                 CHARTS.              (line   9)
 * NP:                                    METRICS.             (line   9)
 * options:                               MOST COMMON QUESTIONS OF ALL.
-                                                              (line 106)
+                                                              (line 112)
 * override:                              METRICS.             (line 110)
-* PMC <1>:                               METRICS.             (line  63)
 * PMC:                                   MOST COMMON QUESTIONS OF ALL.
-                                                              (line  69)
+                                                              (line  75)
+* PMC <1>:                               METRICS.             (line  63)
+* powertap:                              MOST COMMON QUESTIONS OF ALL.
+                                                              (line 136)
 * preferences:                           MOST COMMON QUESTIONS OF ALL.
-                                                              (line 106)
+                                                              (line 112)
 * prior:                                 CHARTS.              (line   9)
-* PWX:                                   DATA.                (line  88)
+* PWX:                                   DATA.                (line  87)
 * remove:                                MOST COMMON QUESTIONS OF ALL.
-                                                              (line  20)
+                                                              (line  22)
 * report:                                GENERAL.             (line  66)
 * season:                                SEASONS AND EVENTS.  (line   9)
+* season <1>:                            SEASONS AND EVENTS.  (line  26)
 * settings:                              MOST COMMON QUESTIONS OF ALL.
-                                                              (line  95)
+                                                              (line 101)
 * source:                                GENERAL.             (line  40)
 * spikes:                                DATA.                (line  23)
+* spikes <1>:                            DATA.                (line  38)
 * split:                                 DATA.                (line   9)
-* Strava:                                UPLOADING AND DOWNLOADING.
-                                                              (line  22)
-* TCX:                                   DATA.                (line  88)
+* TCX:                                   DATA.                (line  87)
 * trainer:                               METRICS.             (line  50)
 * TrainingPeaks:                         UPLOADING AND DOWNLOADING.
                                                               (line   9)
-* treemap:                               CHARTS.              (line  77)
+* TrainingPeaks <1>:                     UPLOADING AND DOWNLOADING.
+                                                              (line  16)
+* treemap:                               CHARTS.              (line  61)
 * triathlete:                            GENERAL.             (line  47)
-* TSS <1>:                               METRICS.             (line  80)
 * TSS:                                   MOST COMMON QUESTIONS OF ALL.
                                                               (line   9)
-* unzoom:                                CHARTS.              (line 108)
+* TSS <1>:                               METRICS.             (line  80)
+* unzoom:                                CHARTS.              (line  93)
 * upload:                                UPLOADING AND DOWNLOADING.
                                                               (line   9)
-* VE:                                    CHARTS.              (line  33)
+* usb:                                   MOST COMMON QUESTIONS OF ALL.
+                                                              (line 136)
+* VE:                                    CHARTS.              (line  19)
 * weekly summary:                        MOST COMMON QUESTIONS OF ALL.
-                                                              (line  81)
+                                                              (line  87)
 * weight:                                MOST COMMON QUESTIONS OF ALL.
-                                                              (line  36)
+                                                              (line  37)
 * Withings:                              UPLOADING AND DOWNLOADING.
-                                                              (line  51)
+                                                              (line  35)
 * xPower:                                METRICS.             (line   9)
-* zoom:                                  CHARTS.              (line  97)
+* zoom:                                  CHARTS.              (line  82)
+* zoom <1>:                              CHARTS.              (line  93)
 
 
 
 Tag Table:
-Node: Top164
-Node: MOST COMMON QUESTIONS OF ALL609
-Node: GENERAL6062
-Node: METRICS9684
-Node: DATA16676
-Node: UPLOADING AND DOWNLOADING20606
-Node: SEASONS AND EVENTS23387
-Node: CHARTS24784
-Node: INDEX29585
+Node: Top163
+Node: MOST COMMON QUESTIONS OF ALL608
+Node: GENERAL7263
+Node: METRICS10899
+Node: DATA17912
+Node: UPLOADING AND DOWNLOADING21867
+Node: SEASONS AND EVENTS23922
+Node: CHARTS25327
+Node: INDEX29480
 
 End Tag Table

doc/user/GC3-FAQ.texinfo

@@ -9,7 +9,7 @@
 @paragraphindent 0
 
 @copying
-This manual is for Golden Cheetah, version 3.0.
+This manual is for Golden Cheetah, version 3.1.
 
 Copyright @copyright{} 2013 Mark Liversedge
 @end copying
@@ -35,7 +35,7 @@ Copyright @copyright{} 2013 Mark Liversedge
 @node Top,Top,Top,
 @top title
 
-This manual is for GoldenCheetah, version 3.0.
+This manual is for GoldenCheetah, version 3.1.
 @end ifnottex
 
 @menu
@@ -58,24 +58,24 @@ This manual is for GoldenCheetah, version 3.0.
 
 The details chart on the analysis view allows you to override metrics on the metrics tab. 
 By default the most common metrics are listed, including average HR, distance and so on.
-From v3.0 the default setup will also include TSS as a metric you can override here.
+From v3.1 the default setup will also include TSS as a metric you can override here.
 
 If the metric is not there you will need to configure GoldenCheetah to allow it to be shown.
-This is simple to do and described in 3.9 below.
+This is simple to do and described in 3.9 below. The 3.1 upgrade process should have added it
+to the Metric tab if it was not already there.
 
 @section How do I add or remove a chart?
 @cindex add
 @cindex remove
 
-To add a new chart to the view you can select from the + menu on the right hand side of 
-the scope bar (the scope bar is underneath the toolbar and lets you select from Home,
-Analysis, Train etc).
+To add a new chart to the view you can select from the hamburger menu on the right hand side of 
+the chart bar.
 
 Depending upon which view you are on the charts available will differ. For example realtime
 plots only appear on the Train view, whilst charts that work with individual rides will only
 appear on the analysis view.
 
-To remove a chart, when you mouse over a chart (in tabbed or tiled mode) a small triangle
+To remove a chart, when you mouse over a chart (in tabbed or tiled mode) the word 'More...'
 will appear in the top left of the chart. This is a menu drop down, if you click on it
 you will see a `Close' option. This is the option to remove (close) the chart.
 
@@ -110,7 +110,11 @@ the LTM plots.
 @section How do I plot x sec power best?
 @cindex best
 
-As of v3.0 it is still not possible to plot custom durations for power bests. We are
+In v3.1 it is now possible to plot custom durations for any data series on a metric
+trends chart in the Trends view. You will need to add a curve for the data series
+and select `Best' instead of `Metric' or `Estimate' on the curve settings.
+
+For v3.0 or earlier it is still not possible to plot custom durations for power bests. We are
 looking to add this in version 3.1, but for now you can only plot 1s, 5s, 10s, 15s, 20s,
 30s, 1min, 2min, 5min, 10min, 20min, 30min and 60min bests.
 
@@ -147,7 +151,7 @@ implement planning functionality in v3.1.
 @cindex settings
 
 All chart settings can be found under the drop down menu that appears in the top left hand
-corner of a chart when you mouse over it. They will appear as a popup dialog box.
+corner of a chart when you mouse over it, titled `More...'. They will appear as a popup dialog box.
 
 Additionally, when you move the cursor towards the title of a chart in a view that is tabbed
 (not tiled) then a small selection of the most important settings for the chart will appear
@@ -175,7 +179,23 @@ They are processed in the order they are defined with the first match being retu
 care when using values such as 'TT' and 'race' since these can also be part of an English
 word (e.g. ATTEMPT contains 'TT' and graceful contains 'race'.
 
+@section GoldenCheetah doesn't find my PowerTap on Ubuntu Linux.
+@cindex powertap
+@cindex cervo
+@cindex usb
 
+If you're using the USB cradle (as opposed to the older, serial one), the FTDI driver sometimes 
+conflicts with the braille terminal in the default Ubuntu installation. Try unplugging the PT cradle 
+from the computer and uninstalling brltty: sudo apt-get remove brltty
+Then plug the device back in and it should work.
+
+@section GoldenCheetah.dmg installation didn't seem to work.
+
+Are you running OS X Snow Leopard (10.6) or later? You need to be. If you are, and you're still
+having this problem, open Terminal (in Applications -> Utilities) and type this at the prompt:
+
+/Applications/GoldenCheetah.app/Contents/MacOS/GoldenCheetah then press <return>
+and send an email to the mailing list with whatever it prints out. We'll help you debug it.
 
 @node GENERAL,METRICS,MOST COMMON QUESTIONS OF ALL,Top
 @chapter GENERAL
@@ -417,7 +437,7 @@ dialog is designed to be simple and accept only the most common of entries.
 
 @section Can you calculate gradient, virtual power or other derived series from the ride data?
 
-Not in 3.0. We may introduce derived data series in the future.
+Not in 3.1. We plan to extend this functionality in v3.2.
 
 
 
@@ -447,8 +467,8 @@ To join two rides together (making one longer ride from two rides) you can copy
 in the activity editor and paste special in the ride editor (right click) and then select
 append mode.
 
-If you wish to merge rides, that is much harder and would need to be performed outside
-of GC or by cutting and pasting columns in the activity editor.
+If you wish to merge rides, in v3.1 there is a new Activity->Merge wizard that will walk
+you through merging ride files and also provide the ability to synchronise timestamps.
 
 
 
@@ -532,7 +552,7 @@ Training Peaks PWX or Garmin TCX format.
 
 @section Can I use GC to convert data from one format to another on the command line?
 
-No. It is something we may add in v3.1
+No. It is something we may add in v3.2
 
 
 
@@ -567,22 +587,6 @@ using a free service they do not let you retrieve your data.
 
 
 
-@section Upload/Download with Strava fails?
-@cindex Strava
-
-Strava have switched off their v1 and v2 APIs before providing access to their
-v3 APIs. We have requested access to the new v3 API but it has not been granted.
-In the meantime to upload to Strava you can send an email to @email{upload@@strava.com} 
-from you registered email account attaching the ride in a format Strava supports.
-
-We remain committed to helping cyclists download their power data 
-to the computer of their choice, analyze it in whatever way they see fit, and 
-share their methods of analysis with others. 
-
-We will be deprecating support for Strava upload/download in v3 SP1 and have no
-immediate plans to provide support for it in the future.
-
-
 @section What settings do I need to get GoldenCheetah to upload to my Google Calendar?
 @cindex Google
 
@@ -643,8 +647,8 @@ Seasons and Events are created and edited in the sidebar for the Home view. Seas
 listed under date ranges, whilst events are listed under the events sidebar item. In
 both cases they can be created and deleted from the sidebar item's drop down menu.
 
-Please note that in v3.0 events can only be created when a user season is selected, since
-events are associated with a particular season. This constraint will be removed in v3.1.
+Please note that in v3.1 events can only be created when a user season is selected, since
+events are associated with a particular season. This constraint will be removed in v3.2.
 
 @node CHARTS,INDEX,SEASONS AND EVENTS,Top
 @chapter CHARTS
@@ -663,22 +667,6 @@ prior '2' is a month 2 months ago, whilst 'This' 'month' and prior '1' is last m
 
 
 
-@section How does the mean max chart calculate CP when showing power?
-@cindex CP
-@cindex algorithm
-
-The CP algorithm searches your best power for two durations; for anaerobic efforts it 
-looks between 15s and 1min, for aerobic it looks for best efforts between 10mins and
-an hour.
-
-Once it has found these two best values it will curve fit the two to enable the
-60min value to be extracted. Bear in mind this is a theoretical number and as described
-above is applicable to the BikeScore algorithm. The value for FTP that the TSS algorithm
-requires is simply the highest value for 60mins for the time period, assuming you have
-performed a 60minute test recently.
-
-
-
 @section How should I use Aerolab?
 @cindex Aerolab
 @cindex Chung
@@ -736,7 +724,8 @@ e.g. workout code, sport et al.
 @cindex colour
 
 With the exception of the Long Term Metric plots the colours on the charts are
-configured in the GoldenCheetah preferences pane.
+configured in the GoldenCheetah preferences pane. It is possible to apply a theme
+or change each individual color.
 
 We want to use the same colours to plot each data series across the charts, so you
 can change them globally.

doc/user/GC31-Announce.txt

@@ -0,0 +1,46 @@
+We are proud to announce that GoldenCheetah v3.1 was released today.
+
+It can be downloaded from our new website[http://www.goldencheetah.org/index.html#section-download]
+
+We have recorded a video[https://vimeo.com/99817526] to explain the main changes, and the user guide[https://github.com/GoldenCheetah/GoldenCheetah/wiki/Main-Page_Users-Guide] has been overhauled to cover all the main features along with an updated FAQ[https://github.com/GoldenCheetah/GoldenCheetah/wiki/FAQ].
+
+We have also added a section on the science of GoldenCheetah[http://www.goldencheetah.org/index.html#section-science] to help users new to power training and analysis.
+
+MAJOR NEW FEATURES
+
+1. Compare Mode
+   * Across Summary, Ride, QA, CP, Histogram, Metric charts
+   * Compare Athletes, Seasons, Rides, Intervals
+   * Easy and intuitive user interface
+
+2. Additional Power Duration Models
+   * Multiple PD models now available
+   * Track changes in model estimates for W', CP, P-Max, FTP over time
+   * Track changes in model estimates for any duration over time
+
+2. Merge data from multiple rides into a single ride
+3. Share Dialog to upload to multiple services in one click
+
+OTHER SELECTED HIGHLIGHTS
+
+* Open Athletes in Tabs
+* Redesign Tabbed mode with a ChartBar
+* Themes and better support for color customisation
+* Improved Interactivity (axes, interval hover)
+
+Device enhancements
+* Fixed up Tacx Fortius Support
+* Pedal Smoothness / Torque Effectiveness support
+
+Metrics and new science
+* Plot best x power
+* Plot estimated W', CP, FTP et al
+* W'bal implemented with metrics
+
+Charts
+* Improved UX for chart configuration and setup
+* Export data for MMP curves, trends data
+* Over 50 new charting options (heat, stack, labels etc etc)
+
+Work on 3.11 starts today, focusing on indoor training.
+

doc/user/GC31-Release.info

@@ -0,0 +1,270 @@
+This is GC31-Release.info, produced by makeinfo version 5.2 from
+GC31-Release.texinfo.
+
+
+File: GC31-Release.info,  Node: Top,  Next: Top,  Prev: Top
+
+title
+*****
+
+These release notes are for GoldenCheetah, version 3.1.
+
+* Menu:
+
+* WHATS NEW::  What's new in V3.1
+* CONTRIBUTORS::  List of Contributors to V3.1
+
+
+File: GC31-Release.info,  Node: WHATS NEW,  Next: CONTRIBUTORS,  Prev: CONTRIBUTORS,  Up: Top
+
+1 Whats New
+***********
+
+1.1 Major new features; Compare, Share and Merge
+================================================
+
+We have added a new feature to enable comparing rides and intervals
+across all the charts where it is sensible to try; performance plot, cp
+chart, histogram and QA charts all support compare.  Additionally it is
+possible to compare trends across different seasons as well as
+histograms.  And of course, these are also possible across athletes; so
+you can compare one athletes season or ride with another athletes season
+or ride.
+
+Wherever it is sensible to compare things, we think it is now possible
+to compare things.
+
+We have also unified upload to "cloud" across Strava, RideWithGPS and
+Cycling Analytics.  With a single click you can upload to all services.
+We do not currently support Garmin Connect as they have closed their
+system and only work with commercial partners - for this reason we
+recommend storing data outside for future data security.
+
+Lastly, it is now possible to merge data from different sources into a
+single ridefile.  This is particularly useful when working with
+multipled devices or integrating data from devices like the Moxy SM02
+monitor.
+
+1.2 General Enhancements
+========================
+
+We have made the following general / UI enhancements:
+
+   * Open Athletes in Tabs - it is possible to open up all your athletes
+     within a single window and switch tabs.
+
+   * ChartBar - the chartbar has become a toolbar item and is
+     scrollable.  This dramatically increases the screen estate
+     available for displaying charts and data but also makes the UI less
+     'quirky' and align more to typical desktop application styles.
+
+   * Themes and better support for color customisation - we now have
+     much more sophisticated support for color customisation and support
+     across all the charts.  Themes allow you to switch between light on
+     dark and dark on light setups quickly and easily.
+
+   * Improved Interactivity - mouse over interactivity has been extended
+     over the ride list and most charts for faster exploration of data
+     and to provide a more fluid and dynamic user experience.  This
+     extendes to isolating curves within a chart by hovering over the
+     axis labels and automatically selecting intervals as you hover over
+     their data in the QA and ride charts.
+
+   * Autofilter in Trends view - as well as advance data filtering
+     within chart setup and the toolbar search box we have now added
+     autofilters in the trends sidebar to make it simple to filter data
+     based upon metadata e.g.  all running files or rides on your TT
+     bike.
+
+   * Specify athlete library location - You can now specify where data
+     is stored to make it easier to integrate with backup or other
+     synchronisation tools.
+
+   * Improved Dropbox support (CRC) - We will check the data within a
+     ride has changed (as opposed to its timestamp) before refreshing
+     metrics.  This is to remove unneccessary metric refreshes when
+     copying data between computers or synchronising using tools like
+     Dropbox.
+
+   * Find intervals via matches, hills etc - The find intervals dialog
+     will now find hills as well as sustained efforts using W'
+     consumption (see support for W'bal).
+
+1.3 Enhanced Device Support
+===========================
+
+We have fixed or enhanced device support for:
+
+   * Fixed up Tacx Fortius Support - Dave Waterworth has updated the
+     original beta code for Fortius support to now make the Fortius and
+     fully supported device in train view.
+
+   * Joule GPS updates - the latest firmware is now supported and no
+     longer crashes GC (!).
+
+   * FIT ride file updates - better support for custom FIT sections that
+     are being used by vendors to suport localised data.
+
+   * Pedal Smoothness / Torque Effectiveness support - the Rotor and
+     Vector data series are now extracted and stored in ridefiles and
+     can be plotted alongside all the other ride data series on
+     performance, scatter and histogram plots.
+
+   * Moxy support - we have added support for the Moxy SM02 monitor and
+     can be imported and merged with ride data using the new merge
+     dialog.
+
+1.4 New Metrics Implemented
+===========================
+
+We have implemented a lot of new science in 3.1 and along with that
+there are a lot of associated metrics:
+
+   * Plot bests - It is now possible to plot user-defined durations for
+     power bests.  For example it is now possible to plot 13s power
+     best, but we have extended this to cover all ride data series, so
+     you can plot best durations for heartrate, speed, cadence and so on
+     within a metric trends chart.  This feature has been the most
+     requested feature since LTM was implemeted in 2010, so we've
+     finally got there.
+
+   * Plot Model Estimates - With the new PD models we also derive
+     estimates for W', CP et al using each of the models.  These can
+     then be plotted; an example 'CP History' plot in the trends view is
+     provide as an example.
+
+   * W'bal implemented with metrics - The W'bal data series is derived
+     from power data and can be plotted alongside all other ride data.
+     It has also been implemented within the erg plot to assess ERG
+     workouts before attempting them.
+
+   * TISS implemented - An an Ae TISS have been implemented and can be
+     plotted as data series within a ride but also as inputs into a PMC
+     chart.  An example 'Stress' chart is provided to plot these in the
+     Trends and Rides view.
+
+   * aPower - We have implemented Altitude Power to adjust recorded
+     power to take into account the effect of altitude on vo2max and
+     thus power output.  This can be plotted alongside all other ride
+     data series.
+
+   * Polarised Zones - Histogram chart will now plot power histograms in
+     Polarised Zones as well as the more familar Coggan 7 levels.
+
+   * Pacing Index / Fatigue Index - Experimentally added to help review
+     interval efforts.
+
+   * W' work - To compliment W'bal and Work metrics we now isolate and
+     can track how much W' energy is being expended.  This is closely
+     related to tracking Anaerobic training.
+
+   * Average Pedal Smoothness / Torque Efficiency - the Rotor/Vector
+     metrics can be plotted alongside ride data but also as average
+     metrics to track across weeks, months and seasons.
+
+1.5 Chart Enhancements
+======================
+
+We have made significant changes across all the charts in 3.1.  These
+have been added to support the new models and science and also to try
+and enhance the utility and user experience.
+
+   * LTM Chart - It is now possible to select charts via a Chart
+     selection sidebar thus reducing the number of charts needed to be
+     pre-configured on the chart bar.  We have also tidied up the LTM
+     settings dialog and improved the UX for setting up charts in the
+     first place.  To support the new compare mode we have also added a
+     Stack mode and a Data table mode to look at series in isolation or
+     just review the numbers.  It is also now possible to export the
+     chart data to manipulate or analyse in other tools.  Lastly, we
+     have also added Labels and Quadratic trend lines to create charts
+     that are more readable without resorting to tooltips and guess
+     work.
+
+   * CP Chart - The critical power chart has seen a lot of new features
+     added both to support the new PD models but also to provide the
+     possibility to plot and compare intervals.  The key new features
+     include User selectable CP models and the ability to fine tune the
+     search intervals used by each of the 4 models.  It is also now
+     possible to plot rates of change for power, heartrate etc and also
+     to plot heat and heat by age.  You can also plot a ride as
+     percentge of best or as a centile.  And as with the LTM charts it
+     is also possible to export the PD data and model to review and
+     assess in other tools.
+
+   * Ride Chart - It is now possible to plot lots of derived series; NP,
+     W'bal, xPower, Delta etc and also to plot each series in its own
+     chart with all series shown as a 'stack'.  We have also finally
+     added the ability to create and edit reference lines for power and
+     have added an overlay to display interval data as you hover or
+     select them in the plot.
+
+   * Summary Chart - It is mostly unchanged but will now also support
+     displaying user defined metrics for Athlete Bests for the date
+     range selected.  It will also show model estimates that apply to
+     the ride or for the date range being summarised.
+
+1.6 Code refactoring and 300 issues fixed
+=========================================
+
+Since we release 3.0 in June 2013 we've been busily updating the code to
+fix lots and lots of nits and errors, but also slowly adjusting the code
+to provide a better platform for new features.
+
+We have deferred almost all features related to indoor training to a
+release 3.11 that is planned for the beginning of 2015 with development
+starting in August 2014.
+
+However, some of the (boring, tehcnical) foundational things that
+changed in 3.1 include:
+
+   * QT 5.3 is now supported; so QT video support, QML, Qt Json, faster
+     webkit and for the future, possible support for IOS and Android
+     devices.
+
+   * QWT 6.1 with multiaxis is now supported; lots of bug fixes and
+     better rendering on retina and high resolution displays.
+
+   * CP chart and AllPlot chart refactored to make it possible to extend
+     functionality e.g.  for new PD models and derived data series.
+
+Some of the functionality that has been fixed include reinstated support
+for Strava and Twitter.  We also have better native support for
+look-and-feel differences across the three platforms we currently
+support (Mac, Linux, Windows).
+
+We have also adjusted the startup mechanism to make it possible to
+select a different athlete or create a new one if recovering from a
+fatal crash.
+
+
+File: GC31-Release.info,  Node: CONTRIBUTORS,  Next: WHATS NEW,  Prev: WHATS NEW,  Up: Top
+
+2 Contributors
+**************
+
+2.1 Credits and Contributors
+============================
+
+The main contributors continue to be Mark, Damien and Gareth, but a few
+new contributors have joined the team in the last year and the future
+looks promising.  A particular shout out is deserved for Joern
+Rischmuller who has updated the GC Wiki to cover all functionality - so
+for the first time we have comprehensive user documentation.
+
+The following have all made a contribution to 3.1:
+
+Alejandro Martinez, Bruno Fernandez-Ruiz, Christian Stade-Schuldt,
+Damien Grauser, Dave Waterworth, Eric Johnson, Gareth Coco, Ilja Booij,
+Jaime Jofre, Joern Rischmuller, Jon Beverley, Jon Escombe, KURASHIKI
+Satoru, Mark Liversedge, Rainer Clasen, Ralf Spenneberg, Simon Egli,
+Stig B. Dørmænen, Tom Weichmann, Walter Bürki and Alex Delli.
+
+
+
+Tag Table:
+Node: Top88
+Node: WHATS NEW312
+Node: CONTRIBUTORS10389
+
+End Tag Table

doc/user/GC31-Release.texinfo

@@ -0,0 +1,245 @@
+\input texinfo   @c -*-texinfo-*-
+@ifnotinfo
+@input palatino
+@end ifnotinfo
+@c %**start of header
+@setfilename Release Notes.texinfo
+@settitle Golden Cheetah v3.1 Release Notes
+@c %**end of header
+@paragraphindent 0
+
+@titlepage
+@title Golden Cheetah v3.1 Release Notes
+@c @subtitle subtitle-if-any
+@c @subtitle second-subtitle
+@author Mark Liversedge
+
+@end titlepage
+
+@c So the toc is printed at the start.
+@contents
+
+@ifnottex
+@node Top,Top,Top,
+@top title
+
+These release notes are for GoldenCheetah, version 3.1.
+@end ifnottex
+
+@menu
+* WHATS NEW::  What's new in V3.1
+* CONTRIBUTORS::  List of Contributors to V3.1
+@end menu
+
+@node WHATS NEW,CONTRIBUTORS,CONTRIBUTORS,Top
+@chapter Whats New
+
+@section Major new features; Compare, Share and Merge
+
+We have added a new feature to enable comparing rides and intervals across all
+the charts where it is sensible to try; performance plot, cp chart, histogram
+and QA charts all support compare.  Additionally it is possible to compare 
+trends across different seasons as well as histograms. And of course, these are
+also possible across athletes; so you can compare one athletes season or ride
+with another athletes season or ride.
+
+Wherever it is sensible to compare things, we think it is now possible to compare things.
+
+We have also unified upload to "cloud" across Strava, RideWithGPS and Cycling
+Analytics. With a single click you can upload to all services. We do not currently
+support Garmin Connect as they have closed their system and only work with commercial
+partners - for this reason we recommend storing data outside for future data security.
+
+Lastly, it is now possible to merge data from different sources into a single ridefile.
+This is particularly useful when working with multipled devices or integrating data
+from devices like the Moxy SM02 monitor.
+
+@section General Enhancements
+
+We have made the following general / UI enhancements:
+
+@itemize @bullet 
+@item Open Athletes in Tabs - it is possible to open up all your athletes within a
+single window and switch tabs.
+
+@item ChartBar - the chartbar has become a toolbar item and is scrollable. This
+dramatically increases the screen estate available for displaying charts and data
+but also makes the UI less `quirky' and align more to typical desktop application
+styles.
+
+@item Themes and better support for color customisation - we now have much more sophisticated
+support for color customisation and support across all the charts. Themes allow you
+to switch between light on dark and dark on light setups quickly and easily.
+
+@item Improved Interactivity - mouse over interactivity has been extended over the ride
+list and most charts for faster exploration of data and to provide a more fluid and 
+dynamic user experience. This extendes to isolating curves within a chart by hovering
+over the axis labels and automatically selecting intervals as you hover over their data
+in the QA and ride charts.
+
+@item Autofilter in Trends view - as well as advance data filtering within chart setup and
+the toolbar search box we have now added autofilters in the trends sidebar to make it
+simple to filter data based upon metadata e.g. all running files or rides on your TT bike.
+
+@item Specify athlete library location - You can now specify where data is stored to make
+it easier to integrate with backup or other synchronisation tools.
+
+@item  Improved Dropbox support (CRC) - We will check the data within a ride has changed
+(as opposed to its timestamp) before refreshing metrics. This is to remove unneccessary
+metric refreshes when copying data between computers or synchronising using tools like
+Dropbox.
+
+@item Find intervals via matches, hills etc - The find intervals dialog will now find
+hills as well as sustained efforts using W' consumption (see support for W'bal).
+
+@end itemize
+
+@section Enhanced Device Support
+
+We have fixed or enhanced device support for:
+
+@itemize @bullet
+
+@item Fixed up Tacx Fortius Support - Dave Waterworth has updated the original beta code
+for Fortius support to now make the Fortius and fully supported device in train view.
+
+@item Joule GPS updates - the latest firmware is now supported and no longer crashes GC (!).
+
+@item FIT ride file updates - better support for custom FIT sections that are being used
+by vendors to suport localised data.
+
+@item Pedal Smoothness / Torque Effectiveness support - the Rotor and Vector data series
+are now extracted and stored in ridefiles and can be plotted alongside all the other ride
+data series on performance, scatter and histogram plots.
+
+@item Moxy support - we have added support for the Moxy SM02 monitor and can be imported
+and merged with ride data using the new merge dialog.
+
+@end itemize
+
+@section New Metrics Implemented
+
+We have implemented a lot of new science in 3.1 and along with that
+there are a lot of associated metrics:
+
+@itemize @bullet
+
+@item Plot bests - It is now possible to plot user-defined durations for power bests.
+For example it is now possible to plot 13s power best, but we have extended this to
+cover all ride data series, so you can plot best durations for heartrate, speed, cadence
+and so on within a metric trends chart. This feature has been the most requested feature
+since LTM was implemeted in 2010, so we've finally got there.
+
+@item Plot Model Estimates - With the new PD models we also derive estimates for W', CP et al using
+each of the models. These can then be plotted; an example `CP History' plot in the trends view
+is provide as an example.
+
+@item W'bal implemented with metrics - The W'bal data series is derived from power data and
+can be plotted alongside all other ride data. It has also been implemented within the erg
+plot to assess ERG workouts before attempting them.
+
+@item TISS implemented - An an Ae TISS have been implemented and can be plotted as data series
+within a ride but also as inputs into a PMC chart. An example `Stress' chart is provided to
+plot these in the Trends and Rides view.
+
+@item aPower - We have implemented Altitude Power to adjust recorded power to take into
+account the effect of altitude on vo2max and thus power output. This can be plotted alongside
+all other ride data series.
+
+@item Polarised Zones - Histogram chart will now plot power histograms in Polarised Zones as well
+as the more familar Coggan 7 levels.
+
+@item Pacing Index / Fatigue Index - Experimentally added to help review interval efforts.
+
+@item W' work - To compliment W'bal and Work metrics we now isolate and can track how much
+W' energy is being expended. This is closely related to tracking Anaerobic training.
+
+@item Average Pedal Smoothness / Torque Efficiency - the Rotor/Vector metrics can be plotted
+alongside ride data but also as average metrics to track across weeks, months and seasons.
+
+@end itemize
+
+@section Chart Enhancements
+
+We have made significant changes across all the charts in 3.1. These have been added
+to support the new models and science and also to try and enhance the utility and 
+user experience.
+
+@itemize @bullet
+
+@item LTM Chart - It is now possible to select charts via a Chart selection sidebar thus
+reducing the number of charts needed to be pre-configured on the chart bar. We have also
+tidied up the LTM settings dialog and improved the UX for setting up charts in the first place.
+To support the new compare mode we have also added a Stack mode and a Data table mode to 
+look at series in isolation or just review the numbers. It is also now possible to export 
+the chart data to manipulate or analyse in other tools. Lastly, we have also added Labels 
+and Quadratic trend lines to create charts that are more readable without resorting to 
+tooltips and guess work.
+
+@item CP Chart - The critical power chart has seen a lot of new features added both to
+support the new PD models but also to provide the possibility to plot and compare intervals.
+The key new features include User selectable CP models and the ability to fine tune the
+search intervals used by each of the 4 models. It is also now possible to plot rates of change
+for power, heartrate etc and also to plot heat and heat by age. You can also plot a ride as 
+percentge of best or as a centile. And as with the LTM charts it is also possible to export
+the PD data and model to review and assess in other tools.
+
+@item Ride Chart - It is now possible to plot lots of derived series; NP, W'bal, xPower, Delta etc 
+and also to plot each series in its own chart with all series shown as a 'stack'. We have also
+finally added the ability to create and edit reference lines for power and have added an overlay
+to display interval data as you hover or select them in the plot.
+
+@item Summary Chart - It is mostly unchanged but will now also support displaying user
+defined metrics for Athlete Bests for the date range selected. It will also show model
+estimates that apply to the ride or for the date range being summarised.
+
+@end itemize
+
+@section Code refactoring and 300 issues fixed
+
+Since we release 3.0 in June 2013 we've been busily updating the
+code to fix lots and lots of nits and errors, but also slowly adjusting
+the code to provide a better platform for new features.
+
+We have deferred almost all features related to indoor training to a 
+release 3.11 that is planned for the beginning of 2015 with development
+starting in August 2014.
+
+However, some of the (boring, tehcnical) foundational things that changed in 3.1 include:
+
+@itemize @bullet 
+@item QT 5.3 is now supported; so QT video support, QML, Qt Json, faster
+webkit and for the future, possible support for IOS and Android devices.
+
+@item QWT 6.1 with multiaxis is now supported; lots of bug fixes and better
+rendering on retina and high resolution displays.
+
+@item CP chart and AllPlot chart refactored to make it possible to extend
+functionality e.g. for new PD models and derived data series.
+ 
+@end itemize
+
+Some of the functionality that has been fixed include reinstated support
+for Strava and Twitter.  We also have better native support for look-and-feel
+differences across the three platforms we currently support (Mac, Linux, Windows).
+
+We have also adjusted the startup mechanism to make it possible to select a 
+different athlete or create a new one if recovering from a fatal crash.
+
+@node CONTRIBUTORS,WHATS NEW,WHATS NEW,Top
+@chapter Contributors
+
+@section Credits and Contributors
+
+The main contributors continue to be Mark, Damien and Gareth, but a few new contributors
+have joined the team in the last year and the future looks promising. A particular shout
+out is deserved for Joern Rischmuller who has updated the GC Wiki to cover all functionality --
+so for the first time we have comprehensive user documentation.
+
+The following have all made a contribution to 3.1:
+
+Alejandro Martinez, Bruno Fernandez-Ruiz, Christian Stade-Schuldt, Damien Grauser, Dave Waterworth, Eric Johnson,
+Gareth Coco, Ilja Booij, Jaime Jofre, Joern Rischmuller, Jon Beverley, Jon Escombe, KURASHIKI Satoru, Mark Liversedge,
+Rainer Clasen, Ralf Spenneberg, Simon Egli, Stig B. Dørmænen, Tom Weichmann, Walter Bürki and Alex Delli.
+
+@bye

doc/user/GC31-Release.txt

@@ -27,6 +27,7 @@ v    Autofilter in Trends view
 vi   Specify athlete library location
 vii  Improved Dropbox support (CRC)
 viii Find intervals via matches, hills etc
+ix   Fix Elevation
 
 2. Device
 i    Fixed up Tacx Fortius Support
@@ -83,6 +84,6 @@ iv  CP refactored (for models and intervals)
 v   AllPlot refactored (for compare)
 
 BUG FIXES
-i   Over 900 commits since 3.0 including many bug fixes
+i   Over 1000 commits since 3.0 including many bug fixes
 ii  Eradicating assert reduces crashes
 iii Crash dialog/restart to menu

doc/user/Makefile

@@ -12,7 +12,7 @@ clean:
 
 MANUAL: GC3-Manual.pdf 
 FAQ: GC3-FAQ.pdf GC3-FAQ.info
-RELEASE: GC3-Release.pdf GC3-Release.info
+RELEASE: GC3-Release.pdf GC3-Release.info GC31-Release.pdf GC31-Release.info
 
 ## The basic commands, good on Linux/Mac
 ## need mingw on Windows

doc/user/announce-sites.txt

@@ -0,0 +1,20 @@
+Sites to announce releases / updates on
+
+
+* English
+
+Google Groups: golden-cheetah-announce, golden-cheetah-users, wattage
+BikeRadar.com: http://www.bikeradar.com/forums/viewforum.php?f=40011
+Timetrialling.co.uk: http://www.timetriallingforum.co.uk/index.php?showforum=33
+Slowtwitch.com: http://forum.slowtwitch.com/forum/Slowtwitch_Forums_C1/Triathlon_Forum_F1/
+Weightweenies: http://weightweenies.starbike.com/forum/viewforum.php?f=8
+Roadbike Review: http://forums.roadbikereview.com/racing-training-nutrition-triathlons/
+
+* Italian
+
+Ask "fester54 hotmail com" to post in Italian to http://www.bdc-forum.it/
+
+* German
+
+Ask "joern.rm gmail com" to post in German to http://forum.tour-magazin.de/forum.php
+

doc/user/formula-syntax.txt

@@ -0,0 +1,441 @@
+MATHS FUNCTIONS
+
+cos(p1)
+tan(p1)
+sin(p1)
+acos(p1)
+atan(p1)
+asin(p1)
+cosh(p1)
+tanh(p1)
+sinh(p1)
+acosh(p1)
+atanh(p1)
+asinh(p1)
+exp(p1)
+log(p1)
+log10(p1)
+ceil(p1)
+floor(p1)
+round(p1)
+fabs(p1)
+isinf(p1)
+isnan(p1)
+
+LIST / VECTOR REDUCE FUNCTIONS
+sum(...)
+mean(...)
+max(...)
+min(...)
+count(...)
+which(...) 
+
+MODEL FUNCTIONS
+estimate(model, (cp|ftp|w'|pmax|x))
+vdottime(VDOT, distance)
+
+MEAN MAX and ZONE FUNCTIONS
+best(...)
+tiz(...)
+
+PMC FUNCTIONS
+lts(p1)
+sts(p1)
+sb(p1)
+ctl
+tsb
+atl
+rr(p1)
+
+SET/UNSET FUNCTIONS
+set(...)
+unset(...)
+isset(p1)
+
+CONFIGURED PARAMETERS
+config(cranklength)
+config(cp)
+config(w)
+config(pmax)
+config(cv)
+config(scv)
+config(height)
+config(weight)
+config(lthr)
+config(maxhr)
+config(rhr)
+config(units)
+const(e)
+const(pi)
+
+DATE RANGE SELECTION
+daterange(start)
+daterange(stop)
+
+RIDE SAMPLE DATA
+
+SECS
+CADENCE
+CADENCED
+HEARTRATE
+HEARTRATED
+DISTANCE
+SPEED
+SPEEDD
+TORQUE
+TORQUED
+POWER
+POWERD
+ALTITUDE
+LON
+LAT
+HEADWIND
+SLOPE
+TEMPERATURE
+BALANCE
+LEFTEFFECTIVENESS
+RIGHTEFFECTIVENESS
+LEFTSMOOTHNESS
+RIGHTSMOOTHNESS
+SMO2
+THB
+RUNVERT
+RUNCADENCE
+RUNCONTACT
+LEFTPCO
+RIGHTPCO
+LEFTPPB
+RIGHTPPB
+LEFTPPE
+RIGHTPPE
+LEFTPPPB
+RIGHTPPPB
+LEFTPPPE
+RIGHTPPPE
+
+RIDE AND INTERVAL METRICS
+
+95%_Heartrate
+aBikeScore
+Activities
+Aerobic_TISS
+Aerobic_TISS
+aIF
+Anaerobic_TISS
+Anaerobic_TISS
+aNP
+aPower_Efficiency_Factor
+aPower_Relative_Intensity
+aPower_Response_Index
+Athlete_Bodyfat
+Athlete_Bodyfat_Percent
+Athlete_Lean_Weight
+Athlete_Weight
+aTSS
+aTSS_per_hour
+Average_aPower
+Average_Cadence
+Average_Core_Temperature
+Average_Heart_Rate
+Average_Left_Peak_Power_Phase_End
+Average_Peak_Left_Power_Phase_Length
+Average_Left_Peak_Power_Phase_Start
+Average_Left_Pedal_Center_Offset
+Average_Left_Pedal_Smoothness
+Average_Left_Power_Phase_End
+Average_Left_Power_Phase_Length
+Average_Left_Power_Phase_Start
+Average_Left_Torque_Effectiveness
+Average_Power
+Average_Power_Variance
+Average_Right_Peak_Power_Phase_End
+Average_Right_Peak_Power_Phase_Length
+Average_Right_Peak_Power_Phase_Start
+Average_Right_Pedal_Center_Offset
+Average_Right_Pedal_Smoothness
+Average_Right_Power_Phase_End
+Average_Right_Power_Phase_Length
+Average_Right_Power_Phase_Start
+Average_Right_Torque_Effectiveness
+Average_SmO2
+Average_Speed
+Average_Temp
+Average_tHb
+Average_Cadence
+Average_Heart_Rate
+Average_Power
+Average_Speed
+aVI
+axPower
+Below_CP_Work
+BikeScore
+BikeScore
+Calendar_Text
+Calories
+Climb_Rating
+color
+CP
+CP_setting
+Daniels_EqP
+Daniels_Points
+Daniels_EqP
+Daniels_Points
+Data
+Date
+Device
+Device_Info
+Distance
+Distance_Swim
+Duration
+EOA
+Efficiency_Factor
+Elevation_Gain
+Elevation_Gain_Carrying
+Elevation_Loss
+Elevation_Gain
+Estimated_VO2MAX
+Fatigue_Index
+File
+GOVSS
+Gradient
+Heartbeats
+HrNp_Ratio
+HrPw_Ratio
+IF
+Interesting
+isRun
+IWF
+Left/Right_Balance
+LNP
+Max_Cadence
+Max_Core_Temperature
+Max_Heartrate
+Max_Power
+Max_Power_Variance
+Max_SmO2
+Max_Speed
+Max_Temp
+Max_tHb
+Max_W'_Expended
+Maximum_W'bal_Match
+Min_Heartrate
+Min_SmO2
+Min_tHb
+Minimum_W'bal
+MMP_Percentage
+Nonzero_Average_Power
+Notes
+NP
+Objective
+Pace
+Pace_Swim
+Pacing_Index
+path
+Pmax
+Power_Percent_of_Max
+Power_Zone
+Recording_Interval
+Relative_Intensity
+Response_Index
+Route
+RPE
+RTP
+Session_RPE
+Skiba_aVI
+Skiba_VI
+Sport
+SRI
+Start_Date
+Start_Time
+STP
+SwimScore
+Tau
+Test
+Time
+Time_Carrying
+Time_Moving
+Time_Moving
+TISS_Aerobicity
+TPace
+TRIMP_Points
+TRIMP_Zonal_Points
+TRIMP(100)_Points
+TriScore
+TSS
+TSS_per_hour
+VAM
+VDOT
+VI
+W'
+W'_Watts
+W'_Work
+W'bal_Matches_>_2KJ
+W'bal_TAU
+Watts_Per_Kilogram
+Watts_RPE_Ratio
+Weight
+Work
+Workbeat_stress
+Workout_Code
+xPace
+xPace_Swim
+xPower
+xPower_Swim
+
+TIME IN ZONES
+
+Heartrate
+H1_Percent_in_Zone
+H1_Time_in_Zone
+H10_Percent_in_Zone
+H10_Time_in_Zone
+H2_Percent_in_Zone
+H2_Time_in_Zone
+H3_Percent_in_Zone
+H3_Time_in_Zone
+H4_Percent_in_Zone
+H4_Time_in_Zone
+H5_Percent_in_Zone
+H5_Time_in_Zone
+H6_Percent_in_Zone
+H6_Time_in_Zone
+H7_Percent_in_Zone
+H7_Time_in_Zone
+H8_Percent_in_Zone
+H8_Time_in_Zone
+H9_Percent_in_Zone
+H9_Time_in_Zone
+
+Power
+L1_Percent_in_Zone
+L1_Sustained_Time
+L1_Time_in_Zone
+L10_Percent_in_Zone
+L10_Sustained_Time
+L10_Time_in_Zone
+L2_Percent_in_Zone
+L2_Sustained_Time
+L2_Time_in_Zone
+L3_Percent_in_Zone
+L3_Sustained_Time
+L3_Time_in_Zone
+L4_Percent_in_Zone
+L4_Sustained_Time
+L4_Time_in_Zone
+L5_Percent_in_Zone
+L5_Sustained_Time
+L5_Time_in_Zone
+L6_Percent_in_Zone
+L6_Sustained_Time
+L6_Time_in_Zone
+L7_Percent_in_Zone
+L7_Sustained_Time
+L7_Time_in_Zone
+L8_Percent_in_Zone
+L8_Sustained_Time
+L8_Time_in_Zone
+L9_Percent_in_Zone
+L9_Sustained_Time
+L9_Time_in_Zone
+
+Pace
+P1_Percent_in_Pace_Zone
+P1_Time_in_Pace_Zone
+P10_Percent_in_Pace_Zone
+P10_Time_in_Pace_Zone
+P2_Percent_in_Pace_Zone
+P2_Time_in_Pace_Zone
+P3_Percent_in_Pace_Zone
+P3_Time_in_Pace_Zone
+P4_Percent_in_Pace_Zone
+P4_Time_in_Pace_Zone
+P5_Percent_in_Pace_Zone
+P5_Time_in_Pace_Zone
+P6_Percent_in_Pace_Zone
+P6_Time_in_Pace_Zone
+P7_Percent_in_Pace_Zone
+P7_Time_in_Pace_Zone
+P8_Percent_in_Pace_Zone
+P8_Time_in_Pace_Zone
+P9_Percent_in_Pace_Zone
+P9_Time_in_Pace_Zone
+
+W'bal
+
+W1_Above_CP_W'bal_Low_Fatigue
+W2_Above_CP_W'bal_Moderate_Fatigue
+W3_Above_CP_W'bal_Heavy_Fatigue
+W4_Above_CP_W'bal_Severe_Fatigue
+W1_W'bal_Low_Fatigue
+W2_W'bal_Moderate_Fatigue
+W3_W'bal_Heavy_Fatigue
+W4_W'bal_Heavy_Fatigue
+W1_W'bal_Work_Low_Fatigue
+W2_W'bal_Work_Moderate_Fatigue
+W3_W'bal_Work_Heavy_Fatigue
+W4_W'bal_Work_Severe_Fatigue
+
+PEAK DURATION METRICS
+
+1_min_Peak_Pace
+1_min_Peak_Pace_Swim
+1_min_Peak_Power
+1_min_Peak_Power_HR
+1_min_Peak_WPK
+1_sec_Peak_Power
+1_sec_Peak_WPK
+10_min_Peak_Pace
+10_min_Peak_Pace_Swim
+10_min_Peak_Power
+10_min_Peak_Power_HR
+10_min_Peak_WPK
+10_sec_Peak_Pace
+10_sec_Peak_Pace_Swim
+10_sec_Peak_Power
+10_sec_Peak_WPK
+15_sec_Peak_Pace
+15_sec_Peak_Pace_Swim
+15_sec_Peak_Power
+15_sec_Peak_WPK
+2_min_Peak_Pace
+2_min_Peak_Pace_Swim
+2_min_Peak_Power
+20_min_Peak_Pace
+20_min_Peak_Pace_Swim
+20_min_Peak_Power
+20_min_Peak_Power_HR
+20_min_Peak_WPK
+20_sec_Peak_Pace
+20_sec_Peak_Pace_Swim
+20_sec_Peak_Power
+20_sec_Peak_WPK
+3_min_Peak_Pace
+3_min_Peak_Pace_Swim
+3_min_Peak_Power
+30_min_Peak_Pace
+30_min_Peak_Pace_Swim
+30_min_Peak_Power
+30_min_Peak_Power_HR
+30_min_Peak_WPK
+30_sec_Peak_Pace
+30_sec_Peak_Pace_Swim
+30_sec_Peak_Power
+30_sec_Peak_WPK
+5_min_Peak_Pace
+5_min_Peak_Pace_Swim
+5_min_Peak_Power
+5_min_Peak_Power_HR
+5_min_Peak_WPK
+5_sec_Peak_Power
+5_sec_Peak_WPK
+60_min_Peak_Pace
+60_min_Peak_Pace_Swim
+60_min_Peak_Power
+60_min_Peak_Power_HR
+60_min_Peak_WPK
+8_min_Peak_Pace
+8_min_Peak_Pace_Swim
+8_min_Peak_Power
+90_min_Peak_Pace
+90_min_Peak_Pace_Swim
+90_min_Peak_Power

doc/user/rest-api.txt

@@ -0,0 +1,33 @@
+http://localhost:12021              Default base URL
+
+/                                   List Athletes
+                                    Returns csv of athletes and core data (dob, sex etc)
+
+/<athlete>                          List Athlete Rides with Metrics and Metadata
+                                    since=yyyy/mm/dd 
+                                    before=yyyy/mm/dd
+                                    metrics=NP,IF,TSS,AveragePower
+                                    metadata=none or all or list (Sport,Workout Code)
+                                    intervals=true
+                                    Returns csv of activities incl. metrics and metadata
+
+/<athlete>/zones                    List Athlete Zone Config
+                                    for=xxx where xxx is one of power, hr, pace, swimpace
+                                    Returns csv of zone config history (e.g. configured CP/W')
+
+
+/<athlete>/activity/<filename>      Fetch activity file
+                                    format=xxx where xxx is one of csv, tcx, json, pwx
+                                    Returns ride file data in the requested format
+
+
+/<athlete>/meanmax/<filename>       Fetch activity Mean Max data
+                                    series=xxx where xxx is one of watts,hr,cad,speed,nm,vam.xPower,NP
+                                    Returns csv of the mean max data for a ride
+
+
+/<athlete>/meanmax/bests            Fetch Mean Max Bests for a Date Range
+                                    since=yyyy/mm/dd
+                                    before=yyyy/mm/dd
+                                    series=xxx where xxx is one of watts,hr,cad,speed,nm,vam.xPower,NP
+                                    Returns an aggregate of the best mean maximal values over the date range