Development Build DEV-1604

.. update version macros

.gitignore

@@ -11,6 +11,8 @@ Makefile
 .svn
 *.pri
 *.prl
+*.swp
+*.user
 
 # osx noise
 .DS_Store

.travis.yml

@@ -7,9 +7,8 @@ compiler:
 - gcc
 env:
   matrix:
-## Test 4.8 or 5.4.2
   - BRANCH=master QT=qt4 QT_PATH=qt
-  - BRANCH=master QT=qt5 QT_PATH=qt5
+  - BRANCH=master QT=qt5 QT_PATH=qt5 QT_VER=5.5.1
   global:
   - secure: iqYW7f3//ZkMVzeCEarYn0S0DqKjFU9juBh0KF6WTlUsKX902Jtsk7dFoJlNDYBf63HLgV+wW2Hc6MxI9sGiUkom0gY9/To/aeGIJFGEX2sLm/e0Ok3qN521FA0Q/OiCFsD0RC6J+yrHxzI+rf8Z1rujceUsz2KgsrfAjYYv+BY=
   - secure: C6f58PXwvvHeVOjCLbyDRjgyF0tk+bXjCNUDur8VJLhJEGNdnrt+rH+d3azYaX0n348ZnQZ14as4M4rHjN1A/3DRbdUdOS7PQZrkj/n363ck1tvYOG/tzYqkEcVoQyjIJ7ZoTuBXDQry/VJmLxQjM0glTa2upNFHMOMwqZNkF+I=
@@ -18,26 +17,29 @@ env:
   - secure: rb/MKPHEK8yOK5uYpXq2o+MQ7h65ft+c/xE9XmLFk1jLnK0oxe6+KeoSFlQ0n5UwLSsHrytMXVaUHex6EEt0TheXFlohi7BcNFWRWXr+wLucuaPjMnU49VErrSigjJ5VW/rcR7fORmnDwn5y06r3Rer9SC1hImCxf/pqF8hFZps=
   - secure: FXJzm98lwbc1R2eh9/CvVReVRHEPLDm+sCRjiV9HJgeCveIUauLasp9Skamz0c6OKLmkjLY8JERPT491ZgCG8YcQ9x1bM8HGbmRqnn9xSUxINIRzVmyTiLMBoT/ibHHeFjFpyiGfukOAkHwMNNsrSrbaekhiJuekaXo7iTwYQB0=
 before_install:
+## try early just to check, can delete later
 - date
 - brew update
-##- sh travis/install-qt.sh
-- brew install $QT
+- sh travis/install-qt.sh
+##- brew install $QT
 - brew install libical
 - brew install libusb libusb-compat
 - brew install srmio
 - brew install libsamplerate
+- brew tap homebrew/science
+- brew install r
 ## 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++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
 - 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++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
 - CC=clang CXX=clang++ make -j2 qmake_all
 - CC=clang CXX=clang++ sudo make install
 - cd ..
@@ -48,7 +50,7 @@ before_script:
 - 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
+  src/FileIO/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
@@ -75,7 +77,7 @@ before_script:
 - 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|#\(LIBUSB_LIBS    =.*\)|\1 -L/usr/local/lib -lusb -lusb-1.0|" 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
@@ -83,15 +85,17 @@ before_script:
 - 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
+##Issues with c++11 and stdlib on travis and dependencies (e.g. plot3d)
+- sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\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
+- sed -i "" "s/__GC_GOOGLE_CALENDAR_CLIENT_SECRET__/"$GC_GOOGLE_CALENDAR_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_STRAVA_CLIENT_SECRET__/"$GC_STRAVA_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_DROPBOX_CLIENT_SECRET__/"$GC_DROPBOX_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_CYCLINGANALYTICS_CLIENT_SECRET__/"$GC_CYCLINGANALYTICS_CLIENT_SECRET"/" src/Core/Secrets.h
+- sed -i "" "s/__GC_TWITTER_CONSUMER_SECRET__/"$GC_TWITTER_CONSUMER_SECRET"/" src/Core/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++ /usr/local/opt/$QT_PATH/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing"
 - CC=clang CXX=clang++ make qmake_all
 - CC=clang CXX=clang++ make -j4 sub-qwt --silent
 - CC=clang CXX=clang++ make -j4 sub-src

README.md

@@ -8,7 +8,9 @@ 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)
+OSX: [![Build Status](https://travis-ci.org/GoldenCheetah/GoldenCheetah.svg?branch=master)](https://travis-ci.org/GoldenCheetah/GoldenCheetah)
+
+Windows: [![Build status](https://ci.appveyor.com/api/projects/status/i6dwn4m8oyu52ihi?svg=true)](https://ci.appveyor.com/project/Joern-R/goldencheetah-knhd8)
 
 [![Coverity Status](https://scan.coverity.com/projects/7503/badge.svg)](https://scan.coverity.com/projects/goldencheetah-goldencheetah)
 

appveyor.yml

@@ -0,0 +1,32 @@
+version: ci.{build}
+image: Visual Studio 2015
+clone_depth: 1
+init:
+# Setup QT 5.6.0 - 64Bit
+
+- set QTDIR=C:\Qt\5.6\msvc2015_64
+- set PATH=%QTDIR%\bin;%PATH%
+
+# Setup MSVC - VS 2015
+
+- CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+
+# Get the libraries
+
+- ps: Start-FileDownload 'https://github.com/Joern-R/gc-ci-libs/releases/download/0.0.1/gc-ci-libs.zip' -Filename 'c:/gc-ci-libs.zip'
+- 7z x c:/gc-ci-libs.zip -oC:\libs
+
+install:
+- choco install winflexbison
+- copy qwt\qwtconfig.pri.in qwt\qwtconfig.pri
+- copy c:\libs\gcconfig64-Release.appveyor.pri src\gcconfig.pri
+
+build_script:
+- qmake.exe build.pro -r -spec win32-msvc2015
+- nmake
+
+#notifications:
+#- provider: GitHubPullRequest
+#  on_build_success: true
+#  on_build_failure: true
+#  on_build_status_changed: true

deprecated/RGoldenCheetah.c

@@ -0,0 +1,80 @@
+// R API is C
+#include <R.h>
+#include <Rinternals.h>
+#include <R_ext/Rdynload.h>
+
+// an array of pointers to the actual functions
+// in the native GC code -- these are initialised
+// once the shared library has been loaded via
+// a call to initialiseFunctions()
+//
+// for this test we only have one function
+// GC.display() to make sure the concept works
+static SEXP (*fn[6])();
+
+// if we haven't been initialised don't even try
+// to dereference the function pointers !!
+static int initialised = 0;
+
+// stub methods, call the GC routines if they've been initialised
+SEXP GCdisplay() { if (initialised) return fn[0](); else return NULL; }
+SEXP GCathlete() { if (initialised) return fn[1](); else return NULL; }
+SEXP GCathleteHome() { if (initialised) return fn[2](); else return NULL; }
+SEXP GCactivities() { if (initialised) return fn[3](); else return NULL; }
+SEXP GCactivity() { if (initialised) return fn[4](); else return NULL; }
+SEXP GCmetrics() { if (initialised) return fn[5](); else return NULL; }
+
+SEXP GCinitialiseFunctions(SEXP (*functions[1])())
+{
+    //fprintf(stderr, "RGoldenCheetah initialise functions\n");
+
+    // initialise all the function pointers
+    for(int i=0; i<6; i++) fn[i] = functions[i];
+    initialised = 1;
+
+    return 0;
+}
+
+// this function is called by R when the dynamic library
+// is loaded via the R command > dyn.load("RGoldenCheetah.so")
+// and is expected to register all the C functions to make
+// available via the C interface
+//
+// By return, a number of functions will be created that provide
+// wrappers in R (i.e. they call with the .C(xxx) notation and
+//
+// We so this to avoid using Rcpp / RInside which are not
+// compatible with MSVC
+void
+R_init_RGoldenCheetah(DllInfo *info)
+{
+    //fprintf(stderr, "RGoldenCheetah init is called!\n");
+
+    // initialise the parameter table
+    R_CMethodDef cMethods[] = {
+        { "GCinitialiseFunctions", (DL_FUNC) &GCinitialiseFunctions, 0 },
+        { "GC.display", (DL_FUNC) &GCdisplay, 0 },
+        { "GC.athlete", (DL_FUNC) &GCathlete, 0 },
+        { "GC.athlete.home", (DL_FUNC) &GCathleteHome, 0 },
+        { "GC.activities", (DL_FUNC) &GCactivities, 0 },
+        { "GC.activity", (DL_FUNC) &GCactivity, 0 },
+        { "GC.metrics", (DL_FUNC) &GCmetrics, 0 },
+        { NULL, NULL, 0 }
+    };
+    R_CallMethodDef callMethods[] = {
+        { "GCinitialiseFunctions", (DL_FUNC) &GCinitialiseFunctions, 0 },
+        { "GC.display", (DL_FUNC) &GCdisplay, 0 },
+        { "GC.athlete", (DL_FUNC) &GCathlete, 0 },
+        { "GC.athlete.home", (DL_FUNC) &GCathleteHome, 0 },
+        { "GC.activities", (DL_FUNC) &GCactivities, 0 },
+        { "GC.activity", (DL_FUNC) &GCactivity, 0 },
+        { "GC.metrics", (DL_FUNC) &GCmetrics, 0 },
+        { NULL, NULL, 0 }
+    };
+
+    // set them up
+    R_registerRoutines(info, cMethods, callMethods, NULL, NULL);
+
+    // make the initialiseFunctions callable from C
+    R_RegisterCCallable("RGoldenCheetah", "GCinitialiseFunctions", (DL_FUNC)&GCinitialiseFunctions);
+}

qtsolutions/common.pri

@@ -1,6 +1,4 @@
-exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsoap-uselib
 TEMPLATE += fakelib
 QTSOAP_LIBNAME = $$qtLibraryTarget(QtSolutions_SOAP-2.7)
 TEMPLATE -= fakelib
 QTSOAP_LIBDIR = $$PWD/lib
-unix:qtsoap-uselib:!qtsoap-buildlib:QMAKE_RPATHDIR += $$QTSOAP_LIBDIR

qwt/src/src.pri

@@ -77,7 +77,6 @@ SOURCES += \
     qwt_scale_div.cpp \
     qwt_scale_draw.cpp \
     qwt_scale_map.cpp \
-    qwt_scale_map_table.h \
     qwt_spline.cpp \
     qwt_scale_engine.cpp \
     qwt_symbol.cpp \

qwt/src/src.pro

@@ -19,7 +19,7 @@ QWT_OUT_ROOT = $${OUT_PWD}/..
 TEMPLATE          = lib
 TARGET            = $$qwtLibraryTarget(qwt)
 
-DESTDIR           = $${QWT_OUT_ROOT}/lib
+DESTDIR           = $${PWD}/../lib
 
 contains(QWT_CONFIG, QwtDll) {
 

qxt/src/qxtspanslider.cpp

@@ -29,6 +29,7 @@
 #include <QApplication>
 #include <QStylePainter>
 #include <QStyleOptionSlider>
+#include <QTime>
 
 QxtSpanSliderPrivate::QxtSpanSliderPrivate() :
         lower(0),
@@ -622,6 +623,16 @@ void QxtSpanSlider::mousePressEvent(QMouseEvent* event)
  */
 void QxtSpanSlider::mouseMoveEvent(QMouseEvent* event)
 {
+    // hack for uncompressed mouse events
+#if defined(Q_OS_LINUX) && (QT_VERSION > 0x050000) && (QT_VERSION < 0x050600)
+    static QTime p;
+    if (p.elapsed() > 0 && p.elapsed() < 100) {
+        event->ignore();
+        return;
+    }
+    p.start();
+#endif
+
     if (qxt_d().lowerPressed != QStyle::SC_SliderHandle && qxt_d().upperPressed != QStyle::SC_SliderHandle)
     {
         event->ignore();

src/.gitignore

@@ -6,6 +6,13 @@ Info.plist
 *.xcodeproj
 gcconfig.pri
 
+# QtCreator
+src.pro.user
+*.autosave
+
+# MSVC2015
+*.opt
+
 # old skool
 .svn
 

src/ANT/ANT.h

@@ -108,9 +108,9 @@ typedef struct ant_sensor_type {
 static inline double get_timestamp( void ) {
   struct timeval tv;
 #ifdef Q_CC_MSVC
-  QTime now = QTime::currentTime();
-  tv.tv_sec = now.second();
-  tv.tv_usec = now.msec();
+  QDateTime now = QDateTime::currentDateTime();
+  tv.tv_sec = now.toMSecsSinceEpoch() / 1000;
+  tv.tv_usec = (now.toMSecsSinceEpoch() % 1000) * 1000;
 #else
   gettimeofday(&tv, NULL);
 #endif
@@ -119,9 +119,9 @@ static inline double get_timestamp( void ) {
 
 static inline void get_timeofday(struct timeval* tv) {
 #ifdef Q_CC_MSVC
-  QTime now = QTime::currentTime();
-  tv->tv_sec = now.second();
-  tv->tv_usec = now.msec();
+  QDateTime now = QDateTime::currentDateTime();
+  tv->tv_sec = now.toMSecsSinceEpoch() / 1000;
+  tv->tv_usec = (now.toMSecsSinceEpoch() % 1000) * 1000;
 #else
   gettimeofday(tv, NULL);
 #endif
@@ -306,6 +306,7 @@ struct setChannelAtom {
 
 // ant+ fitness equipment profile data pages
 #define FITNESS_EQUIPMENT_GENERAL_PAGE              0x10
+#define FITNESS_EQUIPMENT_STATIONARY_SPECIFIC_PAGE  0x15
 #define FITNESS_EQUIPMENT_TRAINER_SPECIFIC_PAGE     0x19
 #define FITNESS_EQUIPMENT_TRAINER_TORQUE_PAGE       0x20
 #define FITNESS_EQUIPMENT_TRAINER_CAPABILITIES_PAGE 0x36

src/ANT/ANTChannel.cpp

@@ -343,6 +343,8 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
         product_id=MANUFACTURER_MODEL_NUMBER_ID(message);
         checkCinqo();
 
+    } else if (MESSAGE_IS_BATTERY_VOLTAGE(message)) {
+        // todo: push battery status up to train view when we have a means to display notifications
     }
     else {
         telemetry = true;
@@ -799,6 +801,16 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                    // Note : fecMaxResistance information available but not used
                    fecCapabilities = antMessage.fecCapabilities;
                    qDebug() << "Capabilities received from ANT FEC Device:" << fecCapabilities;
+               } else if (antMessage.data_page == FITNESS_EQUIPMENT_STATIONARY_SPECIFIC_PAGE)
+               {
+                   if (antMessage.fecInstantPower != 0xFFFF)
+                       is_alt ? parent->setAltWatts(antMessage.fecInstantPower) : parent->setWatts(antMessage.fecInstantPower);
+                   if (antMessage.fecCadence != 0xFF)
+                       parent->setSecondaryCadence(antMessage.fecCadence);
+                   parent->setTrainerStatusAvailable(true);
+
+                   parent->setTrainerReady(antMessage.fecState==FITNESS_EQUIPMENT_READY);
+                   parent->setTrainerRunning(antMessage.fecState==FITNESS_EQUIPMENT_IN_USE);
                }
                break;
            }