Back
[04:28:17] <LawrenceG> skunkworks, ding dong
[04:38:44] <LawrenceG> skunkworks,
http://imagebin.ca/view/uzCK5O.html It lives... it servos... those 135watt $15 scooter motors make really nice servo motors
[07:06:14] <KimK> KimK is now known as KimK_afk
[08:33:54] <CIA-3> EMC: 03micges 07master * r95ce27875d93 10/src/emc/usr_intf/axis/extensions/emcmodule.cc: Add missing task and motion fields
[08:35:52] <CIA-3> EMC: 03micges 07master * rc4d79eb731f4 10/src/emc/task/taskintf.cc: Fix FO SO FH AF switches to report ON/OFF state instead of bitmask
[08:39:30] <CIA-3> EMC: 03micges 07master * r047b4400491b 10/src/emc/nml_intf/emcops.cc: Add last missing field of EMC_AXIS_STAT
[10:29:56] <CIA-3> EMC: 03bigjohnt 07master * r2527d0d27971 10/docs/src/ (Master_Integrator.lyx drivers/m5i20.lyx): Remove 5i20 from the manual
[11:42:54] <BigJohnT> just when you thought you knew what you were doing :/
[11:44:51] <CIA-3> EMC: 03jepler 07master * r2b981be8ee8b 10/docs/src/ (Submakefile index.tmpl): Remove 5i20 from the html manual
[11:45:22] <BigJohnT> thanks jepler
[11:45:42] <BigJohnT> I forgot about that one...
[11:46:45] <jepler> I'm not sure what's going on in the buildbot though
[11:47:29] <BigJohnT> is it still failing to build?
[11:48:21] <jepler> not sure about that either
[11:48:48] <jepler> but it doesn't build html documentation, so I don't know why this would have hurt it
[11:50:16] <BigJohnT> I had to do a make clean here
[11:52:53] <jepler> I think the buildbot always works from clean
[11:53:36] <jepler> 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.
[11:54:25] <jepler> you might consider instead changing the types of the items in the structure to 'bool' when they're actually bools.
[11:54:47] <jepler> BigJohnT: yeah, looks like it's rebuilding now
[11:58:39] <micges> jepler: ok, will do that
[12:06:20] <jepler> BigJohnT: it must have either been bogons or it was the html doc thing
[12:06:24] <jepler> I'm surprised it was the html docs though
[12:06:58] <jepler> the old build had 'make[1]: Failed to remake makefile `Makefile'.' so I guess that was it
[12:07:00] <BigJohnT> jepler: I usually have to do a make clean any time I remove a file as I recall
[12:07:03] <jepler> that's the same error as I saw locally..
[12:07:09] <jepler> yes, but buildbot always builds from "clean"
[12:07:36] <BigJohnT> my make clean failed then I did a make and that worked
[12:11:11] <micges1> micges1 is now known as micges_plasma
[16:20:38] <CIA-3> EMC: 03jepler 07master * rf86e3c2d70c6 10/debian/ (26 files in 13 dirs): get rid of an old architecture that was unsupported since before 2.3
[17:00:57] <CIA-3> EMC: 03jepler 07master * rec6dc341212e 10/TODO: note the branch to use for joints work
[17:01:52] <cradek> jepler: I don't know why we didn't get the CIA or emails for those checkins
[17:02:15] <jepler> 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?
[17:03:30] <cradek> --no-merges
[17:03:31] <cradek> Do not print commits with more than one parent.
[17:03:58] <cradek> that seems pretty clear
[17:04:02] <jepler> can you run that command for yourself manually and see whether it prints the commits we both expect?
[17:06:36] <cradek> trying, but I can't figure out what hashes it would have had at the time
[17:07:01] <cradek> "the ones passed to the update hook"
[17:57:01] <CIA-3> EMC: 03jepler 07master * ra44f8aa88a30 10/src/ (configure configure.in): look in another place for the realtime dir
[18:01:54] <seb_kuzminsky> looks good jepler
[18:02:33] <seb_kuzminsky> d'oh
[18:03:48] <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
[18:03:55] <jepler> you're configuring explicitly against the running kernel
[18:04:19] <jepler> oh, hm
[18:04:38] <jepler> well, I can't rut the realtime kernel on that system
[18:04:40] <jepler> so what shall we do?
[18:25:47] <CIA-3> EMC: 03seb 07master * ref1733d2c671 10/debian/configure: accept "-a" meaning "any available"
[18:42:14] <alex_joni> seb_kuzminsky: there's a small problem on dapper:
[18:42:19] <alex_joni> it uses: -with-realtime=/usr/realtime-/usr/realtime-2.6.24-16-rtai
[18:42:44] <alex_joni> that probably comes from /debian/configure
[18:46:11] <CIA-3> 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"
[18:58:17] <cradek> heh, I merged (which removed those files on the branch) and then reverted your revert, which readded them
[18:58:56] <cradek> Even though that seems perverse, that fixes future merges so they're easy. should I push it?
[18:58:58] <CIA-3> EMC: 03jepler 07master * r10e45d309c9e 10/debian/configure: is this what seb meant?
[18:59:10] <jepler> I hadn't considered that wrinkle!
[18:59:15] <jepler> sure, push away
[18:59:43] <SWPadnos> I believe I'm totally lost here :)
[18:59:53] <SWPadnos> so keep going, I'll try to catch up eventually :)
[19:00:08] <CIA-3> EMC: 03cradek 07joints_axes3 * rec6dc341212e 10/TODO: note the branch to use for joints work
[19:00:09] <CIA-3> EMC: 03cradek 07joints_axes3 * ra44f8aa88a30 10/src/ (configure configure.in): look in another place for the realtime dir
[19:00:09] <CIA-3> EMC: 03cradek 07joints_axes3 * ref1733d2c671 10/debian/configure: accept "-a" meaning "any available"
[19:00:11] <CIA-3> 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"
[19:00:14] <CIA-3> 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""
[19:00:34] <jepler> SWPadnos: back in january, cradek caused cvs to add some files to TRUNK even though that wasn't intended
[19:00:39] <jepler> I just became aware of this and removed them
[19:00:50] <SWPadnos> yep, and he undid your undoing
[19:00:58] <jepler> not exactly
[19:01:11] <SWPadnos> in the particular branch anyway
[19:01:14] <jepler> right
[19:01:17] <jepler> now you've got it
[19:01:36] <SWPadnos> 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
[19:02:17] <alex_joni> SWPadnos: you can use the wiki page for regular stuff
[19:02:28] <cradek> I feel like I'm getting it, but it's a bit hard-won
[19:02:37] <SWPadnos> yep, I know the basics are pretty easy
[19:02:47] <alex_joni> cradek: I'm sure we're still < 1% of it's functionality
[19:03:03] <alex_joni> but that's ok
[19:03:09] <SWPadnos> it's stuff like "oops, I just screwed something up, how do I undo it" that I have to look into
[19:03:23] <alex_joni> most people that use emc2 are just like that ;)
[19:03:25] <SWPadnos> sadly, I don't know how many ways I can screw things up, so I can't plan for it :)
[19:03:30] <alex_joni> reset --hard
[19:03:33] <SWPadnos> yep
[19:03:39] <SWPadnos> that one I learned yesterday ;)
[19:03:43] <alex_joni> ;-)
[19:04:55] <SWPadnos> I should try to remember if that was the fix or if it was the checkout
[19:05:24] <SWPadnos> Ihad incorrectly patched axis.py, then deleted it (in a CVS-like haze), and then couldn't recover it in one way
[19:05:27] <SWPadnos> don't remember which way though
[19:05:46] <SWPadnos> I might have had to reset --hard and then checkout agaon
[19:05:48] <SWPadnos> again
[19:44:38] <CIA-3> EMC: 03jepler 07v2_3_branch * r8130124d43da 10/debian/configure: accept "-a" meaning "any available"
[19:44:39] <CIA-3> EMC: 03jepler 07v2_3_branch * r63a5341e1a08 10/debian/configure: is this what seb meant?
[19:46:56] <seb_kuzminsky> wow, that's confusing
[19:47:24] <seb_kuzminsky> on the buildbot waterfall page, it looks like i merged the "configure -a" change into 2.3
[19:47:34] <seb_kuzminsky> but i just committed it to trunk, jeff merged it to 2.3
[19:47:49] <seb_kuzminsky> btw, jepler, yes that's what i meant ;-)
[19:49:17] <seb_kuzminsky> 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
[19:53:59] <jepler> seb_kuzminsky: git records "author" and "committer" separately. If you look with 'git log --pretty=full' you'll see that
[20:13:09] <jepler> seb_kuzminsky: ooh it's all green again!
[20:13:31] <seb_kuzminsky> my favourite color
[20:13:52] <seb_kuzminsky> now it just needs some dapper rt buildslaves and some 64-bit realtime tests
[20:47:21] <alex_joni> good night all
[20:48:09] <jepler> night alex_joni
[22:30:43] <BigJohnT> how do you specify the commit you want to revert?
[22:36:47] <BigJohnT> * BigJohnT thinks that it is easier to make a mistake than to fix one until you know how...
[22:42:06] <BigJohnT> ok, I think I have it fingered out now
[22:42:24] <CIA-3> EMC: 03bigjohnt 07master * r824c8550eb4c 10/docs/src/ (Master_Integrator.lyx drivers/m5i20.lyx): Revert "Remove 5i20 from the manual"
[22:47:27] <BigJohnT> * BigJohnT wanders out to play with the dog