diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 31edd4a..e6d169f 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -17,6 +17,9 @@ apply from: '../build.dependencies.gradle' android { namespace = 'org.firstinspires.ftc.teamcode' + buildFeatures { + mlModelBinding true + } packagingOptions { jniLibs.useLegacyPackaging true diff --git a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java b/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java index a0cd811..c606173 100644 --- a/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java +++ b/TeamCode/src/main/java/org/timecrafters/Autonomous/States/ConeIdentification.java @@ -47,12 +47,12 @@ public class ConeIdentification extends CyberarmState { engine.telemetry.addData("- Position (Row/Col)","%.0f / %.0f", row, col); engine.telemetry.addData("- Size (Width/Height)","%.0f / %.0f", width, height); - if (recognition.getLabel().equals("2 Bulb")) { - engine.telemetry.addData("2 Bulb", engine.blackboard.put("parkPlace", "2")); - } else if (recognition.getLabel().equals("3 Panel")) { - engine.telemetry.addData("3 Panel",engine.blackboard.put("parkPlace", "3")); + if (recognition.getLabel().equals("Red 2")) { + engine.telemetry.addData("Red 2", engine.blackboard.put("parkPlace", "2")); + } else if (recognition.getLabel().equals("Blue 3")) { + engine.telemetry.addData("Blue 3",engine.blackboard.put("parkPlace", "3")); } else { - engine.telemetry.addData("1 Bolt", engine.blackboard.put("parkPlace", "1")); + engine.telemetry.addData("Yellow 1", engine.blackboard.put("parkPlace", "1")); } } } @@ -75,9 +75,9 @@ public class ConeIdentification extends CyberarmState { if (recognition.getConfidence() >= minimumConfidence && recognition.getConfidence() > bestConfidence) { bestConfidence = recognition.getConfidence(); - if (recognition.getLabel().equals("2 Bulb")) { + if (recognition.getLabel().equals("Red 2")) { engine.blackboard.put("parkPlace", "2"); - } else if (recognition.getLabel().equals("3 Panel")) { + } else if (recognition.getLabel().equals("Blue 3")) { engine.blackboard.put("parkPlace", "3"); } else { diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java b/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java index 72145f9..25be3f6 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java +++ b/TeamCode/src/main/java/org/timecrafters/TeleOp/states/PhoenixBot1.java @@ -19,12 +19,12 @@ import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersConfig public class PhoenixBot1 { - private static final String TFOD_MODEL_ASSET = "PowerPlay.tflite"; + private static final String TFOD_MODEL_ASSET = "22-23_PowerPlay_Colors.tflite"; private static final String[] LABELS = { - "1 Bolt", - "2 Bulb", - "3 Panel" + "Yellow 1", + "Red 2", + "Blue 3" }; private static final String VUFORIA_KEY = diff --git a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/SteeringDriveExperiment.java b/TeamCode/src/main/java/org/timecrafters/TeleOp/states/SteeringDriveExperiment.java index bbb06d9..0f48d57 100644 --- a/TeamCode/src/main/java/org/timecrafters/TeleOp/states/SteeringDriveExperiment.java +++ b/TeamCode/src/main/java/org/timecrafters/TeleOp/states/SteeringDriveExperiment.java @@ -16,6 +16,7 @@ public class SteeringDriveExperiment extends CyberarmState { public SteeringDriveExperiment(PhoenixBot1 robot) { this.robot = robot; } + @Override public void exec() { diff --git a/TeamCode/src/main/ml/22-23_PowerPlay_Colors.tflite b/TeamCode/src/main/ml/22-23_PowerPlay_Colors.tflite new file mode 100644 index 0000000..075f1ca Binary files /dev/null and b/TeamCode/src/main/ml/22-23_PowerPlay_Colors.tflite differ