On 07/07/2013 09:34 PM, Jon Elson wrote:
> I have just committed the 2nd piece of the updates I was making to the
> hal_ppmc driver to add driver support for two features I added to
> the PPMC encoder board. I committed these to the v2.5_branch,
> but they should also get merged to master and 2.6.
>
> In the past stuff I pushed to the v2.5_branch also got merged after a day
> or so to master, but this doesn't seem to have happened on these changes.
> Is there something more I need to do to get them to merge to master?
> I'd like to make sure they get into any new releases.
The merge from 2.5 into master is done manually, "whenever someone feels
like it". You're welcome to do it, or ask someone else to do it, or
just wait until someone else feels like doing it ;-)
I just did the merge, and now hal_ppmc.c is nearly identical in 2.5 and
master:
> git diff origin/v2.5_branch..origin/master -- hal/drivers/hal_ppmc.c
diff --git a/src/hal/drivers/hal_ppmc.c b/src/hal/drivers/hal_ppmc.c
index 99f86db..228fe5c 100644
--- a/src/hal/drivers/hal_ppmc.c
+++ b/src/hal/drivers/hal_ppmc.c
@@ -561,7 +561,8 @@ int rtapi_app_main(void)
// being left on the bus by a non-implemented device slot
slot->id = 0;
slot->ver = 0;
- rtapi_print_msg(RTAPI_MSG_INFO, "nothing detected\n");
+ rtapi_print_msg(RTAPI_MSG_INFO, "nothing detected at
addr %x reads %x\n",
+ slotnum,idcode);
ClrTimeout(slot->port_addr);
/* skip to next slot */
continue;
Does that look right to you Jon?
--
Sebastian Kuzminsky
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
