search

bluerange-io / bluerange-mesh

BlueRange Mesh (formerly FruityMesh) - The first completely connection-based open source mesh on top of Bluetooth Low Energy (4.1/5.0 or higher)
https://bluerange.io/
Other
288 stars 109 forks source link

AppUart Module for Communication with Smartphones #180

Closed nishinohi closed 2 years ago

nishinohi commented 3 years ago

Adjusted so that modules proposed in #176 issue can be merged. Please let me know if there are any problems with the content.

nishinohi commented 2 years ago

Merged the latest content and confirmed that it works.

siretty commented 2 years ago

Hello @nishinohi,

again sorry for taking so long, vacation and being busy with other work were the main issues on our side. So I tested your most recent changes and had another look at the app. Personally I'm really happy, we will however also let a colleague review the changes internally before merging.

Due to the way we handle merges, we can not merge the PR using the interface from GitHub directly. We will merge it internally (preserving your commits and particularly your name in the Author field of the commits), then update the GitHub repository accordingly when we update it the next time. This may take a while as we work in bi-weekly sprints and only put released versions (tested and running internally for at least two weeks) on GitHub.

I'll also mention now that we may make some small additional changes to the code during the internal review process (renaming some stuff e.g.), these changes will show up in the respective 'Update to version ...' commit, the commits from this PR will be placed inbetween.

Thank you very very much for your work and for the interesing discussions in this PR.

Kind regards Daniel

nishinohi commented 2 years ago

Thank you for confirming the operation. I learned a lot from this too, thank you.

One question: If you can't merge PR in the Github interface, does that mean that my account won't be added to the list of contributors in fruitymesh? If this is the case, what is the best way to explain to someone that this feature is due to me? (I guess one way would be for them to see this PR)

siretty commented 2 years ago

Hi, your (user)name will show up in the list as we will merge your PR manually using the command line.

Your commits will be included in the timeline as included in the PR. We will also leave a note in the PR indicating this explicitly.

In short: your contribution will be visible with the appropriate attribution to you!

mariusheil commented 2 years ago

Hi,

just a quick heads-up. We have just published a new release but your changes are not yet part of it as the latest release is still in our internal review/testing process. If you look at the latest release you will see the attribution to @Brotcrunsher as his changes were merged in earlier.

Could you please squash all your changes into one commit? This will make the commit history a bit cleaner.

Thanks

nishinohi commented 2 years ago

Sorry for the late reply.

I have merged the latest sources. I think it's working correctly, at least in my environment. I hope it will pass your review and testing.

I've squashed the changes. Please let me know if you have any problems.