Updated to Bipolar 0.4; disabled broken route upload.

profanum429 · Jan 10, 2015 · d17258a · d17258a
1 parent c647ad2
commit d17258a
Show file tree

Hide file tree

Showing 12 changed files with 269 additions and 43 deletions.
diff --git a/src/bipolar/polar/v2/trainingsession.cpp b/src/bipolar/polar/v2/trainingsession.cpp
diff --git a/src/bipolar/polar/v2/trainingsession.h b/src/bipolar/polar/v2/trainingsession.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 
@@ -52,8 +52,9 @@ class TrainingSession : public QObject {
     Q_DECLARE_FLAGS(OutputFormats, OutputFormat)
 
     enum GpxOption {
-        CluetrustGpxExtension     = 0x0100,
-        GarminTrackPointExtension = 0x0200,
+        CluetrustGpxDataExtension   = 0x0100,
+        GarminAccelerationExtension = 0x0200,
+        GarminTrackPointExtension   = 0x0400,
     };
     Q_DECLARE_FLAGS(GpxOptions, GpxOption)
 
@@ -66,7 +67,7 @@ class TrainingSession : public QObject {
     enum TcxOption {
         ForceTcxUTC = 0x0001,
         GarminActivityExtension = 0x0100,
-      //GarminCourseExtension   = 0x0200, //< Needs power support.
+        GarminCourseExtension   = 0x0200,
     };
     Q_DECLARE_FLAGS(TcxOptions, TcxOption)
 

diff --git a/src/bipolar/protobuf/fixnum.cpp b/src/bipolar/protobuf/fixnum.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/fixnum.h b/src/bipolar/protobuf/fixnum.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/message.cpp b/src/bipolar/protobuf/message.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/message.h b/src/bipolar/protobuf/message.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/types.cpp b/src/bipolar/protobuf/types.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/types.h b/src/bipolar/protobuf/types.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/varint.cpp b/src/bipolar/protobuf/varint.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/bipolar/protobuf/varint.h b/src/bipolar/protobuf/varint.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2014 Paul Colby
+    Copyright 2014-2015 Paul Colby
 
     This file is part of Bipolar.
 

diff --git a/src/usb/v800usb.cpp b/src/usb/v800usb.cpp
@@ -197,11 +197,9 @@ void V800usb::upload_route(QString route)
 
     new_route_num = 0;
 
-    /*
     put_v800_dir(tr("/U/0/ROUTES/"));
     put_v800_dir(QString(tr("/U/0/ROUTES/%1/")).arg(new_route_num));
     put_v800_data(QString(tr("%1/PROUTE.BPB")).arg(route), QString(tr("/U/0/ROUTES/%1/PROUTE.BPB")).arg(new_route_num));
-    */
 
     remove_v800_dir(tr("/U/0/FAV"));
     put_v800_dir(tr("/U/0/FAV/"));

diff --git a/src/widgets/v800main.cpp b/src/widgets/v800main.cpp
@@ -361,10 +361,12 @@ void V800Main::on_fsBtn_clicked()
 
 void V800Main::on_uploadBtn_clicked()
 {
+    /*
     QString route = QFileDialog::getExistingDirectory(this, tr("Open Route"), QDir::homePath(), QFileDialog::ShowDirsOnly);
 
     if(!route.isEmpty())
         emit upload_route(route);
+    */
 }
 
 void V800Main::on_dirSelectBtn_clicked()