bastibl
commented
9 years ago Hui that's a lot :-) First thank you for this great work and for opening the pull request! It will take me some time to look at the code, but since it is mostly an addition of a new phy I see no reason not to merge it. (It also breaks some things to get compatible with gr_modtool, but I think that's worth it). The history is really a bit cluttered so it would be cool if you could restructure it a bit (then it's also easier to review). You have at least two options to do that:
- You could do a
git rebase --interactive bastibl/masterthen you can reorder commits, merge commits (if you did something wrong and fixed it later you can merge these changes to a single correct commit), and change the commit message. - If that's too complicated you could also do a mixed reset. Then your head is at bastibl/master and your working tree corresponds to your master. Then you can begin to stage stuff into the index and create commits. With this you create a different chain of commits (i.e. history) that ends up in the same tree.
So, just tell me if you want to clean up the history a bit then I can go ahead and merge it. Thanks again!
fwunsch
Hi!
I am now (more or less) finished with my thesis and want to offer to merge my work. It comprises the CSS PHY as hier block as well as some transceiver flow graphs. Over-the-air tests with the CSS PHY were successful, although the sample rate was drastically reduced (1M instead of 32M Hz). I renamed some of the OQPSK blocks to make clear which block implements what. My own fork also has a folder with simulations of different interference scenarios and the MAC layer, but I removed them for this merge as I didn't see much sense in having them for this repo.
If you have questions or would like some changes to the code before merging, just tell me!
Greetings, Felix
PS: I'm not much of a Git expert, if there's a way to combine those many commits into one, I'm happy to do that.