Skip to content

Commit 36400fa

Browse files
committed
removed kscheduler dependency on kopmode and added photoncore
1 parent fb5fbc7 commit 36400fa

File tree

7 files changed

+31
-13
lines changed

7 files changed

+31
-13
lines changed

Diff for: build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ task clean(type: Delete) {
2222
allprojects {
2323
repositories {
2424
google()
25-
jcenter()
25+
mavenCentral()
2626
}
2727
}
2828

Diff for: koawalib/build.gradle

+4-7
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ configurations {
6565

6666
dependencies {
6767
repositories {
68-
jcenter() // Needed for tensorflow-lite
6968
maven { url = 'https://maven.brott.dev/' }
7069
maven { url = 'https://jitpack.io' }
7170
maven { url "https://kotlin.bintray.com/kotlin-datascience" }
@@ -75,11 +74,8 @@ dependencies {
7574
implementation 'androidx.core:core-ktx:1.6.0'
7675
implementation 'androidx.appcompat:appcompat:1.3.0'
7776
implementation 'com.google.android.material:material:1.4.0'
78-
// testImplementation 'junit:junit:4.13.2'
79-
// androidTestImplementation 'androidx.test.ext:junit:1.1.3'
80-
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
81-
// implementation 'org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.1.1'
82-
// implementation 'org.jetbrains.lets-plot:lets-plot-image-export:2.1.0'
77+
compileOnly 'org.jetbrains.lets-plot:lets-plot-kotlin-jvm:3.1.1'
78+
compileOnly 'org.jetbrains.lets-plot:lets-plot-image-export:2.1.0'
8379

8480
implementation 'org.firstinspires.ftc:RobotCore:7.0.0'
8581

@@ -88,9 +84,10 @@ dependencies {
8884
testImplementation 'org.jetbrains.kotlin:kotlin-test'
8985

9086
implementation 'org.apache.commons:commons-math3:3.6.1'
91-
implementation 'androidx.appcompat:appcompat:1.3.1'
9287
implementation 'com.acmerobotics.dashboard:dashboard:0.4.3'
9388
implementation 'com.acmerobotics.roadrunner:core:0.5.4'
89+
implementation 'com.github.Eeshwar-Krishnan:PhotonFTC:dev-SNAPSHOT'
90+
9491

9592

9693
ktlint("com.pinterest:ktlint:0.42.1") {

Diff for: koawalib/src/main/kotlin/com/asiankoala/koawalib/command/KOpMode.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ abstract class KOpMode : LinearOpMode() {
3434
private lateinit var voltageSensor: VoltageSensor
3535

3636
private fun setup() {
37-
KScheduler.opModeInstance = this
37+
KScheduler.stateReceiver = { opmodeState }
3838

3939
Logger.reset()
4040
Logger.telemetry = telemetry

Diff for: koawalib/src/main/kotlin/com/asiankoala/koawalib/command/KScheduler.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object KScheduler {
3636

3737
private var amountOfWatchdogs = 0
3838

39-
internal lateinit var opModeInstance: KOpMode
39+
internal lateinit var stateReceiver: () -> OpModeState
4040

4141
internal fun resetScheduler() {
4242
allMaps.forEach(MutableMap<*, *>::clear)
@@ -137,7 +137,7 @@ object KScheduler {
137137
}
138138

139139
private fun scheduleForState(state: OpModeState, cmd: Cmd) {
140-
schedule(cmd.waitUntil { opModeInstance.opmodeState == state })
140+
schedule(cmd.waitUntil { stateReceiver.invoke() == state })
141141
}
142142

143143
/**

Diff for: koawalib/src/main/kotlin/com/asiankoala/koawalib/command/commands/Watchdog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal class Watchdog(
99
) : Cmd() {
1010

1111
override fun execute() {
12-
if (condition.invoke() && KScheduler.opModeInstance.opmodeState == OpModeState.LOOP) {
12+
if (condition.invoke() && KScheduler.stateReceiver.invoke() == OpModeState.LOOP) {
1313
toSchedule.schedule()
1414
}
1515
}

Diff for: koawalib/src/main/kotlin/com/asiankoala/koawalib/hardware/motor/KMotorExTuner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ abstract class KMotorExTuner : KOpMode() {
4141
if (!kV.isNaN()) motor.settings.ff.kV = kV else kV = motor.settings.ff.kV
4242
if (!kA.isNaN()) motor.settings.ff.kA = kA else kA = motor.settings.ff.kA
4343
if (!kG.isNaN()) motor.settings.ff.kG = kG else kG = motor.settings.ff.kG
44-
if (!kCos.isNaN()) motor.settings.ff.kCos = kCos else kCos = motor.settings.ff.kCos
44+
// if (!kCos.isNaN()) motor.settings.ff.kCos = kCos else kCos = motor.settings.ff.kCos
4545
if (!kP.isNaN()) motor.settings.pid.kP = kP else kP = motor.settings.pid.kP
4646
if (!kI.isNaN()) motor.settings.pid.kI = kI else kI = motor.settings.pid.kI
4747
if (!kD.isNaN()) motor.settings.pid.kD = kD else kD = motor.settings.pid.kD
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.asiankoala.koawalib
2+
3+
import kotlin.test.Test
4+
5+
class Random {
6+
enum class bruh {
7+
a, b, c;
8+
fun next(): bruh {
9+
return values()[if(ordinal+1>values().size-1) 0 else ordinal+1]
10+
}
11+
}
12+
13+
@Test
14+
fun m() {
15+
val t = bruh.c
16+
println(t.next())
17+
println(t.next().next())
18+
println(t.next().next().next())
19+
20+
}
21+
}

0 commit comments

Comments
 (0)