#emc-devel | Logs for 2012-01-09

Back
[00:04:54] -!- theorbtwo has quit [Ping timeout: 268 seconds]
[00:05:09] theorb is now known as theorbtwo
[00:33:49] -!- mikegg has quit [Ping timeout: 240 seconds]
[00:35:05] -!- Nick001-Shop has quit [Ping timeout: 252 seconds]
[00:44:02] -!- micges [micges!~x@apn-77-114-243-113.dynamic.gprs.plus.pl] has joined #emc-devel
[00:46:07] <micges> cradek: I want to merge master in ja3, can you disable CIA messages for ja3 for day or two?
[00:47:55] <cradek> I think master into a branch doesn't generate the messages
[00:49:05] <micges> and emails?
[00:49:10] <cradek> right
[00:49:27] <micges> it is 2500+ commits so... :)
[00:50:44] <cradek> bbl
[00:55:47] -!- sumpfralle has quit [Ping timeout: 260 seconds]
[00:56:10] -!- Aero-Tec has quit [Ping timeout: 276 seconds]
[00:58:16] Jim_ is now known as Guest52864
[01:03:53] -!- andypugh has quit [Quit: andypugh]
[01:09:33] -!- mshaver [mshaver!~mshaver@173-167-237-41-ip-static.hfc.comcastbusiness.net] has parted #emc-devel
[01:16:41] <micges> seb_kuzminsky: probably you broke configs paths in master
[01:17:59] -!- micges has quit [Quit: Ex-Chat]
[01:26:49] -!- ries has quit [Ping timeout: 240 seconds]
[01:33:03] -!- FinboySlick has quit [Quit: Leaving.]
[01:45:11] -!- FinboySlick has quit [Read error: Connection reset by peer]
[01:53:52] -!- tlab has quit [Quit: Leaving]
[01:55:17] -!- CIA-10 has quit [Ping timeout: 268 seconds]
[02:07:40] -!- rob_h has quit [Ping timeout: 252 seconds]
[02:16:13] -!- clytle374 [clytle374!~clytle374@75.105.212.57] has joined #emc-devel
[02:16:34] -!- CIA-9 [CIA-9!~CIA@cia.atheme.org] has joined #emc-devel
[02:17:30] <clytle374> I'm getting my data in order to take to the rtai people for help. Are there major differences between 2.4 and 2.5 regarding rtai?
[02:19:58] <clytle374> Also what version of rtai was 10.04 built with?
[02:25:01] -!- Guest52864 has quit [Remote host closed the connection]
[02:50:17] -!- clytle374 [clytle374!~clytle374@75.105.212.57] has parted #emc-devel
[02:52:49] -!- mikegg has quit [Ping timeout: 240 seconds]
[02:57:06] -!- afix has quit [Remote host closed the connection]
[03:12:52] -!- stormlight has quit [Quit: stormlight]
[03:41:20] -!- SWPLinux has quit [Ping timeout: 255 seconds]
[03:51:18] -!- LawrenceSeattle has quit [Remote host closed the connection]
[03:58:02] <jepler> not that I'm saying this in a timely fashion, but: there don't seem to be many changes in rtapi between 2.4.7 and 2.5. you can see them for yourself with this: git log v2.4.7..origin/v2.5_branch -- src/rtapi/rtai_*
[03:59:23] <jepler> for ubuntu lucid we shipped kernel 2.6.32 and rtai 3.8.1
[04:00:21] <jepler> if you know that "it works" where "it" is your rtai + your kernel + emc 2.4.6, and "it doesn't work" where it is the same but emc from v2.5_branch or master branch, then use git bisect to find the commit that introduced the problem. this often points towards a solution.
[04:00:38] <jepler> start with: git bisect start; git bisect good v2.4.6; git bisect bad origin/v2.5_branch
[04:01:12] <jepler> then repeatedly build, test, and then 'git bisect good' or 'git bisect bad' according to the result of the test. lots of info online about 'git bisect' if you search.
[04:01:25] -!- SWPLinux [SWPLinux!~ChattyOne@184.0.53.2] has joined #emc-devel
[04:01:53] -!- SWPLinux has quit [Changing host]
[04:01:53] -!- SWPLinux [SWPLinux!~ChattyOne@emc/developer/SWPadnos] has joined #emc-devel
[04:08:12] <seb_kuzminsky> good god, bisecting from 2.4.6 to v2.5_branch? that's a task for a stouter man than me
[04:10:07] <SWPLinux> c'mon. it's only like 37000 commits
[04:10:27] -!- sumpfralle has quit [Ping timeout: 252 seconds]
[04:11:24] <seb_kuzminsky> maybe with 'git bisect run' it could be done
[04:13:57] <SWPLinux> there's a good excuse^Hreason to get a new computer
[04:14:37] <SWPLinux> know anyone who might want a new motorcycle?
[04:14:45] <seb_kuzminsky> what kind?
[04:14:55] <seb_kuzminsky> I could use a 200cc 2-stroke
[04:15:05] <SWPLinux> 2012 Yamaha YZF-R6 (I Think)
[04:15:08] <SWPLinux> it's a 600 :)
[04:15:27] <seb_kuzminsky> 600? i'll take it! oh, you mean cc
[04:15:31] <SWPLinux> heh
[04:15:58] <SWPLinux> a friend of mine got conned and saddled with it, unfortunately
[04:16:17] <jepler> $ git rev-list v2.4.6..origin/v2.5_branch -- src/hal src/rtapi | wc -l
[04:16:17] <jepler> 290
[04:16:33] <jepler> bisecting only revisions that touch paths is one thing I didn't mention, but which makes the problem much more tractable
[04:16:37] <SWPLinux> so that should only be 9 runs
[04:16:50] <seb_kuzminsky> good point jepler
[04:17:02] <jepler> anyway, it's only 2075 commits, so it's only something like 12 testing steps expected
[04:17:09] <seb_kuzminsky> now, what fraction of those build and run? ;-)
[04:17:29] <SWPLinux> if it won't buid, it fails faster :)
[04:17:32] <SWPLinux> build
[04:17:44] <jepler> that's what 'git bisect skip' is for
[04:18:01] <jepler> I should wrap it up for the night. see you guys.
[04:18:06] <SWPLinux> night
[04:18:10] <seb_kuzminsky> seeya jeff
[04:18:43] <seb_kuzminsky> the docs source highlighting in master doesn't work on 12.04
[04:19:08] <SWPLinux> maybe they'll fix it by Alpha 2 :)
[04:20:01] <seb_kuzminsky> maybe... mhaberler made a bunch of local changes to add highlighting for ngc, ini, and hal, and i'm not sure yet if the problem is with the upstream or with our local mods
[04:21:21] <SWPLinux> ini should already have been there (it's called config files or something)
[04:21:27] <seb_kuzminsky> oh yeah, you're right
[04:21:52] <seb_kuzminsky> """ .ini file
[04:21:52] <seb_kuzminsky> highlighting works out of the box. All three need a bit of trickery to
[04:21:53] <seb_kuzminsky> work cleanly for both html and pdf.
[04:21:53] <seb_kuzminsky> """
[04:22:29] <seb_kuzminsky> that's from michael's docs/src/source-highlight/README
[04:22:48] <SWPLinux> ah, this is for putting hilighted code snippets in the docs
[04:22:55] <SWPLinux> not for hilighting in editors
[04:23:36] <seb_kuzminsky> yop
[04:23:49] <seb_kuzminsky> and it's just for the html docs, pdf doesnt get highlighting yet
[04:24:37] <SWPLinux> ok
[04:25:56] <seb_kuzminsky> oh cool, now it doesnt work on lucid either
[04:26:08] <seb_kuzminsky> maybe i broke it with my recent merge?
[04:26:19] <seb_kuzminsky> along with half a dozen other things, probably
[04:26:38] <SWPLinux> git dissect-bugs ;)
[04:28:29] <seb_kuzminsky> heh, the big commit where mhaberler added source highlighting has a single comment in the docs submakefile that says:
[04:28:38] <seb_kuzminsky> +# oh man..
[04:28:42] <SWPLinux> heh
[04:31:03] <SWPLinux> hmmm. I wonder if that goat dish I ate didn't agree with me
[04:32:12] <seb_kuzminsky> i bet the goat wont agree with you if you eat its dish
[04:33:27] <SWPLinux> luckily someone had killed it first, so there was no argument (at the time)
[04:36:58] <seb_kuzminsky> i hope you feel better SWPLinux
[04:37:01] <seb_kuzminsky> good night all
[04:37:45] <SWPLinux> night
[04:37:53] <SWPLinux> I'm sure it'll pass
[04:45:58] -!- mikegg has quit [Remote host closed the connection]
[05:08:35] -!- Tom_L has quit [Read error: Connection reset by peer]
[05:27:25] -!- Aero-Tec has quit [Ping timeout: 268 seconds]
[05:37:30] -!- FinboySlick has quit [Quit: Miranda IM! Smaller, Faster, Easier. http://miranda-im.org]
[06:08:08] -!- clytle374 has quit [Quit: Leaving]
[06:46:16] -!- Tectu has quit [Ping timeout: 240 seconds]
[06:46:16] -!- tlab has quit [*.net *.split]
[06:46:17] -!- Tom_itx has quit [*.net *.split]
[06:46:17] -!- emc2-buildmaster has quit [*.net *.split]
[06:46:17] -!- robin_sz has quit [*.net *.split]
[06:46:17] -!- MattyMatt has quit [*.net *.split]
[06:46:17] -!- cjdavis has quit [*.net *.split]
[06:46:18] -!- scanf has quit [*.net *.split]
[06:46:18] -!- jthornton has quit [*.net *.split]
[06:46:18] -!- saschi has quit [*.net *.split]
[06:46:18] -!- SWPadnos has quit [*.net *.split]
[06:46:18] -!- the_wench has quit [*.net *.split]
[06:46:35] -!- emc2-buildmaster [emc2-buildmaster!~emc2-buil@174-16-121-79.hlrn.qwest.net] has joined #emc-devel
[06:49:41] -!- jthornton [jthornton!~chatzilla@216-41-156-59.semo.net] has joined #emc-devel
[06:49:41] -!- saschi [saschi!~schimansk@g4r4ge-c0mput3rs.com] has joined #emc-devel
[06:49:41] -!- SWPadnos [SWPadnos!~Me@74-92-8-208-NewEngland.hfc.comcastbusiness.net] has joined #emc-devel
[07:04:30] -!- factor has quit [Read error: Connection reset by peer]
[07:05:19] Tectu_ is now known as Tectu
[07:15:07] -!- psha [psha!~psha@213.208.162.69] has joined #emc-devel
[07:36:22] -!- the_wench [the_wench!~the_wench@host81-149-189-98.in-addr.btopenworld.com] has joined #emc-devel
[07:52:53] -!- theorbtwo has quit [Ping timeout: 248 seconds]
[07:53:12] theorb is now known as theorbtwo
[08:01:38] -!- e-ndy [e-ndy!jkastner@nat/redhat/x-wtbajrodxcqddajb] has joined #emc-devel
[08:15:33] -!- chester88 has quit [Ping timeout: 252 seconds]
[08:30:55] -!- chester88 [chester88!~chris@64.180.205.82] has joined #emc-devel
[08:32:10] -!- capricorn_one has quit [Remote host closed the connection]
[08:43:32] -!- ve7it has quit [Remote host closed the connection]
[08:45:33] -!- psha has quit [Quit: Lost terminal]
[08:52:17] -!- mhaberler [mhaberler!~mhaberler@host25-14-static.23-87-b.business.telecomitalia.it] has joined #emc-devel
[08:55:37] -!- mhaberler has quit [Client Quit]
[09:06:08] -!- mhaberler [mhaberler!~mhaberler@host25-14-static.23-87-b.business.telecomitalia.it] has joined #emc-devel
[09:19:52] -!- robin_sz has quit [Quit: Leaving]
[10:01:32] -!- mhaberler has quit [Read error: Connection reset by peer]
[10:01:36] -!- mhaberler [mhaberler!~mhaberler@host25-14-static.23-87-b.business.telecomitalia.it] has joined #emc-devel
[10:04:14] -!- rob_h [rob_h!~rob_h@5ace704a.bb.sky.com] has joined #emc-devel
[10:28:03] -!- LawrenceSeattle has quit [Quit: LawrenceSeattle]
[10:49:27] -!- theorbtwo has quit [Ping timeout: 252 seconds]
[10:49:36] theorb is now known as theorbtwo
[10:54:19] -!- theorbtwo has quit [Ping timeout: 252 seconds]
[10:54:31] theorb is now known as theorbtwo
[11:08:32] -!- automata has quit [Ping timeout: 240 seconds]
[11:19:38] -!- theorbtwo has quit [Remote host closed the connection]
[11:53:58] -!- Loetmichel has quit [Ping timeout: 276 seconds]
[12:11:15] -!- mhaberler has quit [Quit: mhaberler]
[12:35:58] -!- Valen has quit [Quit: Leaving.]
[12:39:54] -!- theorbtwo has quit [Ping timeout: 260 seconds]
[13:10:14] -!- Poincare has quit [Ping timeout: 260 seconds]
[13:43:36] -!- sumpfralle has quit [Ping timeout: 240 seconds]
[13:59:21] <CIA-9> EMC: 03tissf 07v2.5_branch * r9892890e55f6 10/docs/src/index_fr.tmpl: French docs - cleaning
[13:59:22] <CIA-9> EMC: 03tissf 07v2.5_branch * r449f932cbb6e 10/ (4 files in 3 dirs): French docs - cleaning and update
[13:59:28] -!- izua has quit [Changing host]
[14:31:24] -!- mhaberler [mhaberler!~mhaberler@host25-14-static.23-87-b.business.telecomitalia.it] has joined #emc-devel
[14:46:40] -!- bilboquet has quit [Quit: Leaving.]
[14:54:35] -!- theorbtwo has quit [Ping timeout: 255 seconds]
[14:54:47] theorb is now known as theorbtwo
[15:14:39] -!- ries has quit [Read error: Connection reset by peer]
[15:15:48] -!- mhaberler has quit [Quit: mhaberler]
[15:41:24] -!- mshaver [mshaver!~mshaver@173-167-237-41-ip-static.hfc.comcastbusiness.net] has joined #emc-devel
[15:56:08] -!- syyl has quit [Quit: Leaving]
[15:57:02] -!- theorbtwo has quit [Ping timeout: 268 seconds]
[16:24:50] -!- e-ndy has quit [Quit: Ex-Chat]
[16:25:15] -!- automata has quit [Ping timeout: 240 seconds]
[16:35:38] -!- clytle374 [clytle374!~clytle374@75-105-212-57.cust.wildblue.net] has joined #emc-devel
[16:38:06] <clytle374> thanks. git bisect is a very cool function. And since I'm a professional noob, time for the dumb question
[16:39:30] <clytle374> I've been making a copy of the emc2 directory before building. Is this necessary for each step?
[16:42:26] <jepler> I build in my git checkouts. "git clean -d -x -f" will remove all files not tracked by git, so it's a "super make clean". If you want to be 100% confident you're not accidentally reusing any object files from an earlier compile, do this.
[16:43:07] <jepler> or you can continue working from copies if you are more comfortable with your current workflow. Just make sure you do all the 'git bisect' commands in the same repository (the one you're copying from each time), not in the copy
[16:45:50] <skunkworks> jeper: running weeks so far with the fixed arduous code.. No issues what so ever. Thanks again for your help.
[16:49:00] <skunkworks> arduous?
[16:49:03] <skunkworks> arduino
[16:49:31] <jepler> skunkworks: cool, I'm glad you got it working
[16:50:40] <clytle374> I was checking the run tests again and see this in dmesg, is this normal?
[16:50:40] <clytle374> hm2: no firmware specified in config modparam! the board had better have firmware configured already, or this won't work
[16:52:25] <jepler> are you specifying the firmware?
[16:52:28] <clytle374> sorry I meant runtests in scripts whole output is here http://pastebin.com/YzgbCX37
[16:53:04] <jepler> oh, I think this is probably harmless.
[16:53:14] <jepler> hm2_test doesn't have or require a firmware
[16:54:06] <jepler> part of that test is about provoking various load failures so we can check whether the failures are diagnosed when they occur
[16:55:12] -!- clytle374 has quit [Read error: Connection reset by peer]
[16:55:36] <jepler> uh oh, I guess that was a bad revision to test.
[17:09:46] -!- clytle374 [clytle374!~clytle374@75.105.212.57] has joined #emc-devel
[17:20:08] -!- theorbtwo has quit [Ping timeout: 240 seconds]
[17:20:16] theorb is now known as theorbtwo
[17:24:06] -!- psha [psha!~psha@213.208.162.69] has joined #emc-devel
[17:30:39] <CIA-9> EMC: 03mshaver 07v2.5_branch * r86e7611c74d8 10/configs/smithy/ (19 files): Fix paths and ngcgui entries in ini files
[17:30:40] <CIA-9> EMC: 03mshaver 07v2.5_branch * r4d738469114c 10/ (8 files in 6 dirs): Merge branch 'v2.5_branch' of ssh://git.linuxcnc.org/git/emc2 into v2.5_branch
[17:32:54] <mshaver> What did I just do with that second commit?
[17:33:21] <JT-Shop> rutro
[17:33:29] <mshaver> I think I just goofed up a bunch of French things!
[17:34:21] <JT-Shop> I thought dewey fixed them
[17:34:43] <cradek> it looks fine to me
[17:36:28] -!- theorbtwo has quit [Ping timeout: 244 seconds]
[17:36:39] theorb is now known as theorbtwo
[17:36:51] <mshaver> cradek: Here's what I got on my terminal: http://pastebin.ca/2101618
[17:37:18] <mshaver> In the commit e-mail it says I changed a bunch of French documentation!
[17:37:52] <mshaver> I left Catholic school after the third grade and that was the last French I learned!
[17:38:08] <cradek> no it doesn't, it says you merged french doc changes and your ini changes
[17:38:26] <mshaver> Oh, OK.
[17:38:31] <mshaver> Whew...
[17:38:33] <cradek> the merge is on your own screen
[17:38:41] <cradek> #
[17:38:42] <cradek> mshaver@Matt:~/emc2-dev$ git pull
[17:38:47] <cradek> Merge made by recursive.
[17:38:59] <cradek> [french changes]
[17:39:25] <cradek> run gitk and you can see the merge
[17:39:36] <mshaver> And that adds a commit e-mail message to the emc-commit list and CIA message to IRC?
[17:39:55] <cradek> no, pushing your merge commit does
[17:40:49] <cradek> you pushed two commits, you got two messages
[17:41:48] <cradek> if you are fuzzy on any of this, you should use git push --dry-run EVERY time before pushing, and then investigate what it says it will push
[17:42:05] <cradek> in this case it would have said 449f932..4d73846 v2.5_branch -> v2.5_branch
[17:42:14] <cradek> then you can git log 449f932..4d73846
[17:42:25] <cradek> to see what that set of commits is
[17:45:15] -!- MattyMatt has quit [Ping timeout: 240 seconds]
[17:45:19] <mshaver> I did a git status and it showed that I changed the files I expected. I did a git push and it was rejected because of some non-fast-forward stuff. When this happens I do a git pull which brought me some changed things from the repository. Then when I did the git push, I got that Merge... message.
[17:45:30] <mshaver> I guess that merge message is for me?
[17:45:37] <cradek> doing that pull causes a merge
[17:46:38] <cradek> because there are other changes made parallel to yours, since the commit in your history previous to your change
[17:47:12] <mshaver> I get that, it's just the CIA message that freaked me out. I guess it makes sense because the commit e-mail for the config files says, "Signed Off by mshaver", whereas the other one doesn't.
[17:47:13] <cradek> so your commit and Francis's commits have a common ancestor
[17:47:39] <cradek> so you have to either merge these two divergent paths, or rebase your commit on top of his
[17:48:24] <mshaver> Ah, OK. So when I pulled, it caused that merge.
[17:48:40] <cradek> yes, that's what pull does
[17:49:06] <cradek> you can tell pull to rebase instead, if that's what you want
[17:50:42] <mshaver> In my case, the outcome would be the same because we are in different files. I guess if the other committer and I were in conflict one of use would need to rebase?
[17:50:58] <cradek> no, that's when you'd want to use merge
[17:51:25] <cradek> if in different files, doing the rebase might be more straightforward (you'd get linear history)
[17:51:54] <mshaver> OK, so most of the time I'll want to rebase then? I think there used to be something on the git wiki page about "prefer rebase".
[17:51:56] <cradek> this is a bit of a religious argument.
[17:52:45] <cradek> if your changes are totally independent (conceptually as well as by filename) of what others are doing in the parallel history, rebase is probably simpler
[17:53:04] * mshaver is laughing at that as his knowledge of git theology is near zero
[17:53:15] <cradek> in this case, I'd've preferred rebase, but it's no big thing.
[17:53:50] <mshaver> Thanks! I'll try to remember this!
[17:54:07] <cradek> the only mistake you made is pushing first and asking questions second; git push --dry-run is your defense against that mistake in the future
[17:54:22] <cradek> the merge was not a mistake
[17:54:27] <cradek> welcome :-)
[17:55:25] <jepler> The "prefer rebase" guidance should probably be deleted. One of the things you say to cvs (or svn) users to get them to switch to DVCS systems is "you *can* still get a linear history like you did with CVS (and here's how)".
[17:55:29] <mshaver> Ah. I figured that "git staus" would tell me if there were changes in the repository I needed. Apparently it's more of a git localstatus.
[17:55:48] <cradek> yes status doesn't do anything remote
[17:56:13] <mshaver> OK, now I have learned!
[17:56:16] <cradek> (you could have seen (and received) those changes but NOT merged them in, by running git fetch)
[17:58:06] <jepler> I keep doing a typetypetype-deletedeletedelete thing over here, because I want to talk about how I think rebase vs merge should be used, but cradek is right that it's really a religious argument
[17:59:01] <jepler> but here it goes anyway: if you're planning to rebase, then go ahead and do all your work on the branch you're going to push to. But if you plan to merge, then do your work on a local branch and merge it (once) into the branch you're going to push to
[17:59:02] <mshaver> I'll probably never do that, but it's good to know. Seb told me (I think) that pull was fetch + merge.
[17:59:40] <cradek> jepler: quit typing; lunchtime
[17:59:48] <jepler> there is a reason for "rebase if on master, merge if on local branch": this makes 'git log --first-parent' much more useful
[18:00:02] <jepler> because you'll see 'merge some new feature' as a single commit
[18:00:46] <jepler> when people merge origin/master into their local master branch, the "first parent" is the undesirable one, so 'git log --first-parent' shows your work and not everyone else's work
[18:00:57] <jepler> in practice, 'git log --first-parent' is useless in emc2 for this reason
[18:01:07] <jepler> cradek: ok ok ok
[18:01:20] <mshaver> Enjoy your lunches!
[18:09:41] -!- e-ndy [e-ndy!~jkastner@static-84-242-102-36.net.upcbroadband.cz] has joined #emc-devel
[18:14:16] -!- theorbtwo has quit [Ping timeout: 240 seconds]
[18:14:20] theorb is now known as theorbtwo
[18:32:02] -!- zlog has quit [Remote host closed the connection]
[18:32:05] -!- Tom_itx has quit []
[18:35:24] -!- e-ndy has quit [Quit: Ex-Chat]
[18:36:25] -!- psha has quit [Quit: Lost terminal]
[18:45:06] -!- micges [micges!~x@apn-77-115-114-103.dynamic.gprs.plus.pl] has joined #emc-devel
[18:49:18] <clytle374> is sed -i 's/pci_find_device/pci_get_device/g' *.c breaking stuff?
[18:49:31] <clytle374> should have asked that long ago
[18:50:54] <CIA-9> EMC: 03mshaver 07v2.5_branch * r232b628aceb8 10/configs/smithy/ (6130.ini 924.ini): A couple more ngcgui related changes
[18:51:52] -!- micges has quit [Quit: Ex-Chat]
[19:02:29] <jepler> clytle374: yes, because pci_get_device has different requirements on the caller
[19:03:06] <jepler> what it breaks is kernel reference counting
[19:03:31] <jepler> but to date nobody has offered a patch that does it right
[19:05:21] -!- Tom_L has quit [Client Quit]
[19:05:55] <jepler> pci_get_device increases the reference count of that device; the reference count is decreased by passing the same device back to a subsequent pci_get_device call in the 3rd argument or passing it to pci_dev_put
[19:06:22] <jepler> somebody needs to audit all uses of pci_find_device, changing them to pci_get_device *AND* adding any necessary pci_dev_put calls
[19:06:55] <clytle374> sorry, I can't help with that. over my head
[19:07:24] <jepler> as long as you aren't hotplugging the card it probably is fine
[19:07:45] <clytle374> thanks.
[19:09:46] <clytle374> just wanted to check before I did it a bunch of times
[19:12:14] -!- micges [micges!~x@apn-46-76-190-201.dynamic.gprs.plus.pl] has joined #emc-devel
[19:12:57] <micges> cradek: did you disabled emails from joints_axis3 branch repo?
[19:14:33] <cradek> thought I said before: merging master into another branch does not cause emails or cia messages
[19:14:55] <cradek> so if that's what you're doing, you don't have to worry about it
[19:15:16] <micges> ok
[19:16:49] <CIA-9> EMC: 03micges 07joints_axes3 * ra15ab9fd610b 10/ (1799 files in 168 dirs): Merge branch 'master' into joints_axes3
[19:17:05] <cradek> yay
[19:17:34] <micges> uff I was worried about 2k email for everybody :)
[19:17:42] <cradek> yes that would be bad :-)
[19:20:08] -!- izua has quit [Ping timeout: 240 seconds]
[19:21:00] -!- ries has quit [Read error: Connection reset by peer]
[19:21:00] ries_ is now known as ries
[19:23:15] -!- IchGucksLive has quit [Quit: ChatZilla 0.9.87 [Firefox 9.0.1/20111221214946]]
[19:29:58] -!- factor has quit [Read error: Connection reset by peer]
[19:45:51] <cradek> I think I changed the logger so our usual upward merges also won't bombard us
[19:46:10] <micges> cool
[19:46:57] <CIA-9> EMC: 03micges 07joints_axes3 * rba149d1761cc 10/configs/sim/axis/axis_mm.ini: configs: update sim/axis_mm config to run properly in ja3
[19:51:27] <CIA-9> EMC: 03cradek 07master * rd23ba5c3f8cb 10/ (32 files in 10 dirs): Merge branch 'v2.5_branch'
[19:51:50] <cradek> and it works!
[19:52:21] <micges> great
[20:07:19] -!- micges has quit [Ping timeout: 276 seconds]
[20:08:42] -!- e-ndy [e-ndy!~jkastner@static-84-242-102-36.net.upcbroadband.cz] has joined #emc-devel
[20:17:30] -!- micges [micges!~x@apn-95-41-33-175.dynamic.gprs.plus.pl] has joined #emc-devel
[20:24:02] <jepler> lllllllllllll
[20:24:04] <jepler> argh
[20:42:55] -!- ries has quit [Ping timeout: 240 seconds]
[20:45:57] -!- mhaberler [mhaberler!~mhaberler@host25-14-static.23-87-b.business.telecomitalia.it] has joined #emc-devel
[21:04:55] -!- ries has quit [Ping timeout: 240 seconds]
[21:05:43] <CIA-9> EMC: 03mshaver 07v2.5_branch * r1cd526a7b280 10/configs/smithy/ (18 files): Yet more ngcgui related changes and cleanup
[21:06:11] <clytle374> I'm down to 5 steps, had to write a script to add some missing latency.in files, and automate the build
[21:06:31] <clytle374> No I've got a error building mesa_8i20, can it be disabled?
[21:07:23] <clytle374> implicit declaration of function 'kmalloc" and then kfree
[21:07:44] <mshaver> clytle374: As I'm testing 8i20 equipped machines just now, I'd rather you not :)
[21:09:31] <clytle374> Just locally, for git bisect
[21:10:56] <mshaver> Oh! Sorry. Please continue!
[21:15:31] <clytle374> I would if I knew how. Gotta go, machines are broke down.
[21:26:39] <CIA-9> EMC: 03mshaver 07v2.5_branch * ra0edabeb49d5 10/configs/smithy/ (8i20.xml 8i20postgui.hal): Adding some 8i20 support files
[21:26:58] <skunkworks> mshaver: how is the brushless going?
[21:28:15] <mshaver> skunkworks: It's working. Gotta tune PID & get some new firmware from Peter to allow startup without high voltage power.
[21:28:36] <mshaver> Otherwise, integrated I think.
[21:29:23] <skunkworks> cool. I know there was a discussion recently about a work - around on the high voltage isssue.
[21:30:14] <mshaver> That's what I'm doing now, but soon all will be copacetic.
[21:30:38] * mshaver can't believe that was in the dictionary...
[21:32:24] -!- mhaberler has quit [Quit: mhaberler]
[21:32:42] -!- JT-BP [JT-BP!~chatzilla@216-41-156-59.semo.net] has joined #emc-devel
[21:38:03] -!- LawrenceSeattle has quit [Read error: No route to host]
[21:43:00] <skunkworks> heh
[21:45:26] -!- isssy has quit [Ping timeout: 255 seconds]
[21:52:26] <CIA-9> EMC: 03mshaver 07v2.5_branch * red2ffad6af9b 10/configs/smithy/ (6130.ini 924.ini): Ngcgui on a lathe fixes
[21:54:29] -!- andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust492.basl.cable.virginmedia.com] has joined #emc-devel
[22:16:01] -!- e-ndy has quit [Quit: Ex-Chat]
[22:28:41] -!- saberman_3 has quit [Remote host closed the connection]
[22:29:59] -!- micges has quit [Ping timeout: 255 seconds]
[22:31:13] -!- FinboySlick has quit [Quit: Leaving.]
[22:31:16] -!- The_Ball has quit [Ping timeout: 240 seconds]
[22:31:22] -!- gene76 has quit [Read error: Connection reset by peer]
[22:37:35] -!- emcPT has quit [Ping timeout: 240 seconds]
[22:39:47] -!- emcPT_ has quit [Remote host closed the connection]
[22:45:31] -!- acemi has quit [Quit: WeeChat 0.3.2]
[22:56:13] -!- Mjolinor has quit [Quit: Leaving]
[23:00:43] -!- factor has quit [Read error: Connection reset by peer]
[23:09:14] -!- syyl has quit [Quit: Leaving]
[23:13:33] -!- emcPT has quit [Remote host closed the connection]
[23:17:41] -!- toastyde1th has quit [Ping timeout: 255 seconds]
[23:27:48] -!- uwe_ has quit [Ping timeout: 244 seconds]
[23:31:32] -!- servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[23:36:35] -!- mshaver [mshaver!~mshaver@173-167-237-41-ip-static.hfc.comcastbusiness.net] has parted #emc-devel
[23:36:44] -!- kbarry has quit [Remote host closed the connection]