Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit 0f53d72

Browse files
committed
fix merge conflicts with TimedRobot commit
2 parents 410b219 + cf4650b commit 0f53d72

8 files changed

Lines changed: 101 additions & 3 deletions

File tree

4.18 MB
Binary file not shown.

Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import org.usfirst.frc.team199.Robot2018.subsystems.IntakeEject;
1111
import org.usfirst.frc.team199.Robot2018.subsystems.Lift;
1212

13-
import edu.wpi.first.wpilibj.IterativeRobot;
1413
import edu.wpi.first.wpilibj.Preferences;
14+
import edu.wpi.first.wpilibj.TimedRobot;
1515
import edu.wpi.first.wpilibj.command.Command;
1616
import edu.wpi.first.wpilibj.command.Scheduler;
1717
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
@@ -24,7 +24,7 @@
2424
* creating this project, you must also update the manifest file in the resource
2525
* directory.
2626
*/
27-
public class Robot extends IterativeRobot {
27+
public class Robot extends TimedRobot {
2828

2929
public static final Climber climber = new Climber();
3030
public static final ClimberAssist climberAssist = new ClimberAssist();
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Synopsis
2+
3+
AAA is a simple, pseudo-assembly, interpreted language.
4+
5+
Individual path scripts start with a name + a colon and end with the next script,the end command, or the end of the file. Each command occupies one line, and anything on a line past a pound sign is ignored.
6+
7+
The language should be able to be converted into either PID + turns or motion profiling commands.
8+
9+
Distance arguments are in inches, rotation in arc degrees. All numbers can have a floating point.
10+
11+
Ex:
12+
```
13+
1 | LLRx:
14+
2 | wait 5 # wait for other robots to move past
15+
3 | move (12,24) (30,48.5) 125.75 # move to those points and turn
16+
4 | scale # place cube in scale
17+
5 | end # end the script (not necessary)
18+
```
19+
20+
# Script Naming Convention
21+
22+
The 4 characters represent 4 values. All paths include crossing the baseline at some point.
23+
24+
1. Robot's start position.
25+
* R = right, C = center, L = left.
26+
2. Switch information.
27+
* R = going for the right plate, L = going for the left plate, x = not going for switch
28+
3. Scale information.
29+
* R = going for the right plate, L = going for the left plate, x = not going for scale
30+
4. Exchange.
31+
* E = going for the exchange, x = not going for exchange
32+
33+
Ex:
34+
35+
**LLRx**: starting on the left, go for the switch's left plate and then the scale's right plate. don't go for the exchange.
36+
**Cxxx**: starting in the center, just cross the baseline. don't go for the exchange.
37+
**LxRx**: starting on the left, go for the scale's right plate. don't go for the exchange.
38+
**RLxE**: starting on the right, go for the switch on the left, and then go for the exchange.
39+
40+
41+
# Instruction Reference
42+
43+
<!-- Sorry about how ugly the table is, it's either this or gigantic spacing that also looks ugly if you have word wrap - @kevinzwang -->
44+
45+
| Name | Description | Example Usage |
46+
| --- | --- | ---|
47+
| end | End the script. Anything after will be ignored. | `end` |
48+
| exchange | Feeds a cube at exchange height. | `exchange` |
49+
| intake | Intakes a cube in front of the robot. | `intake` |
50+
| jump | Jumps to the specified script and continues the current script when finished. (Doesn’t make the robot go up.) | `jump MoveToRScale`
51+
| move | Move forward or backwards for the specified amount in inches, relative to the current position. | `move 24` |
52+
| moveto | Move to 1 or more points, sequentially, with an optional last value having a final angle to face towards, all relative to the starting position. | `moveto (12,0) (36,12)` <br> `moveto (0,12) 90` |
53+
| scale | Place a cube at scale height. | `scale` |
54+
| switch | Place a cube at switch height. | `switch` |
55+
| turn | Turn towards a relative point or rotate clockwise by an angle in degrees, relative to the current position. <br> Negative angle for counterclockwise. | `turn (36,48)` <br> `turn 45` |
56+
| wait | Waits for the number of seconds before proceeding to next command. | `wait 5` |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
This package is for commands.
1+
This package is for commands.

Widgets2018/.classpath

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
5+
<classpathentry kind="lib" path="/Robot2018/lib/jars/SmartDashboard.jar"/>
6+
<classpathentry kind="output" path="bin"/>
7+
</classpath>

Widgets2018/.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Widgets2018</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11+
org.eclipse.jdt.core.compiler.source=1.8
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package team199.smartdashboard.extensions;
2+
3+
public class AutoChooser {
4+
5+
6+
7+
}

0 commit comments

Comments
 (0)