fix: fix vendordep merge conflicts

Signed-off-by: Jonah Snider <jonah@jonahsnider.com>

Author: jonahsnider

lib/src/main/java/dev/doglog/internal/extras/ExtrasLogger.java

@@ -79,49 +79,37 @@ private void log() {
   }
 
   private void logSystem(long now) {
-    logger.log(now, "SystemStats/FPGAVersion", HALUtil.getFPGAVersion());
-    logger.log(now, "SystemStats/FPGARevision", HALUtil.getFPGARevision());
     logger.log(now, "SystemStats/SerialNumber", HALUtil.getSerialNumber());
     logger.log(now, "SystemStats/Comments", HALUtil.getComments());
     logger.log(now, "SystemStats/TeamNumber", HALUtil.getTeamNumber());
-    logger.log(now, "SystemStats/FPGAButton", HALUtil.getFPGAButton());
     logger.log(now, "SystemStats/SystemActive", HAL.getSystemActive());
     logger.log(now, "SystemStats/BrownedOut", HAL.getBrownedOut());
     logger.log(now, "SystemStats/RSLState", HAL.getRSLState());
     logger.log(now, "SystemStats/SystemTimeValid", HAL.getSystemTimeValid());
 
     logger.log(now, "SystemStats/BatteryVoltage", PowerJNI.getVinVoltage(), VOLTS_UNIT_STRING);
-    logger.log(now, "SystemStats/BatteryCurrent", PowerJNI.getVinCurrent(), AMPS_UNIT_STRING);
 
     logger.log(now, "SystemStats/3v3Rail/Voltage", PowerJNI.getUserVoltage3V3(), VOLTS_UNIT_STRING);
     logger.log(now, "SystemStats/3v3Rail/Current", PowerJNI.getUserCurrent3V3(), AMPS_UNIT_STRING);
     logger.log(now, "SystemStats/3v3Rail/Active", PowerJNI.getUserActive3V3());
     logger.log(now, "SystemStats/3v3Rail/CurrentFaults", PowerJNI.getUserCurrentFaults3V3());
 
-    logger.log(now, "SystemStats/5vRail/Voltage", PowerJNI.getUserVoltage5V(), VOLTS_UNIT_STRING);
-    logger.log(now, "SystemStats/5vRail/Current", PowerJNI.getUserCurrent5V(), AMPS_UNIT_STRING);
-    logger.log(now, "SystemStats/5vRail/Active", PowerJNI.getUserActive5V());
-    logger.log(now, "SystemStats/5vRail/CurrentFaults", PowerJNI.getUserCurrentFaults5V());
-
-    logger.log(now, "SystemStats/6vRail/Voltage", PowerJNI.getUserVoltage6V(), VOLTS_UNIT_STRING);
-    logger.log(now, "SystemStats/6vRail/Current", PowerJNI.getUserCurrent6V(), AMPS_UNIT_STRING);
-    logger.log(now, "SystemStats/6vRail/Active", PowerJNI.getUserActive6V());
-    logger.log(now, "SystemStats/6vRail/CurrentFaults", PowerJNI.getUserCurrentFaults6V());
-
     logger.log(
         now, "SystemStats/BrownoutVoltage", PowerJNI.getBrownoutVoltage(), VOLTS_UNIT_STRING);
     logger.log(now, "SystemStats/CPUTempCelcius", PowerJNI.getCPUTemp(), CELSIUS_UNIT_STRING);
+
+    logger.log(now, "SystemStats/EpochTimeMicros", HALUtil.getFPGATime(), MICROSECONDS_UNIT_STRING);
   }
 
   private void logCan(long now) {
-    CANJNI.getCANStatus(status);
-    logger.log(now, "SystemStats/CANBus/Utilization", status.percentBusUtilization);
-    logger.log(now, "SystemStats/CANBus/OffCount", status.busOffCount);
-    logger.log(now, "SystemStats/CANBus/TxFullCount", status.txFullCount);
-    logger.log(now, "SystemStats/CANBus/ReceiveErrorCount", status.receiveErrorCount);
-    logger.log(now, "SystemStats/CANBus/TransmitErrorCount", status.transmitErrorCount);
-
-    logger.log(now, "SystemStats/EpochTimeMicros", HALUtil.getFPGATime(), MICROSECONDS_UNIT_STRING);
+    for (int i = 0; i < 5; i++) {
+      CANJNI.getCANStatus(i, status);
+      logger.log(now, "SystemStats/CANBus/" + i + "/Utilization", status.percentBusUtilization);
+      logger.log(now, "SystemStats/CANBus/" + i + "/OffCount", status.busOffCount);
+      logger.log(now, "SystemStats/CANBus/" + i + "/TxFullCount", status.txFullCount);
+      logger.log(now, "SystemStats/CANBus/" + i + "/ReceiveErrorCount", status.receiveErrorCount);
+      logger.log(now, "SystemStats/CANBus/" + i + "/TransmitErrorCount", status.transmitErrorCount);
+    }
   }
 
   private void logPdh(long now) {