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
30 stars 5 forks source link

Merge FreeRTOS base code with FPGA I/O timing management code #360

Open npetersen2 opened 4 months ago

npetersen2 commented 4 months ago

We need to merge #358 and #359 from @codecubepi and @annikaolson into v2-staging branch. Once merged, we will test the merged code to make sure everyone is happy. Then, we will merge into v2 branch.

These should have stable code. Once we get these merged, we can branch back off of v2 to continue work on features like ISRs.

npetersen2 commented 4 months ago

We will merge Annika’s FPGA I/O work first (#358) since it will result in a cleaner merge

Then, we will merge Patrick’s Free-RTOS code.

Since Patrick’s code is in a new SDK app, it is completely isolated from Annika’s code…..so the merge will go “smooth,” but nothing will actually be merged.

Finally, the next big task after this "merge" is to actually merge the v1 codebase into the new v2 codebase: