From a42a7943bc611dba2bc78cbf71a8685f520a93b5 Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Mon, 14 Apr 2014 14:25:47 -0400 Subject: [PATCH] Init HAL from WPILibJ to remove segfaults Change-Id: I28980218ffab440cf17c5a6bb953f52a3458fa6a --- .../src/main/java/edu/wpi/first/wpilibj/RobotBase.java | 2 ++ .../src/main/java/edu/wpi/first/wpilibj/RobotDrive.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index b66f552c5b..af4c4135d2 100644 --- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -238,6 +238,8 @@ public abstract class RobotBase { // System.out.println("ByteBuffer2 as Int" + returnBuffer2.getInt(0)); /* End JNI Testing */ + + FRCNetworkCommunicationsLibrary.FRCNetworkCommunicationReserve(); FRCNetworkCommunicationsLibrary.FRCNetworkCommunicationObserveUserProgramStarting(); UsageReporting.report(tResourceType.kResourceType_Language, tInstances.kLanguage_Java); diff --git a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java index 07d04e4f96..9da30419ce 100644 --- a/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java +++ b/wpilibj/wpilibJava/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java @@ -71,7 +71,7 @@ public class RobotDrive implements MotorSafety, IUtility { protected SpeedController m_rearLeftMotor; protected SpeedController m_rearRightMotor; protected boolean m_allocatedSpeedControllers; - protected boolean m_isCANInitialized = true; + protected boolean m_isCANInitialized = false;//TODO: fix can protected static boolean kArcadeRatioCurve_Reported = false; protected static boolean kTank_Reported = false; protected static boolean kArcadeStandard_Reported = false;