Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phoenix6 Updates #26

Merged
merged 7 commits into from
Jan 11, 2025
Merged

Phoenix6 Updates #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e89329
initial updates to tct for phoenix6 and 2024 beta
mwitcpalek Dec 15, 2023
31acd90
update to kickoff releases for 2024, initial testing complete on roborio
mwitcpalek Jan 14, 2024
595f36d
add CANcoder, update talonFX options
mwitcpalek Feb 7, 2024
657036f
fix duplicate grapher entries
mwitcpalek Feb 10, 2024
8453f40
allow non percent units on closed-loop percent modes
mwitcpalek Feb 18, 2024
0fedf95
add canivore options to tct
mwitcpalek Mar 13, 2024
e96dca9
fix rio fx's
mwitcpalek Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions bin/main/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<configuration>

<appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<target>System.err</target>
<encoder>
<pattern>%-23(%d{HH:mm:ss.SSS} [%thread]) %highlight(%-5level) %logger{32} - %msg%n</pattern>
</encoder>
</appender>

<logger name="org.strykeforce.thirdcoast" level="DEBUG"/>
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="Koin" level="INFO"/>

<!-- Strictly speaking, the level attribute is not necessary since -->
<!-- the level of the root level is set to DEBUG by default. -->
<root level="DEBUG">
<appender-ref ref="STDERR"/>
</root>

</configuration>
Binary file added bin/main/org/strykeforce/tct/Main.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/NotImplementedError.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/TalonBase.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/TalonFX.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/TalonFXBase.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/TalonSRX.class
View file
Open in desktop
Binary file not shown.
Binary file added bin/main/org/strykeforce/tct/device/TalonSRXBase.class
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions bin/main/templates/hello.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Hello</title>
</head>
<body>
<h1 th:text="${name}">Hello, World</h1>
</body>
</html>
1 change: 1 addition & 0 deletions bin/test/junit-platform.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
junit.jupiter.testinstance.lifecycle.default=per_class
21 changes: 11 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO

plugins {
id "java"
id "org.jetbrains.kotlin.jvm" version "1.6.20"
id "edu.wpi.first.GradleRIO" version "2023.1.1"
id "org.jetbrains.kotlin.jvm" version "1.7.21"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
}

version = "23.0.0"
version = "24.0.0"

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

def ROBOT_MAIN_CLASS = "org.strykeforce.thirdcoast.DummyMain"

Expand Down Expand Up @@ -69,24 +69,25 @@ dependencies {
implementation("net.consensys.cava:cava-toml:0.5.0")

// Logging
implementation('io.github.microutils:kotlin-logging-jvm:2.1.21')
implementation('ch.qos.logback:logback-classic:1.2.10')
implementation('io.github.microutils:kotlin-logging-jvm:3.0.5') //2.1.21
implementation('ch.qos.logback:logback-classic:1.3.5')

// Koin
implementation("org.koin:koin-core:1.0.2")
implementation("org.koin:koin-logger-slf4j:1.0.2")
testImplementation("org.koin:koin-test:1.0.2")

// Testing
testImplementation(platform("org.junit:junit-bom:5.7.2"))
testImplementation(platform("org.junit:junit-bom:5.9.0"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.assertj:assertj-core:3.19.0")
testImplementation("org.assertj:assertj-core:3.23.1")
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
testRuntimeOnly('ch.qos.logback:logback-classic:1.4.4')
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}
}

Expand Down
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
Loading