From cdbe80315f69984599b2c2fd2550650fb7b49222 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <fredric@fsilberberg.com>
Date: Mon, 1 Dec 2014 19:31:02 -0500
Subject: [PATCH] Image v19 This updates the hal headers and ni libraries for
 image v19. There were very few changes this time around, only some network
 communications stuff. Also updated the minimum version number in the build
 properties to the new image version

Change-Id: Ic8cb384b92c54d938dec36df34fc609626b4cd5d
---
 .../resources/cpp-zip/ant/build.properties    |   2 +-
 .../resources/java-zip/ant/build.properties   |   2 +-
 .../NetworkCommunication/CANSessionMux.h      |   1 +
 hal/lib/Athena/NetworkCommunication/FRCComm.h |   8 ++++++++
 .../libFRC_NetworkCommunication.so.1.5.0      | Bin 499840 -> 499840 bytes
 .../libFRC_NetworkCommunicationLV.so.1.5.0    | Bin 4612 -> 4612 bytes
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
index a7705e9826..45d8ec139e 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
@@ -8,7 +8,7 @@ command.dir=/home/lvuser/
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
 wpilib.lib=${wpilib}/lib
-roboRIOAllowedImages=18
+roboRIOAllowedImages=19
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
index 34ed687341..455887cf30 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
@@ -20,7 +20,7 @@ networktables.sources=${wpilib.lib}/NetworkTables-sources.jar
 #jnaerator.jar=${wpilib.lib}/jnaerator-runtime.jar
 #classpath=${wpilib.jar}:${networktables.jar}:${jna.jar}:${jnaerator.jar}
 classpath=${wpilib.jar}:${networktables.jar}
-roboRIOAllowedImages=18
+roboRIOAllowedImages=19
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/hal/lib/Athena/NetworkCommunication/CANSessionMux.h b/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
index 81f63c579f..3f8a6f192f 100644
--- a/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
+++ b/hal/lib/Athena/NetworkCommunication/CANSessionMux.h
@@ -26,6 +26,7 @@
 #define WARN_CANSessionMux_NoToken         44087
 #define ERR_CANSessionMux_NotAllowed      -44088
 #define ERR_CANSessionMux_NotInitialized  -44089
+#define ERR_CANSessionMux_SessionOverrun   44050
 
 struct tCANStreamMessage{
 	uint32_t messageID;
diff --git a/hal/lib/Athena/NetworkCommunication/FRCComm.h b/hal/lib/Athena/NetworkCommunication/FRCComm.h
index 87e3ee5291..d7081365a5 100644
--- a/hal/lib/Athena/NetworkCommunication/FRCComm.h
+++ b/hal/lib/Athena/NetworkCommunication/FRCComm.h
@@ -33,6 +33,7 @@
 #endif
 
 #define ERR_FRCSystem_NetCommNotResponding -44049
+#define ERR_FRCSystem_NoDSConnection -44018
 
 enum AllianceStationID_t {
 	kAllianceStationID_red1,
@@ -43,6 +44,13 @@ enum AllianceStationID_t {
 	kAllianceStationID_blue3,
 };
 
+enum MatchType_t {
+	kMatchType_none,
+	kMatchType_practice,
+	kMatchType_qualification,
+	kMatchType_elimination,
+};
+
 struct ControlWord_t {
 #ifndef __vxworks
 	uint32_t enabled : 1;
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
index 02fecb81ff5d210756940eeb689ca62df6db3fed..121bc7ee2e4f1a59dcb332033cc2eed6926d5c5f 100755
GIT binary patch
delta 93
zcmZoTDAxc)EsQNpEzB(}Ev#GEjJlaDOtzbJvwg7xGNx;tVv`5a-ly0sKy)jR&uwI;
pU}#`vVrFG(xPAR8wo4cIEKKxLQj<#485m@b9#`AmKb!p{3jl~U9?t*(

delta 93
zcmZoTDAxc)EsQNpEzB(}Ev#GEjJlc3&9|F$vwg7xGNx;tVv`5a-ly0sKy)jR&uwU;
pU}$J%XkcYxw0-?4wo4cI%+2*uQj<#485kyc=w932Kb!p{3jm1Z9^3!`

diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
index c9a00e3c496cdc9f7100018a39b87a44a91f32a5..3e6a5030d4ad851def9d1e38c159acd1e29167d9 100755
GIT binary patch
delta 59
zcmZosX;IlA!^LD_GFgsG9z@x5S%Ii(E?Hh9GX+BfD-$y-Q$rnv$%@QUoA+~7Fac#Z
JTk@V}0RWrv4jBLd

delta 59
zcmZosX;IlA!^LE7K3R@S9z@x5S%Ii(E?Hhf69q#<D?<Y-6C)jk$%@QUoA+~7Fac#Z
JTk@V}0RWro4i*3a