Skip to content

Commit

Permalink
Update dependencies (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterJohnson
PeterJohnson committed Jan 3, 2019
1 parent c6a2a7a commit d0a2bf8
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion deps/01-download.sh
View file
Expand Up @@ -5,7 +5,7 @@ pushd 01-download

# raspbian toolchain
wget -nc -nv \
https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.1.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz
https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.2.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz

# openjdk binaries
wget -nc -nv \
Expand Down
1 change: 0 additions & 1 deletion deps/02-extract.sh
View file
Expand Up @@ -36,7 +36,6 @@ sed -i -e 's/javac sourcepath/javac target="1.8" source="1.8" sourcepath/' openc

# toolchain setup for opencv and wpilib
cp ../arm-pi-gnueabihf.toolchain.cmake .
cp -R ../thirdparty-opencv/jni .
tar xzf ../01-download/jdk_11*.tar.gz jdk/include
mkdir -p cmake-modules
cat > cmake-modules/FindJNI.cmake << EOF
Expand Down
2 changes: 1 addition & 1 deletion deps/allwpilib
Submodule allwpilib updated 89 files
+6 −0 cscore/examples/enum_usb/enum_usb.cpp
+1 −0 cscore/src/main/java/edu/wpi/cscore/CameraServerJNI.java
+7 −0 cscore/src/main/java/edu/wpi/cscore/UsbCamera.java
+10 −1 cscore/src/main/java/edu/wpi/cscore/UsbCameraInfo.java
+38 −0 cscore/src/main/native/cpp/HttpCameraImpl.cpp
+8 −0 cscore/src/main/native/cpp/HttpCameraImpl.h
+11 −1 cscore/src/main/native/cpp/MjpegServerImpl.cpp
+36 −9 cscore/src/main/native/cpp/UsbCameraImplCommon.cpp
+20 −2 cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
+13 −9 cscore/src/main/native/include/cscore_c.h
+4 −1 cscore/src/main/native/include/cscore_cpp.h
+5 −0 cscore/src/main/native/include/cscore_oo.h
+5 −0 cscore/src/main/native/include/cscore_oo.inl
+102 −11 cscore/src/main/native/linux/UsbCameraImpl.cpp
+5 −0 cscore/src/main/native/osx/UsbCameraImpl.cpp
+13 −0 cscore/src/main/native/windows/UsbCameraImpl.cpp
+20 −49 hal/src/main/native/athena/CANAPI.cpp
+1 −1 hal/src/main/native/athena/HAL.cpp
+1 −1 hal/src/main/native/athena/PDP.cpp
+19 −33 hal/src/main/native/sim/CANAPI.cpp
+5 −4 ntcore/src/main/native/cpp/Dispatcher.cpp
+7 −4 ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
+8 −0 wpilibc/src/main/native/cpp/DriverStation.cpp
+53 −25 wpilibc/src/main/native/cpp/MotorSafety.cpp
+13 −0 wpilibc/src/main/native/cpp/shuffleboard/BuiltInLayouts.cpp
+35 −0 wpilibc/src/main/native/cpp/shuffleboard/BuiltInWidgets.cpp
+12 −0 wpilibc/src/main/native/cpp/shuffleboard/LayoutType.cpp
+46 −0 wpilibc/src/main/native/cpp/shuffleboard/SendableCameraWrapper.cpp
+27 −2 wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardContainer.cpp
+12 −0 wpilibc/src/main/native/cpp/shuffleboard/WidgetType.cpp
+2 −1 wpilibc/src/main/native/include/frc/IterativeRobotBase.h
+23 −6 wpilibc/src/main/native/include/frc/MotorSafety.h
+1 −0 wpilibc/src/main/native/include/frc/WPIErrors.h
+53 −0 wpilibc/src/main/native/include/frc/shuffleboard/BuiltInLayouts.h
+387 −0 wpilibc/src/main/native/include/frc/shuffleboard/BuiltInWidgets.h
+36 −0 wpilibc/src/main/native/include/frc/shuffleboard/LayoutType.h
+55 −0 wpilibc/src/main/native/include/frc/shuffleboard/SendableCameraWrapper.h
+66 −4 wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardContainer.h
+17 −0 wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardWidget.h
+36 −0 wpilibc/src/main/native/include/frc/shuffleboard/WidgetType.h
+12 −12 wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp
+3 −3 wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
+2 −2 wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Claw.h
+5 −5 wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/DriveTrain.h
+2 −2 wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Elevator.h
+2 −2 wpilibcExamples/src/main/cpp/examples/GearsBot/include/subsystems/Wrist.h
+3 −3 wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
+3 −3 wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
+5 −5 wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
+5 −5 wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
+2 −2 wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
+2 −2 wpilibcExamples/src/main/cpp/examples/MotorControlEncoder/cpp/Robot.cpp
+2 −2 wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Collector.h
+5 −5 wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/DriveTrain.h
+2 −2 wpilibcExamples/src/main/cpp/examples/PacGoat/include/subsystems/Pivot.h
+2 −2 wpilibcExamples/src/main/cpp/examples/PotentiometerPID/cpp/Robot.cpp
+4 −4 wpilibcExamples/src/main/cpp/examples/ShuffleBoard/cpp/Robot.cpp
+3 −3 wpilibcExamples/src/main/cpp/examples/Ultrasonic/cpp/Robot.cpp
+3 −3 wpilibcExamples/src/main/cpp/examples/UltrasonicPID/cpp/Robot.cpp
+3 −3 wpilibcExamples/src/main/cpp/templates/sample/include/Robot.h
+18 −0 wpilibcIntegrationTests/src/main/native/cpp/PowerDistributionPanelTest.cpp
+12 −12 wpilibcIntegrationTests/src/main/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp
+10 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/DriverStation.java
+2 −1 wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java
+53 −19 wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java
+62 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInLayouts.java
+399 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/BuiltInWidgets.java
+10 −1 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ContainerHelper.java
+21 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/LayoutType.java
+57 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/SendableCameraWrapper.java
+64 −4 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardContainer.java
+8 −2 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardLayout.java
+8 −2 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardTab.java
+14 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardWidget.java
+21 −0 wpilibj/src/main/java/edu/wpi/first/wpilibj/shuffleboard/WidgetType.java
+12 −12 wpilibj/src/test/java/edu/wpi/first/wpilibj/shuffleboard/ShuffleboardInstanceTest.java
+3 −3 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gearsbot/subsystems/DriveTrain.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gettingstarted/Robot.java
+3 −3 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyro/Robot.java
+5 −5 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/gyromecanum/Robot.java
+5 −5 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumdrive/Robot.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrol/Robot.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/motorcontrolencoder/Robot.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/potentiometerpid/Robot.java
+4 −3 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/shuffleboard/Robot.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/tankdrive/Robot.java
+3 −3 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/ultrasonic/Robot.java
+3 −3 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/ultrasonicpid/Robot.java
+2 −2 wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/sample/Robot.java
2 changes: 1 addition & 1 deletion deps/pynetworktables
Submodule pynetworktables updated 17 files
+3 −6 ntcore/api.py
+6 −6 ntcore/callback_manager.py
+6 −6 ntcore/connection_notifier.py
+6 −6 ntcore/dispatcher.py
+6 −6 ntcore/entry_notifier.py
+6 −6 ntcore/network_connection.py
+6 −6 ntcore/rpc_server.py
+6 −6 ntcore/storage.py
+6 −6 ntcore/storage_save.py
+21 −50 ntcore/support/leb128.py
+42 −43 ntcore/value.py
+6 −6 tests/test_conn_listener.py
+32 −0 tests/test_entry.py
+6 −6 tests/test_entry_listener.py
+6 −8 tests/test_entry_notifier.py
+6 −6 tests/test_storage.py
+6 −6 tests/test_value.py
2 changes: 1 addition & 1 deletion deps/robotpy-cscore
Submodule robotpy-cscore updated 27 files
+2 −2 .gittrack
+21 −3 .travis.yml
+5 −4 MANIFEST.in
+1 −2 cscore/__init__.py
+52 −39 cscore/__main__.py
+2 −4 cscore/_info.py
+2 −3 cscore/_logging.py
+159 −130 cscore/cameraserver.py
+11 −11 cscore/grip.py
+54 −40 cscore/imagewriter.py
+1 −1 cscore_src
+61 −59 docs/conf.py
+55 −26 docs/gencpp.py
+60 −55 docs/gensidebar.py
+266 −119 docs/objects.rst
+8 −8 examples/cvstream.py
+12 −10 examples/dual_cameraserver.py
+26 −9 examples/enum_usb.py
+12 −11 examples/httpcvstream.py
+19 −17 examples/intermediate_cameraserver.py
+11 −9 examples/quick_cameraserver.py
+34 −19 examples/settings.py
+14 −13 examples/usbcvstream.py
+2 −2 examples/usbstream.py
+131 −114 setup.py
+100 −55 src/_cscore.cpp
+31 −0 src/wpiutil_converters.hpp

0 comments on commit d0a2bf8

Please sign in to comment.