>
> OK, please give more details when you have them.
>
the other programs I have touched in my pncconf branch are:
mux16.comp
-this adds option to decode graycoded inputs
- adds the option of a debounce delay on inputs
- re-coded to use an array for the in pins
- acts exactly the same as original mux16 if none of
the options are used.
spindle.xml
- add a spindle-at-speed led to compliment the spindle
speed display
- This led would show up in stepconf configs if the optional
pyvcp spindle speed display option was checked but would
not indicate, though it would be easy to add the code to stepconf.
halmodule.cc
-- adds new_sig, connect, set_pin to python hal module
this allows making new signals, linking signals to pins,
and setting pins
also two commits that went to master that should have been in 2.5
are for stepconf:
7867abd8 add checks for realtime kernel
7400795ab switch to hashlib instead of md5
>
> It sounds like you should merge pncconf into 2.5 and then 2.5 into
> master. You should not merge directly into master and then try to
> also put it in 2.5. That will make future merges difficult.
>
Ok
> If you have any doubts please ask for help before you do it! We
> have a very clean setup with 2.4/2.5/master right now based on the
> 'merging upwards' workflow (man gitworkflows).
Please advice me if these changes are ok to merge into 2.5
Please advice how to handle the two commits for stepconf that
didn't get to 2.5
Thanks Chris M
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
