diff --git a/src/main/java/org/montclairrobotics/cyborg/Cyborg.java b/src/main/java/org/montclairrobotics/cyborg/Cyborg.java index 4035cce..e44eee6 100644 --- a/src/main/java/org/montclairrobotics/cyborg/Cyborg.java +++ b/src/main/java/org/montclairrobotics/cyborg/Cyborg.java @@ -225,4 +225,7 @@ public void logMessage(String msg, boolean immediate) { //if(immediate) telemetry.update(); } + public void putStringArray(String title, String[] msgs) { + SmartDashboard.putStringArray(title, msgs); + } } diff --git a/src/main/java/org/montclairrobotics/cyborg/core b/src/main/java/org/montclairrobotics/cyborg/core index 08d9ae5..2286543 160000 --- a/src/main/java/org/montclairrobotics/cyborg/core +++ b/src/main/java/org/montclairrobotics/cyborg/core @@ -1 +1 @@ -Subproject commit 08d9ae5391ef8d323450812c28fbe735a653ca01 +Subproject commit 2286543533f13480c60882df91a7e84971f0e98a diff --git a/src/main/java/org/montclairrobotics/cyborg/mappers/CBMotorMonitorMapper.java b/src/main/java/org/montclairrobotics/cyborg/mappers/CBMotorMonitorMapper.java deleted file mode 100644 index c2fef1b..0000000 --- a/src/main/java/org/montclairrobotics/cyborg/mappers/CBMotorMonitorMapper.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.montclairrobotics.cyborg.mappers; - -import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; -import org.montclairrobotics.cyborg.Cyborg; -import org.montclairrobotics.cyborg.core.mappers.CBSensorMapper; -import org.montclairrobotics.cyborg.devices.CBDeviceID; -import org.montclairrobotics.cyborg.devices.CBSpeedController; -import org.montclairrobotics.cyborg.devices.CBSpeedControllerFault; - -import java.util.ArrayList; - -public class CBMotorMonitorMapper extends CBSensorMapper { - ArrayList controllers = new ArrayList(); - - public CBMotorMonitorMapper(Cyborg robot) { - super(robot); - } - - public CBMotorMonitorMapper add(CBDeviceID controller) { - add(Cyborg.hardwareAdapter.getSpeedController(controller)); - return this; - } - - public CBMotorMonitorMapper add(CBSpeedController controller) { - controllers.add(controller); - return this; - } - - @Override - public void init() { - - } - - @Override - public void update() { - String[] status = new String[controllers.size()]; - int i = 0; - for(CBSpeedController controller: controllers) { - CBSpeedControllerFault fault = controller.getSpeedControllerFault(); - double current = controller.getActualCurrent(); - String name = controller.getName(); - String value; - if (fault==null) { - value = Double.toString(current); - } else { - value = fault.errMsg; - } - status[i] = name +" "+value; - } - SmartDashboard.putStringArray("MotorMonitor", status); - } -}