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.

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

rebase _index.md PR #320 #345

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

rebase _index.md PR #320 #345

wants to merge 11 commits into from

Conversation

inindev
Copy link
Contributor

@inindev inindev commented Apr 22, 2023

This is the rebase that was requested from PR 320: #320

Signed-off-by: John Clark inindev@gmail.com

aykevl and others added 11 commits March 11, 2023 21:23
This step wasn't included, which will lead to errors when TinyGo is
built using `go install`.
In 4 subsections:

1) Writing to the serial port using fmt.Print(), fmt.Println(), and the
   built-in functions print() and println(). Explain flash memory consumption
   of `fmt` package.
2) Running `tinygo monitor` to see the output on the host computer.
3) Reading from the serial port.
4) Alternative serial monitors (Arduino IDE, pyserial, picocom).
Address review comments:
* Add COM1 and COM31 for Windows
* Add `tinygo monitor -baudrate=9600` for AVR processors
* Fix couple of grammar typos.
* Add explanation of "baud rate".
* Add instructions to use `flash -x` flag to see the port of the
  microcontroller.
Expanded the 'Serial Monitor on Host Computer` section into multiple
subsections:

* monitor subcommand
* -monitor flag
* Baud Rate
* Serial Port on Host
* Multiple Microcontrollers

The 'Serial Monitor on Host Computer' section is now LOT longer than I had
originally intended, I had intended to only give an entry-level usage of
`tinygo monitor` just to get a newcomer started on serial monitors. But I guess
this is the only place where the 'tinygo monitor' subcommand is explained, so
we are tempted to describe all of its conveniences.

Moved some material in 'Alternative Serial Monitors' section into the above
subsections for better flow.
This is necessary for WebAssembly.
I totally forgot about this one! So here it is.
reference/usage/subcommands: Document the `tinygo monitor` subcommand. And the `-monitor` flag on the
`tinygo flash` command.
Signed-off-by: John Clark inindev@gmail.com
@aykevl
Copy link
Member

aykevl commented Apr 26, 2023

It looks like something didn't quite work well in the rebase, as there are a lot of unrelated commits.
I believe you can fix this by running git rebase -i dev, and deleting all comments except for the last one (by you). Then exit the editor and fix any merge conflicts that may come up. When you're ready, try git diff dev to check that it only includes your changes and they look correct. When it looks correct, you can push your changes using git push -f.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants