From 9f859234fba6087e87e2d31ac9f72fcaf2de4c82 Mon Sep 17 00:00:00 2001 From: Patrick Plenefisch Date: Sun, 27 Sep 2015 14:09:17 -0400 Subject: [PATCH] Update for latest image, not sure about ctre folder so leaving Change-Id: If2218df082bca93d25b88088696d6c2897732efd Adding FRC Local new mdns name Change-Id: I53d206879663b96009ba3a12de161b7a425ffd10 Adding rpath for new libstdc++ Change-Id: I0c022efb0b15f094d153b44f60215ca00d5f1924 --- .../first/wpilib/plugins/core/WPILibCore.java | 2 +- .../resources/templates/.cproject | 2 +- .../plugins/cpp/launching/RSEUtils.java | 2 +- .../src/main/resources/cpp-zip/ant/build.xml | 2 +- .../src/main/resources/java-zip/ant/build.xml | 2 +- hal/include/HAL/CAN.hpp | 2 +- hal/include/HAL/CanTalonSRX.h | 2 +- hal/lib/Athena/Analog.cpp | 4 +- hal/lib/Athena/Digital.cpp | 2 +- .../RoboRIO_FRC_ChipObject_Aliases.h | 2 +- .../fpgainterfacecapi/NiFpga.h | 25 ++- .../nInterfaceGlobals.h | 8 +- .../nRoboRIO_FPGANamespace/tAI.h | 8 +- .../nRoboRIO_FPGANamespace/tAO.h | 8 +- .../nRoboRIO_FPGANamespace/tAccel.h | 8 +- .../nRoboRIO_FPGANamespace/tAccumulator.h | 8 +- .../nRoboRIO_FPGANamespace/tAlarm.h | 8 +- .../nRoboRIO_FPGANamespace/tAnalogTrigger.h | 8 +- .../nRoboRIO_FPGANamespace/tBIST.h | 8 +- .../nRoboRIO_FPGANamespace/tCounter.h | 8 +- .../nRoboRIO_FPGANamespace/tDIO.h | 8 +- .../nRoboRIO_FPGANamespace/tDMA.h | 8 +- .../nRoboRIO_FPGANamespace/tEncoder.h | 8 +- .../nRoboRIO_FPGANamespace/tGlobal.h | 8 +- .../nRoboRIO_FPGANamespace/tInterrupt.h | 8 +- .../nRoboRIO_FPGANamespace/tPWM.h | 8 +- .../nRoboRIO_FPGANamespace/tPower.h | 8 +- .../nRoboRIO_FPGANamespace/tRelay.h | 8 +- .../nRoboRIO_FPGANamespace/tSPI.h | 8 +- .../nRoboRIO_FPGANamespace/tSysWatchdog.h | 8 +- .../AICalibration.h | 0 .../CANInterfacePlugin.h | 0 .../CANSessionMux.h | 6 + .../Athena/FRC_NetworkCommunication/FRCComm.h | 163 ++++++++++++++++++ .../LoadOut.h | 11 +- .../UsageReporting.h | 5 +- hal/lib/Athena/HALAthena.cpp | 8 +- hal/lib/Athena/Solenoid.cpp | 2 +- hal/lib/Athena/ctre/CanTalonSRX.cpp | 2 +- hal/lib/Athena/ctre/CtreCanNode.cpp | 2 +- hal/lib/Athena/ctre/PCM.cpp | 2 +- hal/lib/Athena/ctre/PDP.cpp | 2 +- hal/lib/Athena/frccansae/CANDeviceInterface.h | 146 ++++++++++++++++ hal/lib/Athena/i2clib/i2clib/environs.h | 66 ------- .../FRCComm.h | 0 hal/lib/Shared/HAL.cpp | 2 +- ni-libraries/libFRC_NetworkCommunication.so | 2 +- ni-libraries/libFRC_NetworkCommunication.so.1 | 2 - .../libFRC_NetworkCommunication.so.1.5 | 2 - .../libFRC_NetworkCommunication.so.1.5.0 | Bin 499832 -> 0 bytes .../libFRC_NetworkCommunication.so.16 | 2 + .../libFRC_NetworkCommunication.so.16.0 | 2 + .../libFRC_NetworkCommunication.so.16.0.0 | Bin 0 -> 527072 bytes ni-libraries/libFRC_NetworkCommunicationLV.so | 2 +- .../libFRC_NetworkCommunicationLV.so.1 | 2 - .../libFRC_NetworkCommunicationLV.so.1.5 | 2 - .../libFRC_NetworkCommunicationLV.so.1.5.0 | Bin 4584 -> 0 bytes .../libFRC_NetworkCommunicationLV.so.16 | 2 + .../libFRC_NetworkCommunicationLV.so.16.0 | 2 + .../libFRC_NetworkCommunicationLV.so.16.0.0 | Bin 0 -> 4576 bytes ni-libraries/libNiFpga.so | 2 +- ni-libraries/libNiFpga.so.14.0.0 | Bin 393768 -> 0 bytes .../{libNiFpga.so.14 => libNiFpga.so.15} | 2 +- .../{libNiFpga.so.14.0 => libNiFpga.so.15.0} | 2 +- ni-libraries/libNiFpga.so.15.0.0 | Bin 0 -> 487460 bytes ni-libraries/libNiFpgaLv.so | 2 +- ni-libraries/libNiFpgaLv.so.14.0 | 2 - ni-libraries/libNiFpgaLv.so.14.0.0 | Bin 73228 -> 0 bytes .../{libNiRioSrv.so.14 => libNiFpgaLv.so.15} | 2 +- ni-libraries/libNiFpgaLv.so.15.0 | 2 + ni-libraries/libNiFpgaLv.so.15.0.0 | Bin 0 -> 76720 bytes ni-libraries/libNiRioSrv.so | 2 +- ni-libraries/libNiRioSrv.so.14.0 | 2 - ni-libraries/libNiRioSrv.so.14.0.0 | Bin 842316 -> 0 bytes .../{libNiFpgaLv.so.14 => libNiRioSrv.so.15} | 2 +- ni-libraries/libNiRioSrv.so.15.0 | 2 + ni-libraries/libNiRioSrv.so.15.0.0 | Bin 0 -> 981268 bytes ni-libraries/libRoboRIO_FRC_ChipObject.so | 2 +- ni-libraries/libRoboRIO_FRC_ChipObject.so.1 | 2 - ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2 | 2 - .../libRoboRIO_FRC_ChipObject.so.1.2.0 | Bin 381560 -> 0 bytes ni-libraries/libRoboRIO_FRC_ChipObject.so.16 | 2 + .../libRoboRIO_FRC_ChipObject.so.16.0 | 2 + .../libRoboRIO_FRC_ChipObject.so.16.0.0 | Bin 0 -> 383904 bytes ni-libraries/libi2c.so.1.0.0 | Bin 4076 -> 4076 bytes ni-libraries/libni_emb.so | 2 +- ni-libraries/libni_emb.so.7.0.0 | Bin 189204 -> 0 bytes .../{libni_emb.so.7 => libni_emb.so.8} | 2 +- .../{libni_emb.so.7.0 => libni_emb.so.8.0} | 2 +- ni-libraries/libni_emb.so.8.0.0 | Bin 0 -> 151720 bytes ni-libraries/libni_rtlog.so.2 | 2 +- ni-libraries/libni_rtlog.so.2.3 | 2 - ni-libraries/libni_rtlog.so.2.3.0 | Bin 9992 -> 0 bytes ni-libraries/libni_rtlog.so.2.4 | 2 + ni-libraries/libni_rtlog.so.2.4.0 | Bin 0 -> 9996 bytes ni-libraries/libniimaqdx.so | 2 +- ni-libraries/libniimaqdx.so.14 | 2 - ni-libraries/libniimaqdx.so.14.0 | 2 - ni-libraries/libniimaqdx.so.14.0.0 | Bin 2215400 -> 0 bytes ni-libraries/libniimaqdx.so.15 | 2 + ni-libraries/libniimaqdx.so.15.0 | 2 + ni-libraries/libniimaqdx.so.15.0.0 | Bin 0 -> 1858140 bytes ni-libraries/libnipalu.so | 2 + ni-libraries/libnipalu.so.15 | 2 + ni-libraries/libnipalu.so.15.0 | 2 + ni-libraries/libnipalu.so.15.0.0 | Bin 0 -> 579920 bytes ni-libraries/libnirio_emb_can.so | 2 +- ni-libraries/libnirio_emb_can.so.14 | 2 - ni-libraries/libnirio_emb_can.so.14.0 | 2 - ni-libraries/libnirio_emb_can.so.14.0.0 | Bin 61780 -> 0 bytes ni-libraries/libnirio_emb_can.so.15 | 2 + ni-libraries/libnirio_emb_can.so.15.0 | 2 + ni-libraries/libnirio_emb_can.so.15.0.0 | Bin 0 -> 70628 bytes ni-libraries/libnivision.so | 2 +- ni-libraries/libnivision.so.14 | 2 - ni-libraries/libnivision.so.14.0 | 2 - ni-libraries/libnivision.so.15 | 2 + ni-libraries/libnivision.so.15.0 | 2 + ...vision.so.14.0.0 => libnivision.so.15.0.0} | Bin 9654528 -> 10778052 bytes ni-libraries/libnivissvc.so | 2 +- ni-libraries/libnivissvc.so.14 | 2 - ni-libraries/libnivissvc.so.14.0 | 2 - ni-libraries/libnivissvc.so.14.0.0 | Bin 2806736 -> 0 bytes ni-libraries/libnivissvc.so.15 | 2 + ni-libraries/libnivissvc.so.15.0 | 2 + ni-libraries/libnivissvc.so.15.0.0 | Bin 0 -> 2923284 bytes ni-libraries/libvisa.so | Bin 196396 -> 196396 bytes test-scripts/config.sh | 4 +- wpilibc/build.gradle | 2 +- .../wpilibC++IntegrationTests/CMakeLists.txt | 2 +- wpilibj/build.gradle | 1 + wpilibj/wpilibJavaJNI/CMakeLists.txt | 1 + wpilibj/wpilibJavaJNI/lib/CANJNI.cpp | 2 +- 133 files changed, 505 insertions(+), 233 deletions(-) rename hal/lib/Athena/{NetworkCommunication => FRC_NetworkCommunication}/AICalibration.h (100%) rename hal/lib/Athena/{NetworkCommunication => FRC_NetworkCommunication}/CANInterfacePlugin.h (100%) rename hal/lib/Athena/{NetworkCommunication => FRC_NetworkCommunication}/CANSessionMux.h (94%) create mode 100644 hal/lib/Athena/FRC_NetworkCommunication/FRCComm.h rename hal/lib/Athena/{NetworkCommunication => FRC_NetworkCommunication}/LoadOut.h (83%) rename hal/lib/Athena/{NetworkCommunication => FRC_NetworkCommunication}/UsageReporting.h (95%) create mode 100644 hal/lib/Athena/frccansae/CANDeviceInterface.h delete mode 100644 hal/lib/Athena/i2clib/i2clib/environs.h rename hal/lib/Shared/{NetworkCommunication => FRC_NetworkCommunication}/FRCComm.h (100%) delete mode 100644 ni-libraries/libFRC_NetworkCommunication.so.1 delete mode 100644 ni-libraries/libFRC_NetworkCommunication.so.1.5 delete mode 100755 ni-libraries/libFRC_NetworkCommunication.so.1.5.0 create mode 100644 ni-libraries/libFRC_NetworkCommunication.so.16 create mode 100644 ni-libraries/libFRC_NetworkCommunication.so.16.0 create mode 100755 ni-libraries/libFRC_NetworkCommunication.so.16.0.0 delete mode 100644 ni-libraries/libFRC_NetworkCommunicationLV.so.1 delete mode 100644 ni-libraries/libFRC_NetworkCommunicationLV.so.1.5 delete mode 100755 ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 create mode 100644 ni-libraries/libFRC_NetworkCommunicationLV.so.16 create mode 100644 ni-libraries/libFRC_NetworkCommunicationLV.so.16.0 create mode 100755 ni-libraries/libFRC_NetworkCommunicationLV.so.16.0.0 delete mode 100755 ni-libraries/libNiFpga.so.14.0.0 rename ni-libraries/{libNiFpga.so.14 => libNiFpga.so.15} (52%) rename ni-libraries/{libNiFpga.so.14.0 => libNiFpga.so.15.0} (50%) create mode 100755 ni-libraries/libNiFpga.so.15.0.0 delete mode 100644 ni-libraries/libNiFpgaLv.so.14.0 delete mode 100755 ni-libraries/libNiFpgaLv.so.14.0.0 rename ni-libraries/{libNiRioSrv.so.14 => libNiFpgaLv.so.15} (50%) create mode 100644 ni-libraries/libNiFpgaLv.so.15.0 create mode 100755 ni-libraries/libNiFpgaLv.so.15.0.0 delete mode 100644 ni-libraries/libNiRioSrv.so.14.0 delete mode 100755 ni-libraries/libNiRioSrv.so.14.0.0 rename ni-libraries/{libNiFpgaLv.so.14 => libNiRioSrv.so.15} (50%) create mode 100644 ni-libraries/libNiRioSrv.so.15.0 create mode 100755 ni-libraries/libNiRioSrv.so.15.0.0 delete mode 100644 ni-libraries/libRoboRIO_FRC_ChipObject.so.1 delete mode 100644 ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2 delete mode 100755 ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 create mode 100644 ni-libraries/libRoboRIO_FRC_ChipObject.so.16 create mode 100644 ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0 create mode 100755 ni-libraries/libRoboRIO_FRC_ChipObject.so.16.0.0 delete mode 100755 ni-libraries/libni_emb.so.7.0.0 rename ni-libraries/{libni_emb.so.7 => libni_emb.so.8} (53%) rename ni-libraries/{libni_emb.so.7.0 => libni_emb.so.8.0} (51%) create mode 100755 ni-libraries/libni_emb.so.8.0.0 delete mode 100644 ni-libraries/libni_rtlog.so.2.3 delete mode 100755 ni-libraries/libni_rtlog.so.2.3.0 create mode 100644 ni-libraries/libni_rtlog.so.2.4 create mode 100755 ni-libraries/libni_rtlog.so.2.4.0 delete mode 100644 ni-libraries/libniimaqdx.so.14 delete mode 100644 ni-libraries/libniimaqdx.so.14.0 delete mode 100755 ni-libraries/libniimaqdx.so.14.0.0 create mode 100644 ni-libraries/libniimaqdx.so.15 create mode 100644 ni-libraries/libniimaqdx.so.15.0 create mode 100755 ni-libraries/libniimaqdx.so.15.0.0 create mode 100644 ni-libraries/libnipalu.so create mode 100644 ni-libraries/libnipalu.so.15 create mode 100644 ni-libraries/libnipalu.so.15.0 create mode 100644 ni-libraries/libnipalu.so.15.0.0 delete mode 100644 ni-libraries/libnirio_emb_can.so.14 delete mode 100644 ni-libraries/libnirio_emb_can.so.14.0 delete mode 100755 ni-libraries/libnirio_emb_can.so.14.0.0 create mode 100644 ni-libraries/libnirio_emb_can.so.15 create mode 100644 ni-libraries/libnirio_emb_can.so.15.0 create mode 100755 ni-libraries/libnirio_emb_can.so.15.0.0 delete mode 100644 ni-libraries/libnivision.so.14 delete mode 100644 ni-libraries/libnivision.so.14.0 create mode 100644 ni-libraries/libnivision.so.15 create mode 100644 ni-libraries/libnivision.so.15.0 rename ni-libraries/{libnivision.so.14.0.0 => libnivision.so.15.0.0} (51%) delete mode 100644 ni-libraries/libnivissvc.so.14 delete mode 100644 ni-libraries/libnivissvc.so.14.0 delete mode 100755 ni-libraries/libnivissvc.so.14.0.0 create mode 100644 ni-libraries/libnivissvc.so.15 create mode 100644 ni-libraries/libnivissvc.so.15.0 create mode 100755 ni-libraries/libnivissvc.so.15.0.0 diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java index 1b168c94d9..129dec5e8e 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java @@ -125,7 +125,7 @@ public class WPILibCore extends AbstractUIPlugin { return target; else { int teamNumber = getTeamNumber(project); - return "roborio-" + teamNumber + ".local"; + return "roborio-" + teamNumber + "-FRC.local"; } } diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject index 726e9639c5..7d7a3a1f5b 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject @@ -47,7 +47,7 @@ -