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

Ofir #8

Open
wants to merge 49 commits into
base: main
Choose a base branch
from
Open

Ofir #8

Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
5ad3e66
Constants
ofirKAMInetsky Nov 9, 2023
8e2b938
Update ArmConstants.java
ofirKAMInetsky Nov 9, 2023
99e624e
Update ArmConstants.java
ofirKAMInetsky Nov 9, 2023
8769ff4
updated ArmConstants
ofirKAMInetsky Nov 13, 2023
7a39af8
updated ArmConstants
ofirKAMInetsky Nov 13, 2023
8128bdf
updated ArmConstants.java
ofirKAMInetsky Nov 13, 2023
2328764
Update ArmConstants.java
ofirKAMInetsky Nov 13, 2023
28a7ab0
FIX
ofirKAMInetsky Nov 13, 2023
82882a0
FIX
ofirKAMInetsky Nov 13, 2023
99805bb
changed the names
ofirKAMInetsky Nov 14, 2023
773f4f3
___FIXED___
ofirKAMInetsky Nov 14, 2023
113172a
Update ArmConstants.java
ofirKAMInetsky Nov 14, 2023
cb29753
Update ArmConstants.java
ofirKAMInetsky Nov 15, 2023
b5f06cb
Update ArmConstants.java
ofirKAMInetsky Nov 15, 2023
b10639e
Create ArmSubsystem.java
ofirKAMInetsky Nov 16, 2023
75998fa
Update ArmConstants.java
ofirKAMInetsky Nov 16, 2023
50fbce0
____added___motors___
ofirKAMInetsky Nov 16, 2023
b75612e
made it static
ofirKAMInetsky Nov 16, 2023
32bb477
Update ArmSubsystem.java
ofirKAMInetsky Nov 16, 2023
ca981c8
==!!!___updated___!!!==
ofirKAMInetsky Nov 16, 2023
2385256
i dont know what it is
ofirKAMInetsky Nov 16, 2023
1dcd1e4
added angle methods
ofirKAMInetsky Nov 16, 2023
1372f92
I added the profile of the elevator
ofirKAMInetsky Nov 17, 2023
656b3d8
corrected the last profile generate
ofirKAMInetsky Nov 17, 2023
2227ae3
added and fixed things
ofirKAMInetsky Nov 19, 2023
f8d3f49
Update Arm.java
ofirKAMInetsky Nov 19, 2023
aa18345
Fixed .run folder
ofirKAMInetsky Nov 19, 2023
41faad4
Fixed the .gitignore file
ofirKAMInetsky Nov 19, 2023
097d24d
Revert "Fixed .run folder"
ofirKAMInetsky Nov 19, 2023
fc7840a
Fixed the .run folder
ofirKAMInetsky Nov 19, 2023
bb4e12b
Update Arm.java
ofirKAMInetsky Nov 19, 2023
6586e6d
Update ArmConstants.java
ofirKAMInetsky Nov 19, 2023
847ed6d
fixed something
ofirKAMInetsky Nov 19, 2023
b19c37d
fix
ofirKAMInetsky Nov 19, 2023
14a9e97
!@#$%^&*()_FIX_)(*&^%$#@!
ofirKAMInetsky Nov 19, 2023
2aa4458
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!--FIX--!!!!!!!!!!!!!!!!!!…
ofirKAMInetsky Nov 19, 2023
a35019b
FFFFFFFFFFFFFIXXXXXXXXXXXXXXX
ofirKAMInetsky Nov 19, 2023
2f10641
Update Arm.java
ofirKAMInetsky Nov 19, 2023
ddae22a
Update Arm.java
ofirKAMInetsky Nov 20, 2023
a8023f9
Merge branch 'main' into arm
ofirKAMInetsky Nov 23, 2023
77bd329
-=+=-__FIX__added the Deferred Command__FIX__-=+=-
ofirKAMInetsky Nov 23, 2023
6e55d4c
updated and fixed
ofirKAMInetsky Nov 23, 2023
7a8efe6
Update Arm.java
ofirKAMInetsky Nov 23, 2023
fc4b2b5
Update Arm.java
ofirKAMInetsky Nov 26, 2023
71b1adb
Update Arm.java
ofirKAMInetsky Nov 26, 2023
a5dc6d7
Update Arm.java
ofirKAMInetsky Dec 4, 2023
aecf2a1
Update Arm.java
ofirKAMInetsky Dec 17, 2023
af693b1
Update Arm.java
ofirKAMInetsky Dec 20, 2023
6f5dbc0
Moved all the commands ArmCommands class.
ofirKAMInetsky Dec 29, 2023
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
26 changes: 24 additions & 2 deletions .run/Build & Deploy Robot for Debugging.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -40,7 +40,29 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PdebugMode=true" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
26 changes: 24 additions & 2 deletions .run/Build & Deploy Robot.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -40,7 +40,29 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
26 changes: 24 additions & 2 deletions .run/Build Robot.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -40,7 +40,29 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="build" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
27 changes: 25 additions & 2 deletions .run/Clean Build & Deploy Robot for Debugging.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -42,7 +42,30 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build &amp; Deploy Robot for Debugging" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PdebugMode=true" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="clean" />
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
27 changes: 25 additions & 2 deletions .run/Clean Build & Deploy Robot.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -42,7 +42,30 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build &amp; Deploy Robot" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="clean" />
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
27 changes: 25 additions & 2 deletions .run/Clean Build Robot.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -42,7 +42,30 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean Build Robot" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="clean" />
<option value="build" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
26 changes: 24 additions & 2 deletions .run/Clean.run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean" type="GradleRunConfiguration" factoryName="Gradle">
Expand All @@ -40,7 +40,29 @@
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
<configuration default="false" name="Clean" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="clean" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
12 changes: 9 additions & 3 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"type": "java",
"name": "Launch Main",
"request": "launch",
"mainClass": "frc.trigon.robot.Main",
"projectName": ""
},
{
"type": "wpilib",
"name": "WPILib Desktop Debug",
"request": "launch",
"desktop": true,
"desktop": true
},
{
"type": "wpilib",
"name": "WPILib roboRIO Debug",
"request": "launch",
"desktop": false,
"desktop": false
}
]
}
Loading