Skip to content

Commit b2bd57d

Browse files
committed
Added assets and updated git basics and project page.
1 parent fab38d0 commit b2bd57d

9 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/Deploy_site.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Deploy Site
2-
2+
permissions:
3+
contents: write
34
on:
45
#pull_request:
56
# branches:
8.41 MB
Binary file not shown.
118 KB
Loading
114 KB
Loading
142 KB
Loading
184 KB
Loading
256 KB
Loading

docs/programming/new_project.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,16 @@ Newly created projects have many files within them. We only care about the conte
5959
- An example Command
6060
- **ExampleSubsystem.java**
6161
- An example SubSystem
62-
- **Constants.java** (new in 2020, replaces RobotMap.java)
62+
- **Constants.java**
6363
- Used to map physical ports (digital if using the CAN bus) of sensors or devices connected to the robot and assign them a variable name to be used in other parts of the code.
6464
- This provides flexibility for changing wiring, makes checking the wiring easier, and significantly reduces the number of magic numbers floating around.
6565
- Can also be used to store generic constant values as variables in the code
66+
- This gives a unified place to store and modify values that might be used many places in the code, so they only have to be changes once.
67+
6668
- **Main.java**
6769
- Used for advanced programming
6870
- Will be ignored/left as is for this tutorial
69-
- **RobotContainer.java** (new in 2020, replaces OI.java)
71+
- **RobotContainer.java**
7072
- Used to declare our subsystem
7173
- Used to create a connection between commands and Operator Interfaces (OI) such as Joysticks or buttons
7274
- **Robot.java**

docs/version_control/BasicGit.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For more information, see the [full reference guide to git commands](https://git
5454
## Git Log
5555

5656
>Git log is a tool to view your history in Git. By default Git Log shows all of the commits in the repository, ordered from newest to oldest. in VSCode, the graph panels shows the Git log/History in a visual way.
57-
![Graph view in VS code](../assets/git_graph_vscode.png)
57+
![Graph view in VS code](../assets/images/vscode_tips/git_graph_vscode.png)
5858

5959
## Github Setup
6060

@@ -65,7 +65,7 @@ Github is a website that hosts Git repositories. The Robolancers store all of th
6565

6666
## Examples
6767

68-
![A simple demonstration of committing and pushing some changes in git](../assets/GitExample.png)
68+
![A simple demonstration of committing and pushing some changes in git](../assets/images/vscode_tips/GitExample.png)
6969

7070
- Typing `git add .` then `git commit -m "commit name"` then `git push` is the bread and butter of using Git.
7171
This sequence tells Git to collect all of your uncommitted changes, commit them, then push them to Github.
@@ -76,22 +76,22 @@ Github is a website that hosts Git repositories. The Robolancers store all of th
7676
- `git status` displays the current branch and what changes you have uncommitted and staged
7777
- `git pull` updates the code on your device with the latest code from Github.
7878
Recommended to do this whenever someone else has been working on the same branch, otherwise you might make conflicting changes
79-
- [A simple demo video of committing some changes](../assets/GitDemoVideo.mp4)
79+
- [A simple demo video of committing some changes](../assets/images/vscode_tips/GitDemoVideo.mp4)
8080

8181
## Managing Git in Vscode
8282

8383
### Git Commands in Vscode GUI
8484

85-
![Git commands in vscode GUI](../assets/git_vscode.png)
85+
![Git commands in vscode GUI](../assets/images/vscode_tips/git_vscode.png)
8686

8787
### Git branches menu
8888

8989
Accessed by clicking on the branch name at the bottom left
90-
![Github branch menu in Vscode GUI](../assets/github_branch_vscode.png)
90+
![Github branch menu in Vscode GUI](../assets/images/vscode_tips/github_branch_vscode.png)
9191

9292
### Merge in another branch in vscode
9393

94-
![Github Merge menu](../assets/github_GUI_Merge.png)
94+
![Github Merge menu](../assets/images/vscode_tips/github_GUI_Merge.png)
9595

9696
## Notes
9797

0 commit comments

Comments
 (0)