search

RobertK66 / obc_1769_core

Implements hardware abstractions and Layer2(3) modules for usage of the OBC hardware in cubesat projects
GNU General Public License v3.0
1 stars 1 forks source link

Fix git issues with "STP" branch #31

Closed kodsurf closed 1 month ago

kodsurf commented 1 year ago

Due to previously not well understood project maintenance with git (by me) : STP branch is million commits behind dev/master.

Need to synchronize "develop" with "STP" by implementing all the relevant STP features into dev and make pull request.

Further on to avoid this mess - I will be doing feature/< NAME > branch for every new module. And Pull Request as soon as module is finalized.

RobertK66 commented 1 year ago

You can try to merge develop > STP. git normally gives some good starting point to get the differences resolved when same files are changed on both sides.....

RobertK66 commented 1 year ago

I can show you how this works (for #36 after we successfully pull your #34)

RobertK66 commented 1 year ago

ok unfortunatly this was a desaster 🤪 . I managed to merge it after our session. Will prepare some doku on how to do this with eclipse. generated new #37 for this purpose now.

RobertK66 commented 1 year ago

@kodsurf : can we close this? is there something useful left in the STP branch?

kodsurf commented 1 year ago

Nonono Please don't close STP branch for now ! I2c is not yet integrated! And all my usable code is there

I wanted to integrate i2c to dev branch with actual psu code. And not test Arduino. That is why I did not proceed with i2c dev integration yet.

RobertK66 commented 1 year ago

@kodsurf : something more to do here? (The branch will not be touched by closing this issue. So pls. close it if nothing else is to be done here.

RobertK66 commented 1 month ago

stalled and @kodsurf no longer available in proj?

kodsurf commented 1 month ago

Depends on if someone wants to hire me for that :)