Skip to content

Commit

Permalink
Merge pull request opulo-inc#3 from index-machines/master
Browse files Browse the repository at this point in the history
Merging current code from source
  • Loading branch information
darigovresearch authored May 8, 2021
2 parents a08379a + eb9d0d1 commit 2d834c6
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/mobo-bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ assignees: G-Pereira, sphawes, daveismith
- What isn't working?
- What does it prevent or degrade?
- What have you done to diagnose that it is a hardware issue?
- Attach supporting files like software logs / scope images / logic captures / annotated scematic or pcb drawings.
- Attach supporting files like software logs / scope images / logic captures / annotated schematic or pcb drawings.

**Suggested Fix:** Talk about how you think this should be fixed.
- What does the fix entail?
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/mobo-enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: G-Pereira, sphawes, daveismith

**Motherboard Revision:** What motherboard version is this enhancement suggested for. If you have one, this should be on the front of your board in the format REV### or REV###-???????

**Enhancement Description:** Talk about the enhanement you want.
**Enhancement Description:** Talk about the enhancement you want.
- Does it enable a new feature?
- Will it affect existing features?
- Have you prototyped it successfully?
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Contributing
If you would like to contribute to the project, awesome! Here's some general guidelines for how to participate in development:

* Pull Requests should only be made for software and electrical changes. The CAD for the Index currently lives in Fusion 360, which does not play nice with git. If you have a change you'd like to make to the CAD, file an issue using the "CAD Update" template. Go to the "Issues" tab, click "New issue," click "Get started" in the CAD Update box, then fill in your issue information. This is currently clunky, but currently the mechanical CAD for the Index is in the process of being switched to FreeCAD and will be tracked in git along with everything else.
* PRs should be self-contained nuggets of improvement. Each commit to master should stand alone as a viable Index build.
* Please be as descriptive as possible about your PR and what it is you changed. If your PR represents an actual test you did on a build you're doing yourself, awesome! Please include any information about how the update performed on your build.
* Ensure that your PR is adhering to the general system architecture outlined in "System Overview" in the README. For example, don't file a PR that switches all feeder communication to SPI, or removes a huge feature from the machine. Systemic changes are decided in the [STR Discord Server](https://discordapp.com/invite/TCwy6De). If you'd like to weigh in on those decisions or help make them, feel free to pop in!
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The Index is controlled with [OpenPnP](https://github.com/openpnp/openpnp). Open
The motherboard communicates with the feeders over RS-485. After the feeder receieves a command from the motherboard, it sends a confirmation or error message back. This is then sent back to OpenPnP. Situations where the feeder would send an error message back would be a tape runout or jam.

## Documentation
Documentation is currently hosted [here](https://docs.index-machines.com/docs/), it's still a work in progress with some preliminary build instructions and contributions are welcome.
Documentation is currently hosted [here](https://docs.indexmachines.io/docs/), it's still a work in progress with some preliminary build instructions and contributions are welcome.

## Contributing
If you would like to contribute to the project, awesome! Check out the [contributing page](CONTRIBUTING.md) to get started.
Expand Down
45 changes: 0 additions & 45 deletions pnp/bom.csv

This file was deleted.

0 comments on commit 2d834c6

Please sign in to comment.