From 78f923e380660d0a3a06cb8bf977981c27a824bd Mon Sep 17 00:00:00 2001 From: Elijah Price Date: Fri, 15 Feb 2019 18:43:38 -0800 Subject: [PATCH] Untested 2laser code using onboard serial --- .../frc4388/robot/commands/LaserToDash.java | 14 +++++++++++++- .../frc4388/robot/subsystems/Rangefinder.java | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/LaserToDash.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/LaserToDash.java index c3a1ad5..a379dd2 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/LaserToDash.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/LaserToDash.java @@ -28,7 +28,19 @@ public class LaserToDash extends Command { // Called repeatedly when this Command is scheduled to run @Override protected void execute() { - SmartDashboard.putNumber("Laser Raw Out", Robot.rangefinder.getDistance()); + String p1, p2; + try{ + String toParse = Robot.rangefinder.getDistance(); + String[] parts = toParse.split("s"); + p1 = parts[0]; + p2 = parts[1]; + } + catch(Exception nullException){ + p1 = "0"; + p2 = "0"; + } + SmartDashboard.putNumber("Laser 1 raw out", Double.parseDouble(p1)); + SmartDashboard.putNumber("Laser 2 raw out", Double.parseDouble(p2)); } // Make this return true when this Command no longer needs to run execute() diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Rangefinder.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Rangefinder.java index 373ab6c..d9cae21 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Rangefinder.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Rangefinder.java @@ -28,7 +28,7 @@ public class Rangefinder extends Subsystem { // setDefaultCommand(new MySpecialCommand()); setDefaultCommand(new LaserToDash()); } - public double getDistance(){ - return Double.valueOf(laser1.readString()); + public String getDistance(){ + return laser1.readString(); } }