search

Severson-Group / AMDC-Firmware

Embedded system code (C and Verilog) which runs the AMDC Hardware
http://docs.amdc.dev/firmware
BSD 3-Clause "New" or "Revised" License
33 stars 6 forks source link

Add REV F support to v1.3 release branch #374

Closed npetersen2 closed 6 months ago

npetersen2 commented 7 months ago

Since v1.3-staging was branched off develop a while back, we need to merge develop back into v1.3-staging to pull in the latest changes, i.e., REV F support, see #367 etc.

codecubepi commented 7 months ago

Moving to Done, I believe @annikaolson and I were able to get this figured out earlier. We can review and close this issue in next week's meeting.

We rebased v1.3-staging off of main, and then created a new user/annikaolson/timing-manager branch off of the rebased v1.3-staging. A PR (#379) has been opened which will merge in the rest of Annika's commits that were on the io-management branch.

@npetersen2 It would be great if you could review #379 soon, so we can merge that into v1.3-staging. This would be nice because then Annika and I can branch off of v1.3-staging and continue working.

npetersen2 commented 6 months ago

Thanks for the update @codecubepi

codecubepi commented 6 months ago

Forgot to close in our meeting on Tue May 7, doing so now.