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.

Sign up for GitHub

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

Jump to bottom

Switch to v2 #409

Merged
merged 104 commits into from
Sep 14, 2023
Merged

Switch to v2 #409

merged 104 commits into from
Sep 14, 2023

Conversation

Achllle
Copy link
Collaborator

@Achllle Achllle commented Sep 14, 2023

Since the old version is tagged at v3.1.0, I changed opinion and want to merge v2 into master anyways. At a later point we can decide to potentially rename to main. I think having main and master would be confusing. The releases page shows v1 vs v2 pretty clearly.

Achllle and others added 30 commits November 5, 2022 17:10
@Achllle
Couple of image changes to make it clear this page is about the next …
062ca53 
…gen rover (v2)
@Achllle
Generate parts list readme from csv files
580d05e
@Achllle
Create GH action for parsing parts lists
b4c1422
@sethfischer @Achllle
Build site with MkDocs
4f53656 
Closes #317
@Achllle
can have floating value reqs
fa4bf1f
@Achllle
Only run on pull_request (or on direct push to master,v2) so that the…
d625a17 
… commit gets added directly to the PR
@Achllle
add missing permission
1be49a4
@Achllle
typo
a5529b7
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
c5929cb 
https://github.com/nasa-jpl/open-source-rover/actions/runs/4905392732
@Achllle
Merge pull request #387 from nasa-jpl/update-generated-files-a5529b76…
037ed8e 
…b889944fae6756a8dc6cca375d51a8d5-7

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
cast to int
b76a92f
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
0fe7ffd 
https://github.com/nasa-jpl/open-source-rover/actions/runs/4905401809
@Achllle
Merge pull request #388 from nasa-jpl/update-generated-files-b76a92fe…
5276af9 
…74caf451bc479b3440c35bfb33119e4b-9

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
Add two more 32mm id spacer packs
ca5d47b
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
081d4b8 
https://github.com/nasa-jpl/open-source-rover/actions/runs/4964113615
@Achllle
Merge pull request #389 from nasa-jpl/update-generated-files-ca5d47b6…
76ddc52 
…56eecd1d2b3b192788f63e967509f9f0-11

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
OnShape link update
0c4d72c
@Achllle
Merge branch 'master' of https://github.com/nasa-jpl/open-source-rover …
5954dcb 
…into v2
@Achllle
Clean up main readme a bit
953601a
@Achllle
Remove outdated cad files
c0c87c3
@Achllle
Add in progress note
7da36b9
@Achllle
Rough work on build instructions, mostly mechanical
6113a69
@Achllle
Add body plate parts and files
07a4405
@Achllle
Fix commas in parts list
5aeb799
@Achllle
Update parts_list.csv
fbb5afc
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
448d232 
https://github.com/nasa-jpl/open-source-rover/actions/runs/5373559436
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
a3fe592 
https://github.com/nasa-jpl/open-source-rover/actions/runs/5373560955
@Achllle
Merge pull request #392 from nasa-jpl/update-generated-files-fbb5afc9…
e4e6683 
…29378529d376a2901822da30840f2f3b-20

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
Merge pull request #391 from nasa-jpl/update-generated-files-5aeb799d…
3b3a741 
…4da5bd435480829c45bcf3707396447d-19

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
Add 2-beam, remove endcap
e44fc00
BaeHenryS and others added 25 commits July 27, 2023 21:04
@BaeHenryS
Revert "Merge branch 'v2' of https://github.com/BaeHenryS/open-source…
4964627 
…-rover into v2"

This reverts commit 4724958, reversing
changes made to 8829a77.
@BaeHenryS
Revert "Removed wire link for now"
78860a7 
This reverts commit 8829a77.
@BaeHenryS
Removed Wire Links for Now
b6aed49
@BaeHenryS
Spacing Fix
bc64d7a
@BaeHenryS
Ran csv_to_md.py
e4313e0
@Achllle
dashes to asterisks
95c866b
@Achllle
Merge pull request #405 from BaeHenryS/v2
475c24e 
Added missing extra parts into V2 Partslist
@github-actions
Generated by GitHub Actions (Parse parts lists / generate_md)
46f5314 
https://github.com/nasa-jpl/open-source-rover/actions/runs/5707275999
@Achllle
Merge pull request #406 from nasa-jpl/update-generated-files-475c24e0…
2a3e6de 
…8ae235ef3f7792f632b1d3e5a271abde-66

Generated by GitHub Actions (Parse parts lists / generate_md)
@Achllle
Remove integration folder, docu for mech integration, added images
85810af
@Achllle
Add image with cabling result for rocker-bogie
4a2e1e0
@apollokit
Removing old v1 files
53d3c90
@Achllle
Update rover image ppt
818cff4
@BaeHenryS
Formatting changes for clarity
26d5ef8
@BaeHenryS
Merge branch 'v2' of https://github.com/BaeHenryS/open-source-rover i…
86a2dcb 
…nto v2
@apollokit
Merge pull request #396 from apollokit/pcb2_merge
56d529b
@Achllle
Merge pull request #407 from BaeHenryS/v2
d25869b 
Minor formatting changes for clarity
@Achllle
Main readme minor updates
49c8fcb
@Achllle
Move pcb readme to pcb folder, add instructions for configuring roboc…
7037209 
…laws
@Achllle
Merge remote-tracking branch 'upstream' into v2
53818cb
@Achllle
Add link to prev version of OSR
533961a
@Achllle
Add link to youtube video showing OSRv2 roving around
4be800d
@Achllle
Remove todo
140a270
@Achllle
Merge branch 'v2' into roboclaw_settings
be43a27
@Achllle
Merge pull request #408 from Achllle/roboclaw_settings
94fd66f 
Add Roboclaw settings to readme
@Achllle Achllle self-assigned this Sep 14, 2023
@Achllle Achllle merged commit 85078c2 into master Sep 14, 2023
2 checks passed
@Achllle Achllle deleted the v2 branch September 14, 2023 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apollokit apollokit Awaiting requested review from apollokit

@ericjunkins ericjunkins Awaiting requested review from ericjunkins

Assignees

@Achllle Achllle

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Achllle @sethfischer @apollokit @BaeHenryS