Merge branch 'master' of https://github.com/frc-utilities/qdriverstation

FRC-Utilities · Jan 15, 2017 · 7e11d63 · 7e11d63
2 parents 618ed52 + f1fc6e9
commit 7e11d63
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/lib/LibDS/include/LibDS.h b/lib/LibDS/include/LibDS.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#define LIB_DS_VERSION "2.0.0"
+
 #include "DS_Timer.h"
 #include "DS_Types.h"
 #include "DS_Utils.h"

diff --git a/lib/LibDS/wrappers/Qt/DriverStation.cpp b/lib/LibDS/wrappers/Qt/DriverStation.cpp
@@ -120,6 +120,14 @@ int DriverStation::robotPacketLoss() const
     return 100;
 }
 
+/**
+ * Returns the version of LibDS as a string
+ */
+QString DriverStation::libDSVersion()
+{
+    return QString (LIB_DS_VERSION);
+}
+
 /**
  * Returns the team number used by the LibDS,
  * use the \c setTeamNumber() function to change it

diff --git a/lib/LibDS/wrappers/Qt/DriverStation.h b/lib/LibDS/wrappers/Qt/DriverStation.h
@@ -141,6 +141,9 @@ class DriverStation : public QObject
     Q_PROPERTY (QStringList protocols
                 READ protocols
                 CONSTANT)
+    Q_PROPERTY (QString libDSVersion
+                READ libDSVersion
+                CONSTANT)
     Q_PROPERTY (int fmsPacketLoss
                 READ fmsPacketLoss)
     Q_PROPERTY (int radioPacketLoss
@@ -206,6 +209,8 @@ class DriverStation : public QObject
 #endif
     }
 
+    static QString libDSVersion();
+
     int teamNumber() const;
     int joystickCount() const;
 

diff --git a/lib/LibDS/wrappers/Qt/EventLogger.cpp b/lib/LibDS/wrappers/Qt/EventLogger.cpp
@@ -181,6 +181,7 @@ void DSEventLogger::init()
         /* Get app info */
         QString appN = qApp->applicationName();
         QString appV = qApp->applicationVersion();
+        QString ldsV = DriverStation::libDSVersion();
         QString time = GET_DATE_TIME ("MMM dd yyyy - HH:mm:ss AP");
 
         /* Get dump directoru */
@@ -222,12 +223,14 @@ void DSEventLogger::init()
 
         /* Format app info */
         time.prepend ("Log created on:      ");
+        ldsV.prepend ("LibDS version:       ");
         sysV.prepend ("Operating System:    ");
         appN.prepend ("Application name:    ");
         appV.prepend ("Application version: ");
 
         /* Append app info */
         fprintf (m_dump, "%s\n",   PRINT (time));
+        fprintf (m_dump, "%s\n",   PRINT (ldsV));
         fprintf (m_dump, "%s\n",   PRINT (sysV));
         fprintf (m_dump, "%s\n",   PRINT (appN));
         fprintf (m_dump, "%s\n\n", PRINT (appV));

diff --git a/qml/MainWindow/About.qml b/qml/MainWindow/About.qml
@@ -40,22 +40,22 @@ ColumnLayout {
     }
 
     //
-    // A large label displaying the application name
+    // A large label displaying the application name and version
     //
     Label {
         size: large
-        text: appDspName
         font.bold: true
+        text: appDspName + " " + appVersion
         anchors.horizontalCenter: parent.horizontalCenter
     }
 
     //
-    // A medium label displaying the application version
+    // A medium label displaying the LibDS version
     //
     Label {
         size: medium
-        text: qsTr ("Version") + " " + appVersion
         anchors.horizontalCenter: parent.horizontalCenter
+        text: qsTr ("Using LibDS") + " v" + DS.libDSVersion
     }
 
     //