search

BerndCirotzki / raymarine_autopilot_pi

Raymarine Autopilot Plugin for OpenCPN
GNU General Public License v3.0
7 stars 7 forks source link

2.0.0.3 + TP1.0.286.2 + opencpn-libs #28

Closed rgleason closed 10 months ago

rgleason commented 10 months ago

Bernd, Bdbcat and I have been working on your plugin. We forked it Nov 16 https://github.com/bdbcat/raymarine_autopilot_pi/commit/839179e4cfff9f785c3ead003f6a72a8adbe282c

and now there are 2 additional commits which make conflicts with merging. Can you please resolve them? ..and let us know when they are resolved, so we can update the plugin to a simpler version number like 2.0.1 and release that to the catalog?

Meanwhile we are releasing this version 2.0.0.3 which fixes some builds and removes O5.6 builds because it is API118 now. Thanks very much.

BerndCirotzki commented 10 months ago

Hello Rick, sorry, but I can not resolve the conflicts. I think you could do when wouId make a PR to you, because you have the old stuff ! the only think I can do is to change the "CMakelist.txt" file compatibel to yours before.

rgleason commented 10 months ago

I can resolve the CmakeLists.txt conflicts. However you must make the po changes through crowdin, you cannot make them directly or they will get overwritten every time by crowdsource. I can merge these po translations perhaps... but you will loose them all again, unless they translations are made in crowdsource. Write Hakan and sign up for it. Let me know when the translations are in crowdsource and Hakan can make a pr to somewhere. Regarding the autopilot.cpp changes I am not sure what to do, please advise.

Please note I do not have time for resolving conflicts every time!! and it is sometimes a very big challenge.

BerndCirotzki commented 10 months ago

I can resolve the CmakeLists.txt conflicts. ... this is not the problem, i can also.

However you must make the po changes through crowdin, you cannot make them directly or they will get overwritten every time by crowdsource. ... yes, I know, but I am not making an uploads to crowdin. I think it's your part to do this, because you know how to.

I can merge these po translations perhaps... but you will loose them all again, unless they translations are made in crowdsource. ... yes, in this case Opencpn's concept problem, not mine.

Write Hakan and sign up for it. ... Why are are you not doing it yourself, when you know how it works. I don't know.

Let me know when the translations are in crowdsource and Hakan can make a pr to somewhere. ... Where is the "exact description" to do this? step by step.

Regarding the autopilot.cpp changes I am not sure what to do, please advise. ... only little corrections. But "po" files and "cpp" belong together. The rest is not my part and I will accept in PR from you.

rgleason commented 10 months ago

Bernd, a misunderstanding, I don't do language and have never done it. I will ask Hakan who has always been very helpful. -- You are the guy with the translation skills (:-)))

BerndCirotzki commented 10 months ago

Ok, then I (we) will do the following .... I merge your PR with the conflicts. After that, I update only the "cpp" and ".h" files and make a PR to you. I think this (hope) will not make conflicts than. After that now, I update my po and pot files. and then ... my problem ... how to contact Hakan ?? to put my pot and po files to crowdin ? or, one more PR only for po and pot ? or better ... you contact him ...

rgleason commented 10 months ago

Bernd, I have written Hakan. Lets wait for his response. I don't want to screw up your work!!! I think I can resolve the conflicts once I know what to do with language. OK?

Don't merge it!!

rgleason commented 10 months ago

Don't merge it. OK?

BerndCirotzki commented 10 months ago

OK

27.12.2023 18:17:48 Rick Gleason @.***>:

Don't merge it. OK?

— Reply to this email directly, view it on GitHub[https://github.com/BerndCirotzki/raymarine_autopilot_pi/pull/28#issuecomment-1870488675], or unsubscribe[https://github.com/notifications/unsubscribe-auth/AHU3PHDFEWO6I3UWR7DDN6DYLRJ3NAVCNFSM6AAAAABBDUPMPSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZQGQ4DQNRXGU]. You are receiving this because you commented. [Verfolgungsbild][https://github.com/notifications/beacon/AHU3PHAE5SGPEPATN27DEWTYLRJ3NA5CNFSM6AAAAABBDUPMPSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPPVSGG.gif]

rgleason commented 10 months ago

Bernd, I think I did it ok, but there were 14 items in autopilot.cpp to resolve. Would you mind checking that to see if I did it ok?

And once you decide to merge, I will make a Pull Request back to mine so that we are in sync.

BerndCirotzki commented 10 months ago

I Take a look tomorrow.

28.12.2023 20:56:17 Rick Gleason @.***>:

Bernd, I think I did it ok, but there were 14 items in autopilot.cpp to resolve. Would you mind checking that to see if I did it ok?

— Reply to this email directly, view it on GitHub[https://github.com/BerndCirotzki/raymarine_autopilot_pi/pull/28#issuecomment-1871452100], or unsubscribe[https://github.com/notifications/unsubscribe-auth/AHU3PHA55LVVVQBN3UUB2DDYLXFFNAVCNFSM6AAAAABBDUPMPSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZRGQ2TEMJQGA]. You are receiving this because you commented. [Verfolgungsbild][https://github.com/notifications/beacon/AHU3PHAWLGLAL3Z6HSUA5XTYLXFFNA5CNFSM6AAAAABBDUPMPSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPRQL4I.gif]

BerndCirotzki commented 10 months ago

Ok Rick everything you did is OK ! autopilot.cpp is also OK ... it has only some different encodings that don't matter. pot is also OK, Hakan can be notified.

But !!! now the problem is, cmake (3.25 and 3.28) is not working any more. I testet it with downloading your repro. there is somewhere an error in new files in ... opencpnlib, crowdin ... or somewhere else, I don't know. try youself !

I tested this in this way, because I had the same problem before, only when adding the new myself downloaded "opencpnlib" to my local code. So I switch back.

I think this must be repaired first. Tell that to the right person how is developing this parts. When I merge it now, I would have that error in my repro.

BerndCirotzki commented 10 months ago

... Windows 10 VS 2022

BerndCirotzki commented 10 months ago

Sorry Rick, everthing is working fine. exept the po file, but you said, they will be created over crowdin. I did not get the corret "opencpn-lib" yesterday. I think it was too late in the night.

rgleason commented 10 months ago

Bernd, what is wrong with the po file? I thought I had accepted all your translations?

rgleason commented 10 months ago

I think you should become a translator on Crowdin for your plugin. It is a very nice interface and is pretty easy to learn. That would be the best way to handle this long term.

BerndCirotzki commented 10 months ago

oh, thanks, but no thanks. I think thats not what I like.

29.12.2023 12:53:50 Rick Gleason @.***>:

I think you should become a translator on Crowdin for your plugin. It is a very nice interface and is pretty easy to learn. That would be the best way to handle this long term.

— Reply to this email directly, view it on GitHub[https://github.com/BerndCirotzki/raymarine_autopilot_pi/pull/28#issuecomment-1871990768], or unsubscribe[https://github.com/notifications/unsubscribe-auth/AHU3PHD3MEPH4RZ2FAKS4JTYL2VMZAVCNFSM6AAAAABBDUPMPSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZRHE4TANZWHA]. You are receiving this because you modified the open/close state. [Verfolgungsbild][https://github.com/notifications/beacon/AHU3PHGCWD47TCXCDF7PFL3YL2VMZA5CNFSM6AAAAABBDUPMPSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPSRH7A.gif]

BerndCirotzki commented 10 months ago

There is somewhere a double translation, but I think this will be overwritten.

29.12.2023 12:52:40 Rick Gleason @.***>:

Bernd, what is wrong with the po file? I thought I had accepted all your translations?

— Reply to this email directly, view it on GitHub[https://github.com/BerndCirotzki/raymarine_autopilot_pi/pull/28#issuecomment-1871989831], or unsubscribe[https://github.com/notifications/unsubscribe-auth/AHU3PHE5COJ6ADEJSPBJBJLYL2VIHAVCNFSM6AAAAABBDUPMPSVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZRHE4DSOBTGE]. You are receiving this because you modified the open/close state. [Verfolgungsbild][https://github.com/notifications/beacon/AHU3PHBTJ3EVMFPQD37OYS3YL2VIHA5CNFSM6AAAAABBDUPMPSWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTTPSRGEO.gif]