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

Commit c9657e3

Browse files
committed
small tweaks to documentation
1 parent f66c616 commit c9657e3

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To build the c++ documentation, we use a custom Doxygen config. To use this conf
2222
doxygen ./doxygen.config
2323
```
2424

25-
To build the Controller Layout files, run this command (`python3` may need to be changed to `python`):
25+
To build the Controller Layout files, run this command (`python3` may need to be changed to `python`or `py3` depending on the system):
2626
```sh
2727
python3 ./buildcml.py ./controller_layout.cml.json
2828
```

docs/devices.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
| Drivetrain left front encoder | Encoder | DriveTrain | Not Used | N/A | 1 |
1414
| Drivetrain right front encoder | Encoder | DriveTrain | Not Used | N/A | 1 |
1515
| Slider encoder | Encoder | Slider | Not Used | N/A | 1 |
16-
| Slider left hall effect | Hall effect | Slider | Detects when slider hits left limit | Waiting for tests | 7 |
17-
| Slider right hall effect | Hall effect | Slider | Detects when slider hits right limit | Waiting for tests | 7 |
18-
| Slider centre hall effect | Hall effect | Slider | Detects when slider centred | Waiting for tests | 7 |
19-
| Legs home hall effect | Hall effect | Climb | Detects when legs are in normal position | Waiting for tests | 5 |
20-
| Legs cargo hall effect | Hall effect | Climb | Detects when legs are in cargo lowered position | Waiting for tests | 9 |
21-
| Legs climb hall effect | Hall effect | Climb | Detects when legs are fully extended | Waiting for tests | 9 |
22-
| Arms deployed hall effect | Hall effect | Climb | Detects when arms are fully deployed | Waiting for tests | 9 |
23-
| Arms retracted hall effect | Hall effect | Climb | Detects when arms are fully retracted | Waiting for tests | 7 |
16+
| Slider left hall effect | Hall effect | Slider | Detects when slider hits left limit | Done | 7 |
17+
| Slider right hall effect | Hall effect | Slider | Detects when slider hits right limit | Done | 7 |
18+
| Slider centre hall effect | Hall effect | Slider | Detects when slider centred | Done | 7 |
19+
| Legs home hall effect | Hall effect | Climb | Detects when legs are in normal position | Done | 5 |
20+
| Legs cargo hall effect | Hall effect | Climb | Detects when legs are in cargo lowered position | Done | 9 |
21+
| Legs climb hall effect | Hall effect | Climb | Detects when legs are fully extended | Done | 9 |
22+
| Arms deployed hall effect | Hall effect | Climb | Detects when arms are fully deployed | Done | 9 |
23+
| Arms retracted hall effect | Hall effect | Climb | Detects when arms are fully retracted | Done | 7 |
2424
| Rangefinder | Optical sensor | Climb | Detects when robot is above the L3 HAB platform | In development | 7 |
2525
| Vision camera | Webcam | Vision | Detects location of nearest port | Done | 0 |
26-
| Driver camera | Webcam | Vision | Gives drivers a view of robot | Waiting for tests | 9 |
26+
| Driver camera | Webcam | Vision | Gives drivers a view of robot | Done | 9 |

shuffleboard.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,12 @@
539539
"_title": "Solenoid[11,0]/Value",
540540
"Colors/Color when true": "#7CFC00FF",
541541
"Colors/Color when false": "#8B0000FF"
542+
},
543+
{
544+
"_type": "Speed Controller",
545+
"_source0": "network_table:///LiveWindow/Ungrouped/Spark[2]",
546+
"_title": "Spark[2]",
547+
"Visuals/Orientation": "HORIZONTAL"
542548
}
543549
]
544550
}
@@ -738,11 +744,11 @@
738744
],
739745
"content": {
740746
"_type": "Camera Stream",
741-
"_source0": "camera_server://flipped",
742-
"_title": "flipped",
747+
"_source0": "camera_server://Vision",
748+
"_title": "Vision",
743749
"Crosshair/Show crosshair": true,
744750
"Crosshair/Crosshair color": "#FFFFFFFF",
745-
"Controls/Show controls": true,
751+
"Controls/Show controls": false,
746752
"Controls/Rotation": "NONE",
747753
"compression": -1.0,
748754
"fps": -1,

0 commit comments

Comments
 (0)