Skip to content

Commit 204dad5

Browse files
committed
Optimize Imports; Add SocketManager; Add Mass Storage Support
1 parent 0e57967 commit 204dad5

27 files changed

Lines changed: 393 additions & 96 deletions

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,7 @@ We're Open Source, which means we're open to contributions. Got something you wa
125125
- Credit yourself! Add @author to your JavaDoc comments so people can thank you
126126
- Submit it to us via Pull Request. This makes it easy for us to merge your changes
127127

128-
Thanks for helping improving Toast!
128+
Thanks for helping improving Toast!
129+
130+
## Why did I call it 'Toast'?
131+
Toast is modular. So is regular Toast. Want butter? Go ahead, add it! Jam more your style? Whatever, jam it up, baby! Want to make a sandwich? Make the best sandwich the world has ever seen.

build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ gradlerio.robotClass = "jaci.openrio.toast.core.Toast" //The class for the ma
2828
gradlerio.team = "5333" //Your FRC team number (e.g. 5333 for team 'Can't C#', or 47 for Chief Delphi)
2929
//gradlerio.rioIP = "10.53.33.20" //Uncomment to specify the IP address of the RIO
3030

31+
repositories {
32+
maven {
33+
name = "Jaci"
34+
url = "http://dev.imjac.in/maven"
35+
}
36+
mavenCentral()
37+
}
38+
39+
3140
def maven = true
3241

3342
try {
@@ -49,18 +58,14 @@ settings.withReader {
4958
project.ext.settings = new ConfigSlurper().parse prop
5059
}
5160

52-
5361
configurations {
5462
deployerJars
5563
}
5664

57-
repositories {
58-
mavenCentral()
59-
}
60-
6165
dependencies {
6266
compile fileTree(dir: 'libs/', include: '*.jar')
6367

68+
compile 'jaci.openrio.delegate:NetworkDelegate:1.1.0'
6469
compile 'org.codehaus.groovy:groovy:2.4.1'
6570
deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
6671
}

build.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
toast.version=0.5.0
1+
toast.version=1.0.0

deploymentScripts/gradle/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import org.gradle.logging.StyledTextOutput;
2-
import org.gradle.logging.StyledTextOutputFactory;
3-
import static org.gradle.logging.StyledTextOutput.Style;
1+
import org.gradle.logging.StyledTextOutputFactory
2+
3+
import static org.gradle.logging.StyledTextOutput.Style
44

55
apply plugin: Build
66

patches/src/main/java/edu/wpi/first/wpilibj/RobotBase.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,17 @@
77

88
package edu.wpi.first.wpilibj;
99

10-
import java.io.File;
11-
import java.io.FileOutputStream;
12-
import java.io.IOException;
13-
import java.io.OutputStream;
14-
import java.io.IOException;
15-
import java.net.URL;
16-
import java.util.Enumeration;
17-
import java.util.jar.Manifest;
18-
import java.util.Arrays;
19-
2010
import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary;
2111
import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tInstances;
2212
import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tResourceType;
2313
import edu.wpi.first.wpilibj.communication.UsageReporting;
2414
import edu.wpi.first.wpilibj.internal.HardwareHLUsageReporting;
2515
import edu.wpi.first.wpilibj.internal.HardwareTimer;
2616
import edu.wpi.first.wpilibj.networktables.NetworkTable;
27-
import edu.wpi.first.wpilibj.Utility;
2817
import jaci.openrio.toast.core.Toast;
2918

19+
import java.util.Arrays;
20+
3021
/**
3122
* Implement a Robot Program framework.
3223
* The RobotBase class is intended to be subclassed by a user creating a robot program.

patches/src/main/java/edu/wpi/first/wpilibj/communication/FRCNetworkCommunicationsLibrary.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package edu.wpi.first.wpilibj.communication;
22

3-
import java.nio.ByteBuffer;
4-
import java.nio.IntBuffer;
5-
import java.nio.ShortBuffer;
6-
73
import edu.wpi.first.wpilibj.hal.JNIWrapper;
84
import jaci.openrio.toast.core.loader.simulation.SimulationData;
95
import jaci.openrio.toast.lib.state.RobotState;
106

7+
import java.nio.ByteBuffer;
8+
import java.nio.IntBuffer;
9+
import java.nio.ShortBuffer;
10+
1111
public class FRCNetworkCommunicationsLibrary extends JNIWrapper {
1212
public static interface tModuleType {
1313
public static final int kModuleType_Unknown = 0x00;

patches/src/main/java/edu/wpi/first/wpilibj/hal/HALUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package edu.wpi.first.wpilibj.hal;
22

3-
import java.nio.ByteBuffer;
4-
import java.nio.IntBuffer;
5-
import edu.wpi.first.wpilibj.DriverStation;
63
import jaci.openrio.toast.core.ToastBootstrap;
74
import jaci.openrio.toast.core.loader.simulation.SimulationData;
85

6+
import java.nio.ByteBuffer;
7+
import java.nio.IntBuffer;
8+
99
public class HALUtil extends JNIWrapper {
1010
public static final int NULL_PARAMETER = -1005;
1111
public static final int SAMPLE_RATE_TOO_HIGH = 1001;

patches/src/main/java/edu/wpi/first/wpilibj/hal/PWMJNI.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import jaci.openrio.toast.core.loader.simulation.SimulationData;
44

5-
import java.lang.reflect.Array;
65
import java.nio.ByteBuffer;
76
import java.nio.IntBuffer;
8-
import java.util.Arrays;
97

108
public class PWMJNI extends DIOJNI {
119

release/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.gradle/
2+
build/
3+
run/
4+
*.iml
5+
*.ipr
6+
*.iws

src/main/java/jaci/openrio/toast/core/StateTracker.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary;
44
import edu.wpi.first.wpilibj.communication.UsageReporting;
5-
import edu.wpi.first.wpilibj.livewindow.LiveWindow;
65
import jaci.openrio.toast.core.loader.groovy.GroovyLoader;
76
import jaci.openrio.toast.lib.FRCHooks;
87
import jaci.openrio.toast.lib.state.RobotState;

0 commit comments

Comments
 (0)