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

Jump to bottom

Switchable controllers #25

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

Switchable controllers #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a8eaf64
added switch controller code
Team138Entropy Dec 9, 2021
05d7d53
switching controllers works :)
GBogonis Dec 11, 2021
5d2b857
added wheel
GBogonis Dec 18, 2021
5580098
added the rc controller thing
GBogonis Dec 18, 2021
f62d78c
Added the other 2 controllers to the switcher(untested)
GBogonis Dec 18, 2021
9aebd56
added some operator controller stuff including a new switcher. also a…
GBogonis Jan 20, 2022
3898143
.
GBogonis Jan 22, 2022
b531430
Controllers work now and smartdashboard stuff is fully working
GBogonis Jan 23, 2022
8d7e7d9
power distribution panel smartdashboard stuff
GBogonis Jan 26, 2022
b64ccd9
power panel is working in smart dashboard :)
GBogonis Jan 27, 2022
3ae8b09
added accelerometer stuff :3
GBogonis Jan 29, 2022
b94e64e
edited layouts :3
GBogonis Jan 29, 2022
7bf086c
small change to shuffle board layout
GBogonis Feb 3, 2022
5d55b03
Big changes to the smartdashboard layout
GBogonis Feb 4, 2022
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
45 changes: 45 additions & 0 deletions .SysId/sysid-window.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"MainWindow": {
"GLOBAL": {
"height": "720",
"maximized": "1",
"style": "0",
"userScale": "2",
"width": "1280",
"xpos": "0",
"ypos": "23"
}
},
"Window": {
"###Analyzer": {
"Collapsed": "0",
"Pos": "527,18",
"Size": "606,876"
},
"###Generator": {
"Collapsed": "0",
"Pos": "-1,18",
"Size": "531,269"
},
"###Logger": {
"Collapsed": "0",
"Pos": "-1,286",
"Size": "530,732"
},
"###Program Log": {
"Collapsed": "0",
"Pos": "527,893",
"Size": "605,125"
},
"Debug##Default": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "400,400"
},
"Diagnostic Plots": {
"Collapsed": "0",
"Pos": "1131,17",
"Size": "790,1000"
}
}
}
5 changes: 5 additions & 0 deletions .SysId/sysid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"SysId": {
"Analysis Type": "General Mechanism"
}
}
255 changes: 255 additions & 0 deletions shuffleboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
{
"tabPane": [
{
"title": "Auto station",
"autoPopulate": false,
"autoPopulatePrefix": "",
"widgetPane": {
"gridSize": 64.0,
"showGrid": true,
"hgap": 16.0,
"vgap": 16.0,
"tiles": {
"0,2": {
"size": [
5,
3
],
"content": {
"_type": "ComboBox Chooser",
"_source0": "network_table:///SmartDashboard/SendableChooser[3]",
"_title": "Auto Mode"
}
},
"0,5": {
"size": [
5,
3
],
"content": {
"_type": "ComboBox Chooser",
"_source0": "network_table:///SmartDashboard/SendableChooser[4]",
"_title": "Drive Controller"
}
},
"0,8": {
"size": [
5,
3
],
"content": {
"_type": "ComboBox Chooser",
"_source0": "network_table:///SmartDashboard/SendableChooser[5]",
"_title": "Operator Controller"
}
},
"5,8": {
"size": [
7,
3
],
"content": {
"_type": "Boolean Box",
"_title": "Auto steer",
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"5,5": {
"size": [
7,
3
],
"content": {
"_type": "Boolean Box",
"_title": "Ball in sight",
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"5,2": {
"size": [
7,
3
],
"content": {
"_type": "Boolean Box",
"_title": "In climbing mode",
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
}
}
}
},
{
"title": "debug",
"autoPopulate": false,
"autoPopulatePrefix": "",
"widgetPane": {
"gridSize": 128.0,
"showGrid": true,
"hgap": 16.0,
"vgap": 16.0,
"tiles": {
"0,2": {
"size": [
3,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/Left Encoder",
"_title": "Left encoder"
}
},
"0,1": {
"size": [
3,
1
],
"content": {
"_type": "Text View",
"_source0": "network_table:///SmartDashboard/Right Encoder",
"_title": "Right encoder"
}
},
"6,1": {
"size": [
3,
3
],
"content": {
"_type": "Gyro",
"_source0": "network_table:///LiveWindow/Ungrouped/ADXRS450_Gyro[0]",
"_title": "Gyro",
"Visuals/Major tick spacing": 45.0,
"Visuals/Starting angle": 180.0,
"Visuals/Show tick mark ring": true,
"Visuals/Counter clockwise": false
}
},
"9,1": {
"size": [
4,
5
],
"content": {
"_type": "PDP",
"_source0": "network_table:///SmartDashboard/power panel",
"_title": "Power panel",
"Visuals/Show voltage and current values": true
}
},
"0,4": {
"size": [
3,
1
],
"content": {
"_type": "Number Bar",
"_title": "Climber",
"Range/Min": -1.0,
"Range/Max": 1.0,
"Range/Center": 0.0,
"Visuals/Num tick marks": 5,
"Visuals/Show text": true
}
},
"0,3": {
"size": [
3,
1
],
"content": {
"_type": "Number Bar",
"_title": "Arm (In \u0026 Out)",
"Range/Min": -1.0,
"Range/Max": 1.0,
"Range/Center": 0.0,
"Visuals/Num tick marks": 5,
"Visuals/Show text": true
}
},
"3,1": {
"size": [
3,
3
],
"content": {
"_type": "Gyro",
"_title": "Shoulder",
"Visuals/Major tick spacing": 45.0,
"Visuals/Starting angle": 180.0,
"Visuals/Show tick mark ring": true,
"Visuals/Counter clockwise": false
}
},
"3,4": {
"size": [
3,
1
],
"content": {
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/In Auto",
"_title": "/SmartDashboard/In Auto",
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"6,4": {
"size": [
3,
1
],
"content": {
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/In Teleop",
"_title": "/SmartDashboard/In Teleop",
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"0,5": {
"size": [
3,
1
],
"content": {
"_type": "Voltage View",
"_source0": "network_table:///SmartDashboard/battery",
"_title": "battery",
"Range/Min": 0.0,
"Range/Max": 15.0,
"Range/Center": 0.0,
"Visuals/Orientation": "HORIZONTAL",
"Visuals/Number of tick marks": 5
}
},
"3,5": {
"size": [
6,
1
],
"content": {
"_type": "3-Axis Accelerometer",
"_source0": "network_table:///LiveWindow/Ungrouped/BuiltInAccel[0]",
"_title": "3-Axis Accelerometer",
"Accelerometer/Range": "k16G",
"Visuals/Show value": true,
"Visuals/Precision": 2,
"Visuals/Show tick marks": false
}
}
}
}
}
],
"windowGeometry": {
"x": -8.0,
"y": -8.0,
"width": 1936.0,
"height": 1056.0
}
}
1 change: 0 additions & 1 deletion src/main/java/frc/robot/OI/JoystickController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public static synchronized JoystickController getInstance() {
button11_L = new JoystickButton(leftJoy, 11);
public double getZJoyStick_L() {
return leftJoy.getZ();

}
public double getXJoyStick_L() {
return leftJoy.getX();
Expand Down
Loading