Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ version := "0.5.0"

robotClass := "com.lynbrookrobotics.sixteen.LaunchRobot"

scalaVersion := "2.11.7"
scalaVersion := "2.12.1"

lazy val vision = project
lazy val rpivision = project

resolvers += "WPILib-Maven" at "http://team846.github.io/wpilib-maven"
resolvers += "Funky-Repo" at "http://team846.github.io/repo"
resolvers += "opencv-maven" at "https://github.com/WPIRoboticsProjects/opencv-maven/raw/mvn-repo"

libraryDependencies += "edu.wpi.first" % "wpilib" % "2017.1.1.rc-2"

libraryDependencies += "com.ctre" % "ctrlib" % "4.4.1.9"

libraryDependencies += "org.opencv" % "opencv-java" % "3.1.0"

libraryDependencies += "com.lynbrookrobotics" % "potassium" % "0.1-SNAPSHOT"

Expand Down
40 changes: 20 additions & 20 deletions src/main/java/com/lynbrookrobotics/sixteen/CoreEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.lynbrookrobotics.sixteen.tasks.shooter.arm.MoveShooterArmToAngle;
import com.lynbrookrobotics.sixteen.tasks.shooter.spinners.flywheel.DirectFlywheelSpeed;
import com.lynbrookrobotics.sixteen.tasks.shooter.spinners.secondary.SpinSecondary;
import com.ni.vision.NIVision;
//import com.ni.vision.NIVision;

import java.util.Optional;
import java.util.Timer;
Expand All @@ -40,7 +40,7 @@
import edu.wpi.first.wpilibj.CameraServer;
import edu.wpi.first.wpilibj.PowerDistributionPanel;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj.vision.USBCamera;
// import edu.wpi.first.wpilibj.vision.USBCamera;

/**
* CoreEvents class creates events and maps these to handlers.
Expand Down Expand Up @@ -129,24 +129,24 @@ public void initEventMappings() {
// Camera Streaming
if (RobotConstants.HAS_CAMERA) {
try {
NIVision.Image image = NIVision.imaqCreateImage(NIVision.ImageType.IMAGE_RGB, 0);

USBCamera camera = new USBCamera("cam1");
camera.setBrightness(50);
camera.setExposureAuto();
camera.updateSettings();
camera.startCapture();

Timer updateTimer = new Timer("update-loop");

CameraServer.getInstance().setQuality(50);
updateTimer.schedule(new TimerTask() {
@Override
public void run() {
camera.getImage(image);
CameraServer.getInstance().setImage(image);
}
}, 0, (long) (50));
//NIVision.Image image = NIVision.imaqCreateImage(NIVision.ImageType.IMAGE_RGB, 0);

// USBCamera camera = new USBCamera("cam1");
// camera.setBrightness(50);
// camera.setwExposureAuto();
// camera.updateSettings();
// camera.startCapture();

// Timer updateTimer = new Timer("update-loop");

// CameraServer.getInstance().setQuality(50);
// updateTimer.schedule(new TimerTask() {
// @Override
// public void run() {
// camera.getImage(image);
// CameraServer.getInstance().setImage(image);
// }
// }, 0, (long) (50));
} catch (Exception cameraException) {
System.out.println("Unable to boot camera stream");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.lynbrookrobotics.sixteen.sensors.gyro.GyroL3GD20H;
import com.lynbrookrobotics.sixteen.sensors.imu.ADIS16448;

import edu.wpi.first.wpilibj.CANTalon;
import com.ctre.CANTalon;

/**
* Contains all the hardware components for the drivetrain.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.lynbrookrobotics.sixteen.sensors.potentiometer.Potentiometer;

import edu.wpi.first.wpilibj.CANTalon;
import com.ctre.CANTalon;

/**
* Hardware for the Intake arm.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class ConstantBufferSPI extends SPI {
public ConstantBufferSPI(Port port, int size) {
super(port);

this.port = (byte) port.getValue();
// this.port = (byte) port.getValue();
this.sendBuffer = ByteBuffer.allocateDirect(size);
this.receiveBuffer = ByteBuffer.allocateDirect(size);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lynbrookrobotics.sixteen.sensors.encoder;

import edu.wpi.first.wpilibj.CANTalon;
import com.ctre.CANTalon;

public abstract class Encoder {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.lynbrookrobotics.sixteen.sensors.encoder.Encoder;

import edu.wpi.first.wpilibj.CANTalon;
import com.ctre.CANTalon;

/**
* Class for magnetic planetary encoder.
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/lynbrookrobotics/sixteen/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.Timer;
import java.util.TimerTask;

import edu.wpi.first.wpilibj.CANTalon;
import com.ctre.CANTalon;
import edu.wpi.first.wpilibj.DriverStation;

import static org.mockito.Mockito.mock;
Expand Down