From 77dbd7f5e23979b33262edd79dbd7e951890ef25 Mon Sep 17 00:00:00 2001 From: Ryan Brott Date: Thu, 2 Feb 2023 19:48:52 -0800 Subject: [PATCH] Move logging stuff --- .../java/org/firstinspires/ftc/teamcode/MecanumDrive.java | 2 +- .../java/org/firstinspires/ftc/teamcode/TankDrive.java | 2 +- .../ftc/teamcode/{tuning => util}/LogFiles.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{tuning => util}/LogFiles.java (97%) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/MecanumDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/MecanumDrive.java index 2579216..6e834b7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/MecanumDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/MecanumDrive.java @@ -35,7 +35,7 @@ import com.qualcomm.robotcore.hardware.HardwareMap; import com.qualcomm.robotcore.hardware.IMU; import com.qualcomm.robotcore.hardware.VoltageSensor; -import org.firstinspires.ftc.teamcode.tuning.LogFiles; +import org.firstinspires.ftc.teamcode.util.LogFiles; import org.firstinspires.ftc.teamcode.util.Encoder; import org.firstinspires.ftc.teamcode.util.Localizer; import org.firstinspires.ftc.teamcode.util.LynxFirmwareVersion; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TankDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TankDrive.java index 4c3eb53..f45e44f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TankDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/TankDrive.java @@ -37,7 +37,7 @@ import com.qualcomm.robotcore.hardware.HardwareMap; import com.qualcomm.robotcore.hardware.IMU; import com.qualcomm.robotcore.hardware.VoltageSensor; -import org.firstinspires.ftc.teamcode.tuning.LogFiles; +import org.firstinspires.ftc.teamcode.util.LogFiles; import org.firstinspires.ftc.teamcode.util.Encoder; import org.firstinspires.ftc.teamcode.util.Localizer; import org.firstinspires.ftc.teamcode.util.LynxFirmwareVersion; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/LogFiles.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/util/LogFiles.java similarity index 97% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/LogFiles.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/util/LogFiles.java index f9bff43..1807596 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/LogFiles.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/util/LogFiles.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.tuning; +package org.firstinspires.ftc.teamcode.util; import android.annotation.SuppressLint; import android.content.Context; @@ -19,6 +19,7 @@ import org.firstinspires.ftc.teamcode.MecanumDrive; import org.firstinspires.ftc.teamcode.TankDrive; import org.firstinspires.ftc.teamcode.ThreeDeadWheelLocalizer; import org.firstinspires.ftc.teamcode.TwoDeadWheelLocalizer; +import org.firstinspires.ftc.teamcode.tuning.TuningOpModes; import java.io.File; import java.io.FileInputStream; @@ -40,7 +41,7 @@ public final class LogFiles { public static LogFile log = new LogFile("uninitialized"); public static class LogFile { - public int version = 0; + public String version = "quickstart2 v0"; public String opModeName; public long msInit = System.currentTimeMillis(); @@ -189,6 +190,8 @@ public final class LogFiles { for (File f : fs) { sb.append("
  • "); sb.append(f.getName()); sb.append("
  • ");