Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed beacon timeout handling. #3

Merged
merged 9 commits into from
Nov 5, 2020
Merged

Conversation

raufaser
Copy link

@raufaser raufaser commented Nov 1, 2020

I am using the time library and convert the gps time to unix timestamp. Now it is possible to use beacon timeout of any number of minutes. E.g. 300 = 5 hours.

closes #2

@peterus
Copy link
Member

peterus commented Nov 3, 2020

thanks for the pull request, i never got it perfectly running. I did some updates on mainline as there was a lot of maintenance missing in the last time.
Can you update your pull request with the last changes? - otherwise I can also add your changes, but than your name will not appear here which would be a pity

@raufaser
Copy link
Author

raufaser commented Nov 3, 2020

tbh I have no idea how to do that. In theory it is absolutely clear to me what to do. I have to merge your new commits with my commit. I guess I have to learn a lot about git and how to use it in Visual Studio Code. A lot of the teminology is still unclear to me. But I am willing to learn :)

@peterus
Copy link
Member

peterus commented Nov 3, 2020

if you have access to a console try this commands:

git remote add upstream https://github.com/lora-aprs/LoRa_APRS_Tracker.git
git fetch upstream
git rebase upstream/master

there is a high possibility that you will get merge conflicts, you can solve them very easy with visual studio code.
make a new commit and push it.

there is a high possibility that you have to force the push:

git push -f origin master

@raufaser
Copy link
Author

raufaser commented Nov 5, 2020

Well. I gave my very best :) Thanks for the explanation.

@peterus peterus merged commit 919fdd3 into lora-aprs:master Nov 5, 2020
@uhrbach uhrbach mentioned this pull request Jul 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Beacon timeout handling error
2 participants