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

Add kitspace files #180

Merged
merged 2 commits into from
Jun 20, 2021
Merged

Add kitspace files #180

merged 2 commits into from
Jun 20, 2021

Conversation

kasbah
Copy link
Contributor

@kasbah kasbah commented Oct 13, 2019

Hey, as discussed in #144, finally got around to making this compatible with kitspace.org.

  • Here is a preview.
  • Along the way I fixed some issues with the BOM/parts list (df517f9) but I couldn't rebuild the PDFs using latex (I am on a case-sensitive file system which meant it can't find the images).
  • I also fixed the spelling of "shield" throughout, though I haven't tested extensively if this rename has caused unforeseen issues (KiCad still seems to open the design fine).
  • I was a bit confused about the "Monolithic Board". Should those files just be deleted?

@mikcox
Copy link
Contributor

mikcox commented Oct 14, 2019

Thanks for your work on this!

Note that the master branch has moved forwards a considerable amount since this was first forked, and a lot of the issues above have already been addressed. Please pull the latest commit from this repository's master branch and merge that into your pull request; I can't merge in a pull request that is based on a commit from so long ago because of the conflicts.

@kasbah
Copy link
Contributor Author

kasbah commented Oct 14, 2019

Hey @mikcox, as far as I can see my branch is based on 974decf and which is the current HEAD of this repo. There are no conflicts. Are you talking about another branch or are there maybe changes not pushed to GitHub yet?

@mikcox
Copy link
Contributor

mikcox commented Oct 14, 2019

My mistake... there aren't any conflicts. I'll take a look at this with @ericjunkins soon.

@kasbah
Copy link
Contributor Author

kasbah commented Oct 18, 2019

I sorted out some issues with the "sheild" to "shield" rename and got rid of whites pace changes that made it harder to review. Heads up: I did force push these changes onto my branch, changing the history (you will need to reset to or checkout kitspace-forks:master if you had previously cloned my branch).

@kasbah
Copy link
Contributor Author

kasbah commented Aug 31, 2020

Hey, anything I can do to help get this merged?

@kasbah
Copy link
Contributor Author

kasbah commented Mar 17, 2021

Should I try and resolve the merge conflicts?

@kasbah
Copy link
Contributor Author

kasbah commented May 6, 2021

I see you put this issue on your roadmap. Maybe we should arrange a time to meet up on a chat to get these changes applied to the main branch?

@apollokit
Copy link
Collaborator

Hey @kasbah , finally getting back to you here....apologies for the forever-delay and leaving you out to hang in the wind. I think Mik got pulled into other things and Eric had milliions of other responsibilities to fulfill for this project. We ought to have responded to you earlier - don't have a good excuse for that. (one thing to note though: you'll definitely get more responsiveness out of us on slack)

Anywho, I'm gonna take this on now and help you get this merged without further delay.

We've changed a bunch in the project organization, so some of your edits are out of date at this point. Nothing disastrous though. Am I correct in thinking that the kitspace.yaml and the BOM csv's are the real substantial changes need for kitspace compatibility?

Also, we ought to branch off of the branch for pcb 2.0 at this point (aka the branch formerly known as revF)

Happy to hop on a chat, though note I'm US pacific time.

@kasbah kasbah changed the title Add kitspace files, fix BOM and spelling issues Add kitspace files May 24, 2021
@kasbah
Copy link
Contributor Author

kasbah commented May 24, 2021

It's no problem. Yes the BOM and yaml were the main changes needed. I have updated this branch to be based on the revF / 2.0 branch with one commit that adds the required files. The BOMs are still the original so I suspect they might be out of date now?

Here is a preview: http://add-rover-2.preview.kitspace.org/

@apollokit
Copy link
Collaborator

Nice, that preview looks great! And yeah, the BOM is out of date at this point - PCB rev2.0 is still a work in progress. But I'll update the BOM(s) for the new rev when it's settled, so no worries.

Copy link
Collaborator

@apollokit apollokit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some clarification needed on files to be changed.

electrical/pcb/control_board/readme.md Outdated Show resolved Hide resolved
@kasbah
Copy link
Contributor Author

kasbah commented May 27, 2021

I've rebased this onto the master branch. By the way, I've been developing a tool to help with the BOMs: https://kitspace.org/bom-builder/ If you want to try it out, send me an email and I'll send you a link. (Source code is here, the hosted version is semi-private because we have to pay for the Octopart API.)

@apollokit
Copy link
Collaborator

apollokit commented May 28, 2021

Great, that cleaned it up a lot. One last small thing: can you move the kitspace yaml over to electrical/pcb? Would be good to minimize clutter in the root directory. Then we'll be able to close this out. I'll take a todo to add some documentation about using kitspace.

To be clear, will there be a permanent link for the rover on kitspace.org? What do I do when I update the BOMs? Will you manually refresh the page? Feel free to point me to docs.

And I emailed.

@kasbah
Copy link
Contributor Author

kasbah commented May 28, 2021

The kitspace.yaml currently needs to be in the root. We need to know where to look for it to find everything else.

The Kitspace page will update automatically with this repo (currently every 24 hrs, trying to get the refresh rate up again so will hopefully be quicker in the future).

Emailed you back about the BOM builder. Let me know how you get on with it.

@apollokit
Copy link
Collaborator

Gotcha. Alright, that's fine then. I'll approve

@apollokit apollokit self-requested a review June 4, 2021 05:52
@kasbah
Copy link
Contributor Author

kasbah commented Jun 20, 2021

Hey, thanks for approving. I added some more info and links to the README.

@apollokit apollokit merged commit af0dcb3 into nasa-jpl:master Jun 20, 2021
@apollokit
Copy link
Collaborator

Sweet! Thanks @kasbah !

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.

3 participants