fixed rebase merge conflicts

team4099 · Jan 21, 2024 · 34ab205 · 34ab205
2 parents 4486159 + c481b9e
commit 34ab205
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/src/main/kotlin/com/team4099/lib/phoenix6/VelocityVoltage.kt b/src/main/kotlin/com/team4099/lib/phoenix6/VelocityVoltage.kt
@@ -11,26 +11,6 @@ import org.team4099.lib.units.inRotationsPerSecond
 import org.team4099.lib.units.inRotationsPerSecondPerSecond
 import org.team4099.lib.units.perSecond
 
-<<<<<<< HEAD
-class VelocityVoltage(var velocity: AngularVelocity,
-<<<<<<< HEAD
-                           var acceleration: AngularAcceleration = 0.0.degrees.perSecond.perSecond,
-                           var enableFOC:Boolean = true,
-                           var feedforward: ElectricalPotential = 0.0.volts,
-                           var slot:Int = 0,
-                           var overrideBrakeDurNeutral: Boolean = false,
-                           var limitForwardMotion: Boolean = false,
-                           var limitReverseMotion: Boolean = false){
-=======
-                      var acceleration: AngularAcceleration = 0.0.degrees.perSecond.perSecond,
-                      var enableFOC:Boolean = true,
-                      var feedforward: ElectricalPotential = 0.0.volts,
-                      var slot:Int = 0,
-                      var overrideBrakeDurNeutral: Boolean = false,
-                      var limitForwardMotion: Boolean = false,
-                      var limitReverseMotion: Boolean = false){
->>>>>>> 4abb5a7 (Finshing up flywheel)
-=======
 class VelocityVoltage(private var velocity: AngularVelocity,
                       private var acceleration: AngularAcceleration = 0.0.degrees.perSecond.perSecond,
                       private var enableFOC:Boolean = true,
@@ -39,7 +19,6 @@ class VelocityVoltage(private var velocity: AngularVelocity,
                       private var overrideBrakeDurNeutral: Boolean = false,
                       private var limitForwardMotion: Boolean = false,
                       private var limitReverseMotion: Boolean = false){
->>>>>>> c5552eb (fix shooter stuff)
 
     val velocityVoltagePhoenix6 = VelocityVoltagePhoenix6(velocity.inRotationsPerSecond, acceleration.inRotationsPerSecondPerSecond, enableFOC, feedforward.inVolts, slot, overrideBrakeDurNeutral, limitForwardMotion, limitReverseMotion)
 

diff --git a/src/main/kotlin/com/team4099/robot2023/BuildConstants.kt b/src/main/kotlin/com/team4099/robot2023/BuildConstants.kt
@@ -6,19 +6,13 @@ package com.team4099.robot2023
 const val MAVEN_GROUP = ""
 const val MAVEN_NAME = "Crescendo-2024"
 const val VERSION = "unspecified"
-<<<<<<< HEAD
-const val GIT_REVISION = 28
-const val GIT_SHA = "eca16395eb62f3d6d367479ab32e985e6472149b"
-const val GIT_DATE = "2024-01-16T14:49:50Z"
-const val GIT_BRANCH = "targeting-command-with-drivetrain"
-const val BUILD_DATE = "2024-01-16T15:27:50Z"
-const val BUILD_UNIX_TIME = 1705436870465L
-=======
+
+
 const val GIT_REVISION = 30
 const val GIT_SHA = "4abb5a7f1e6932895bda561c4716efc84f427d1e"
 const val GIT_DATE = "2024-01-19T19:51:08Z"
 const val GIT_BRANCH = "shooter"
 const val BUILD_DATE = "2024-01-20T15:27:59Z"
 const val BUILD_UNIX_TIME = 1705782479283L
->>>>>>> c5552eb (fix shooter stuff)
+
 const val DIRTY = 1
diff --git a/src/main/kotlin/com/team4099/robot2023/subsystems/superstructure/Request.kt b/src/main/kotlin/com/team4099/robot2023/subsystems/superstructure/Request.kt
@@ -13,11 +13,6 @@ import org.team4099.lib.units.derived.ElectricalPotential
 
 sealed interface Request {
 
-<<<<<<< HEAD
-=======
-
-
->>>>>>> c5552eb (fix shooter stuff)
   sealed interface DrivetrainRequest : Request {
     class OpenLoop(
       val angularVelocity: AngularVelocity,