skunkworks, ding dong
It lives... it servos... those 135watt $15 scooter motors make really nice servo motors
KimK is now known as KimK_afk
EMC: 03micges 07master * r95ce27875d93 10/src/emc/usr_intf/axis/extensions/emcmodule.cc: Add missing task and motion fields
EMC: 03micges 07master * rc4d79eb731f4 10/src/emc/task/taskintf.cc: Fix FO SO FH AF switches to report ON/OFF state instead of bitmask
EMC: 03micges 07master * r047b4400491b 10/src/emc/nml_intf/emcops.cc: Add last missing field of EMC_AXIS_STAT
EMC: 03bigjohnt 07master * r2527d0d27971 10/docs/src/ (Master_Integrator.lyx drivers/m5i20.lyx): Remove 5i20 from the manual
just when you thought you knew what you were doing :/
EMC: 03jepler 07master * r2b981be8ee8b 10/docs/src/ (Submakefile index.tmpl): Remove 5i20 from the html manual
I forgot about that one...
I'm not sure what's going on in the buildbot though
is it still failing to build?
not sure about that either
but it doesn't build html documentation, so I don't know why this would have hurt it
I had to do a make clean here
I think the buildbot always works from clean
micges: I am not particularly fond of your change to add '? 1 : 0'. In C and C++, 0 is false and all nonzero integers are true. One should try to get used to the idea.
you might consider instead changing the types of the items in the structure to 'bool' when they're actually bools.
BigJohnT: yeah, looks like it's rebuilding now
jepler: ok, will do that
BigJohnT: it must have either been bogons or it was the html doc thing
I'm surprised it was the html docs though
the old build had 'make: Failed to remake makefile `Makefile'.' so I guess that was it
jepler: I usually have to do a make clean any time I remove a file as I recall
that's the same error as I saw locally..
yes, but buildbot always builds from "clean"
my make clean failed then I did a make and that worked
micges1 is now known as micges_plasma
EMC: 03jepler 07master * rf86e3c2d70c6 10/debian/ (26 files in 13 dirs): get rid of an old architecture that was unsupported since before 2.3
EMC: 03jepler 07master * rec6dc341212e 10/TODO: note the branch to use for joints work
jepler: I don't know why we didn't get the CIA or emails for those checkins
cradek: is it possible that your change to not note merges is wrong, and because one of (the last?) commits was a merge, it didn't do anything?
Do not print commits with more than one parent.
that seems pretty clear
can you run that command for yourself manually and see whether it prints the commits we both expect?
trying, but I can't figure out what hashes it would have had at the time
"the ones passed to the update hook"
EMC: 03jepler 07master * ra44f8aa88a30 10/src/ (configure configure.in): look in another place for the realtime dir
looks good jepler
cd src && ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-realtime=/usr/realtime-2.6.24-24-generic --enable-build-documentation=pdf
you're configuring explicitly against the running kernel
well, I can't rut the realtime kernel on that system
so what shall we do?
EMC: 03seb 07master * ref1733d2c671 10/debian/configure: accept "-a" meaning "any available"
seb_kuzminsky: there's a small problem on dapper:
it uses: -with-realtime=/usr/realtime-/usr/realtime-2.6.24-16-rtai
that probably comes from /debian/configure
EMC: 03jepler 07master * rf4c7ad5dcf08 10/src/emc/ini/ (inijoint.cc inijoint.hh): Revert "rebase joint_axes branch which also has the changes from new-telop branch"
heh, I merged (which removed those files on the branch) and then reverted your revert, which readded them
Even though that seems perverse, that fixes future merges so they're easy. should I push it?
EMC: 03jepler 07master * r10e45d309c9e 10/debian/configure: is this what seb meant?
I hadn't considered that wrinkle!
sure, push away
I believe I'm totally lost here :)
so keep going, I'll try to catch up eventually :)
EMC: 03cradek 07joints_axes3 * rec6dc341212e 10/TODO: note the branch to use for joints work
EMC: 03cradek 07joints_axes3 * ra44f8aa88a30 10/src/ (configure configure.in): look in another place for the realtime dir
EMC: 03cradek 07joints_axes3 * ref1733d2c671 10/debian/configure: accept "-a" meaning "any available"
EMC: 03cradek 07joints_axes3 * rf4c7ad5dcf08 10/src/emc/ini/ (inijoint.cc inijoint.hh): Revert "rebase joint_axes branch which also has the changes from new-telop branch"
EMC: 03cradek 07joints_axes3 * r494dbebf17f3 10/src/emc/ini/ (inijoint.cc inijoint.hh): Revert "Revert "rebase joint_axes branch which also has the changes from new-telop branch""
SWPadnos: back in january, cradek caused cvs to add some files to TRUNK even though that wasn't intended
I just became aware of this and removed them
yep, and he undid your undoing
in the particular branch anyway
now you've got it
I do need to sit down with git to catch up to you guys - I just haven't had the time to think about how to use it
SWPadnos: you can use the wiki page for regular stuff
I feel like I'm getting it, but it's a bit hard-won
yep, I know the basics are pretty easy
cradek: I'm sure we're still < 1% of it's functionality
but that's ok
it's stuff like "oops, I just screwed something up, how do I undo it" that I have to look into
most people that use emc2 are just like that ;)
sadly, I don't know how many ways I can screw things up, so I can't plan for it :)
that one I learned yesterday ;)
I should try to remember if that was the fix or if it was the checkout
Ihad incorrectly patched axis.py, then deleted it (in a CVS-like haze), and then couldn't recover it in one way
don't remember which way though
I might have had to reset --hard and then checkout agaon
EMC: 03jepler 07v2_3_branch * r8130124d43da 10/debian/configure: accept "-a" meaning "any available"
EMC: 03jepler 07v2_3_branch * r63a5341e1a08 10/debian/configure: is this what seb meant?
wow, that's confusing
on the buildbot waterfall page, it looks like i merged the "configure -a" change into 2.3
but i just committed it to trunk, jeff merged it to 2.3
btw, jepler, yes that's what i meant ;-)
the 2.3 realtime-deb build should fail on hardy-rtai-amd64, i forgot to switch that build from "configure -r" to "configure -a". i'll do that after the build finishes and rerun it
seb_kuzminsky: git records "author" and "committer" separately. If you look with 'git log --pretty=full' you'll see that
seb_kuzminsky: ooh it's all green again!
my favourite color
now it just needs some dapper rt buildslaves and some 64-bit realtime tests
good night all
how do you specify the commit you want to revert?
* BigJohnT thinks that it is easier to make a mistake than to fix one until you know how...
ok, I think I have it fingered out now
EMC: 03bigjohnt 07master * r824c8550eb4c 10/docs/src/ (Master_Integrator.lyx drivers/m5i20.lyx): Revert "Remove 5i20 from the manual"
* BigJohnT wanders out to play with the dog