Skip to content

Commit 2055eb6

Browse files
committed
todo change interfacing microcontroller page. removed forms
1 parent 43fc5cd commit 2055eb6

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

docs/_sections/_guide-home/forms.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,15 @@ nav_order: 5
1010
This page contains direct links and forms that you might need for Robotathon!
1111

1212
{: .highlight}
13-
Please pay Robotathon and RAS dues separately! If you are having financial troubles, please don't hesitate to DM Jeffrey (@ohoftoryoy) on Discord or another leader!
13+
Once you fill out the RAS Membership and Robotathon signup Google Forms, you will be emailed with the payment links sometime after :)
1414
{: .callout-blue}
1515

1616
# Robotathon Links
1717

1818
[Robotathon Linktree](https://linktr.ee/jeffchang0){: .btn .btn-purple }
1919
<br>
20-
[Robotathon Dues Form ($15)](https://hcb.hackclub.com/donations/start/austin-ieee-ras){: .btn .btn-green }
21-
<br>
22-
23-
Here are some more general links for RAS:
24-
25-
[RAS Dues Form ($30)](https://hcb.hackclub.com/donations/start/austin-ieee-ras){: .btn .btn-green }
26-
[RAS Linktree](https://linktr.ee/ut.ras){: .btn .btn-purple }
27-
<br>
2820
[RAS Membership Form](https://docs.google.com/forms/d/e/1FAIpQLSeJyGWffPVdBZgwRRqzeAlxuTWJ3tkK9NteLnWWAL22tK-W8A/viewform){: .btn .btn-blue }
2921
<br>
22+
[RAS Linktree](https://linktr.ee/ut.ras){: .btn .btn-green }
23+
<br>
3024
[RAS Mailing List Form](https://utlists.utexas.edu/sympa/subscribe/ras_members?previous_action=info){: .btn .btn-blue }

docs/_sections/_guide-primaries/getting-started/environment-setup/windows-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ Cloning is the process of copying a Git repository onto your local computer stor
9191
<img src="{{ '/_assets/images/ssh_link_copy.png' | prepend: site.baseurl }}" alt="my_image.png w=200 h=400 :(">
9292
4. Open Git Bash and navigate to where you want to keep your code for the competition, such as your Documents or Desktop. [How do I do that?](https://ut-ras.github.io/RobotathonESP32/technical#how-do-i-navigate-the-git-bash-terminal)
9393
5. Run the following command in your Git terminal: `git clone [PASTE GIT LINK HERE]` without the square brackets
94-
<img src="{{ '/_assets/images/git_authenticity_confirm.png' | prepend: site.baseurl }}" alt="git_authenticity_confirm.png w=200 h=400 :(">
9594
6. You will likely run into Git having an issue with the authenticity. Simply type `yes` and press `Enter`
95+
<img src="{{ '/_assets/images/git_authenticity_confirm.png' | prepend: site.baseurl }}" alt="git_authenticity_confirm.png w=200 h=400 :(">
9696

9797
### __Install USB-UART Bridge Driver__
9898
This allows your computer to recognize and program your ESP32 when you plug it in.

docs/_sections/_guide-primaries/getting-started/git.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,15 @@ At commit B, a new branch called `feature-branch` is created. From this branch,
112112
A **merge conflict** occurs when you try to merge (i.e. git pull) two branches that have made different changes to the same part of a file. Git can't automatically figure out which change to keep, so it needs your help to resolve the conflict.
113113

114114
{: .highlight}
115-
Note that a `git pull` that triggers a merge conflict may open a terminal text editor like Vim or Nano.
115+
116+
Note that a `git pull` that triggers a merge conflict may open a terminal text editor like Vim or Nano.
116117
**For Vim:**
117118
- To save and continue: Press `Esc`, type `:wq`, then press `Enter`
118-
- To abort: Press `Esc`, type `:q!`, then press `Enter`, then run `git merge --abort`
119+
- To abort: Press `Esc`, type `:q!`, then press `Enter`, then run `git merge --abort`
119120
**For Nano:**
120121
- To save and continue: Press `Ctrl+O`, press `Enter`, then press `Ctrl+X`
121122
- To abort: Press `Ctrl+X`, press `N` if prompted to save, then run `git merge --abort`
123+
122124
{: .callout-blue}
123125

124126

docs/_sections/_guide-primaries/getting-started/microcontroller-interface.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ parent: Getting Started
66
nav_order: 4
77
---
88

9+
TODO: elaborate on analog / digital signals
10+
11+
912
# Microcontroller Interfacing
1013
Microcontrollers are cool and all, but they’re a lot more interesting when you can use them to do stuff in the real world! You can connect all sorts of devices to the ESP32 microcontroller to do whatever your heart desires.
1114

@@ -25,10 +28,10 @@ Warning: Be careful to not short (connect) a power pin directly to a ground pin.
2528
{: .callout-red}
2629

2730
## Powering the ESP32
28-
You can power your ESP32 by 2 methods: portable battery or laptop USB connection.
31+
You can power your ESP32 by 2 methods: Micro-USB power or portable power bank
2932

3033
### USB Connection Power
31-
The USB connection to your computer is necessary for uploading and debugging your code through the serial monitor. It would be easiest to keep using the USB connection until later in the competition when testing the entire system.
34+
The USB connection to your computer is necessary for uploading and debugging your code through the serial monitor (i.e. print statements). It would be easiest to keep using the USB connection until later in the competition when testing the entire system.
3235

3336
### External Power Source
3437
Using the external portable battery is detailed in the [Powering the System page](https://ut-ras.github.io/RobotathonESP32/sensors-and-actuators/power) because we will be using the USBC breakout board's 5V output to power the ESP32.

0 commit comments

Comments
 (0)