myFocuserPro or myFocuserPro2 and INDI

Would it be worth being generous about what is accepted?

Take the string sent, remove the leading ':' and the trailing '#' and parse what is left as a decimal integer.
It could accept :8#, :08#, :008# and so on.
That way the code can be agnostic about the version of the code on the other side.

Chris

I have updated my focuser firmware to the latest 291, and set the Indi focuser driver to only work with 291 or greater.

I have made sure isMoving and Max position behave as expected.
I have implemented Reverse Motion, and removed option tab Reverse Direction (to use standard functions).

I am about to push these changes (this will also revert KNRO earlier change).

So I have hit this problem, I have no idea what todo?!

alan@alan-kubuntu:~/indi$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 8 and 11 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: drivers/focuser/myfocuserpro2.cpp
modified: drivers/focuser/myfocuserpro2.h

alan@alan-kubuntu:~/indi$ git commit -m "Update myFocuserPro2 to work with firmware 291 or greater"
[master 3874b71] Update myFocuserPro2 to work with firmware 291 or greater
2 files changed, 22 insertions(+), 31 deletions(-)
alan@alan-kubuntu:~/indi$ git pull
Auto-merging drivers/focuser/myfocuserpro2.cpp
CONFLICT (content): Merge conflict in drivers/focuser/myfocuserpro2.cpp
Automatic merge failed; fix conflicts and then commit the result.
alan@alan-kubuntu:~/indi$


How do I resolve this?

As stated many times before, I have never worked in git as a developer, and I am by no means a linux guru, so your previous comment really doesn't help me get any closer to a solution. My biggest concern is that I will loose my changes, by not really understanding what is going on, I also understand you are a very busy man, and don't have time to answer these sort of requests. Unfortunately I too am busy, and can't commit the time to learning git at this moment in time. Maybe we need a developer git help forum? I guess my problem was I didn't do a "git fetch" before starting my edits at lunch time?

After a bit of googling, I think I am back to some sort of synchronisation. You said "if I can create a PR....", I believe I already had, with a commit from myself, then one from you and now another from me just now. I manually opened the problem file with "nano" (horrible text editor) and then checked line by line looking for merge messages (there must be a better way of doing this?)

Anyway, I have done a commit. and my end says it is up to date, so I assume somehow I have muddled through and pushed my changes?

Hi everyone,

This is my first post.
I read carefully most of the threads on this forum since few months. In fact since I installed a RPi3b+, running Stellarmate as server for my astronomy equipment. I learn a lot and most of the time, I find answers to my questions. thanks to all for that.
I just received a "myFocuser Pro2" from Robert Brown in New Zeeland and I would like to test it, first via Kstars/Indi device manager and then, directly via ekos.
My problem is that I do not find the driver in the list of the focusers, even after having updated Indi... Probably I missed something

Thanks for your help,

Pierre-Yves

Ok Jasem, thanks for your feedback. I was misled by the indi web page regarding this focuser that suggests that the driver is available.
Pierre-Yves

Sorry, I did'nt pay attention to the Indi release numbering.
Thanks Jasem.