Back
[00:03:59] -!- Nick001-Shop has quit [Remote host closed the connection]
[00:06:15] <KGB-linuxcnc> 03andy 05v2.5_branch 6cae47a 06linuxcnc 10src/hal/drivers/mesa-hostmot2/resolver.c
[00:06:16] <KGB-linuxcnc> Use a less bogus way to detect "index" with Resolvers.
[00:06:16] <KGB-linuxcnc> For example, one that only happens once per rev.
[00:06:16] <KGB-linuxcnc> And fix an off-by-one error in the reverse direction too.
[00:06:16] <KGB-linuxcnc> Signed-off-by: Andy Pugh <andy@bodgesoc.org>
[00:07:14] -!- tmcw has quit [Ping timeout: 240 seconds]
[00:10:36] -!- blossom has quit [Read error: Connection reset by peer]
[00:11:02] -!- MarkusBec has quit [Ping timeout: 240 seconds]
[00:27:53] -!- newroswell has quit [Remote host closed the connection]
[00:30:00] -!- uwe_ has quit [Ping timeout: 245 seconds]
[00:49:19] -!- jef79m has quit [Excess Flood]
[00:51:43] <linuxcnc-build_> build #474 of precise-i386-realtime-rip is complete: Failure [4failed clear-dmesg compile get-dmesg] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/precise-i386-realtime-rip/builds/474 blamelist: Andy Pugh <andy@bodgesoc.org>
[00:57:08] <linuxcnc-build_> build #1269 of checkin is complete: Failure [4failed] Build details are at
http://buildbot.linuxcnc.org/buildbot/builders/checkin/builds/1269 blamelist: Andy Pugh <andy@bodgesoc.org>
[01:05:38] -!- toudi_ has quit [Quit: Wychodzi]
[01:05:47] -!- FinboySlick has quit [Quit: Leaving.]
[01:21:09] -!- c-bob has quit [Read error: Operation timed out]
[01:25:12] <KimK_3> memleak: I'm back. I read the file you pointed out, ShabbyX comes at it completely differently, from the manual compile end instead of debs. Since I'm doing this with Seb's debs, at what point (step number) should I jump into Shabby's list? I'm barely back, I haven't done anything with grub yet, still looking things over.
[01:31:40] <CaptHindsight> KimK: memleak is away until tomorrow
[01:32:50] <CaptHindsight> maybe someone else that stays current with ubuntu can help before then
[01:33:50] -!- Valen1 has quit [Read error: Connection timed out]
[01:33:51] <CaptHindsight> KimK: are you just trying to get the realtime kernel to show up in grub2?
[01:34:36] <andypugh> I am reinstalling Lubuntu for the second time tonight. Well, this morning now. The first install has a system font too small to read (4 pixels high) and I can't see well enough to do anything more than log in.
[01:34:58] <andypugh> Probably an Intel GMA problem.
[01:35:35] <andypugh> KimK: The Resolver driver should work now.
[01:35:51] -!- joe9 has quit [Read error: Connection reset by peer]
[01:41:11] <KimK_3> CaptHindsight: Oh, OK. No problem, tomorrow is fine too. Yes, I would like the RTAI kernel to show up in grub. Now I'm not sure I've installed it/them correctly, I just installed Seb's debs, but then memleak pointed me to ShabbyX's readme, which is written around compiling from scratch, and he has many steps listed. I'll only need the later ones, but how late?
[01:44:23] <KimK_3> andypugh: Excellent, Andy, that's great news, thanks very much! Unfortunately I'm waiting for some Mesa cards and trying to get this E350N going for a side project, so it will be a couple of weeks or more before I get back around to the resolver project.
[01:47:16] -!- Laremere has quit [Ping timeout: 264 seconds]
[01:47:41] -!- jfire has quit [Quit: Leaving.]
[01:48:06] -!- filadome has quit [Ping timeout: 264 seconds]
[01:50:16] <CaptHindsight> KimK_3: on ubunutu it might be grub-mkconfig -o /boot/grub/grub.cfg
[01:51:12] <CaptHindsight> http://www.theurbanpenguin.com/linux/ubuntu/07grub2.html
[01:55:19] -!- joe9 has quit [Remote host closed the connection]
[01:57:58] <KimK_3> CaptHindsight: Yes, memleak recommended grub-mkconfig (etc) and that worked, but it may be tied with update-grub, because that seemed to work in the same way, and with the same results.
[02:06:58] <KimK_3> andypugh: Don't beat yourself to death, it must be getting late over there. To be continued tomorrow?
[02:08:47] <andypugh> It's only 3am
[02:13:05] -!- pjm_ has quit [Ping timeout: 256 seconds]
[02:15:30] <cradek> if seb's kernel debs don't cause it to show up in grub and be bootable, they are utterly broken, and I would be surprised to learn that
[02:15:33] <andypugh> X -configure segfaulted, but at least the xorg.conf it made resulted in fonts coming out more than 3 pixels high. Internet advice "make the fonts bigger in look and feel". And how am I meant to navigate "look and feel" when the fonts are literally illegible?
[02:15:46] <andypugh> Night all
[02:15:50] <skunkworks> night andy
[02:15:55] <cradek> I have the buildbot admin password and I can "Graceful Shutdown" that broken builder, but not reboot it
[02:15:56] <KimK_3> Goodnight Andy
[02:16:07] -!- andypugh has quit [Quit: andypugh]
[02:16:34] <cradek> but, I don't know whether that would make it better or worse (aka needing seb's help more urgently)
[02:18:19] <skunkworks> cradek: stella is going to be 1 monday.. That doesn't seem right...
[02:18:24] <KimK_3> cradek: I suspect I may have a "clean install" problem. Mine was a new (blank) drive, whereas Seb may have copied a needed file here or there on his system so that it was present where/when needed.
[02:20:09] <KimK_3> skunkworks: No, Sam, that doesn't seem right, lol. Congratulations to all of you!
[02:20:19] <cradek> skunkworks: wow, and I'm going to be 40 soon. I have a heck of a head start on her.
[02:20:46] <cradek> skunkworks: I feel sorry for her - growing up is really hard work and I'm quite glad to be done with it.
[02:22:31] <skunkworks> cradek: I turned 40 in june...
[02:22:39] <skunkworks> I forgot we are pretty close in age
[02:23:09] <skunkworks> I am going to be almost 60 when she graduates... (I don't know what to think about that) ;)
[02:25:18] <cradek> you started late...
[02:25:53] <skunkworks> sat on the fence too long..
[02:27:21] <KimK_3> cradek: What, the buildbot doesn't honor "sudo shutdown -r now" ?
[02:27:50] <cradek> I don't have a login to the VMs, only the buildbot web interface password
[02:28:08] <KimK_3> Ah.
[02:28:24] <cradek> if I poke the shutdown button I don't know if I can get it back (although I guess I doubt that's a worse situation than it just failing forever)
[02:28:45] <skunkworks> I thought zultron was getting the buildbot to restart the build.. Or is it a bit lower level than that?
[02:29:37] <KimK_3> Poke it when vacation is almost over anyway?
[02:29:56] -!- tmcw has quit [Read error: Connection reset by peer]
[02:29:57] <cradek> the precise-rt buildbot VM has a bogus kernel that goes nuts after a while
[02:30:14] <cradek> nobody knows why but a reboot fixes it for a while
[02:31:06] <cradek> well I shut it down.
[02:33:55] <cradek> linuxcnc-build_: force build --branch=v2.5_branch checkin
[02:33:56] <linuxcnc-build_> build forced [ETA 1h14m41s]
[02:33:56] <linuxcnc-build_> I'll give a shout when the build finishes
[02:34:08] <cradek> you're the best
[02:34:31] <KimK_3> ("Captain Ron", adding motor oil to a marine diesel engine, in the presence of the boat owner's two children:) Captain Ron: "Kids, a diesel engine likes its oil, like a sailor likes his rum." Kids: "Why is that, Captain Ron?" Captain Ron (pausing to think): "Well... nobody knows."
[02:40:16] -!- sumpfralle has quit [Ping timeout: 256 seconds]
[02:59:33] -!- Loetmichel has quit [Ping timeout: 264 seconds]
[03:06:34] -!- tmcw_ has quit [Remote host closed the connection]
[03:25:57] -!- skunkworks has quit [Remote host closed the connection]
[04:00:28] -!- AR__ has quit [Ping timeout: 264 seconds]
[04:01:58] -!- `Nerobro has quit [Ping timeout: 268 seconds]
[04:03:16] -!- Laremere_AFK has quit [Ping timeout: 246 seconds]
[04:08:14] -!- `Nerobro_ has quit [Remote host closed the connection]
[04:11:06] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[04:33:33] -!- mhaberler has quit [Quit: mhaberler]
[05:02:30] -!- Fox_Muldr has quit [Ping timeout: 256 seconds]
[05:05:13] -!- cmorley has quit [Ping timeout: 246 seconds]
[05:10:49] -!- cmorley [cmorley!~chris@S0106204e7f8c229b.no.shawcable.net] has joined #linuxcnc-devel
[05:24:43] -!- syyl-- has quit [Read error: Connection reset by peer]
[05:26:39] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[05:55:50] -!- ahofer has quit [Ping timeout: 240 seconds]
[05:56:01] -!- kwallace2 has quit [Quit: Leaving.]
[06:11:33] -!- nspielb has quit [Ping timeout: 250 seconds]
[06:38:07] -!- maximilian_h has quit [Read error: Connection reset by peer]
[06:38:12] -!- maximilian_h1 [maximilian_h1!~bonsai@130.255.104.21] has joined #linuxcnc-devel
[06:43:39] -!- ve7it has quit [Remote host closed the connection]
[06:43:49] -!- jfire has quit [Quit: Leaving.]
[06:45:27] -!- Jim[work] has quit [Quit: Leaving]
[06:56:15] -!- archivist_herron has quit [Ping timeout: 245 seconds]
[07:16:28] -!- `Nerobro_ has quit [Ping timeout: 246 seconds]
[07:20:34] blossom_ is now known as blossom
[07:21:08] -!- toastyde1th has quit [Read error: Connection reset by peer]
[07:23:12] -!- R2E4_ has quit [Read error: Connection reset by peer]
[07:25:15] -!- knownasilya2 has quit [Quit: Nettalk6 - www.ntalk.de]
[07:27:13] -!- hashfail has quit []
[07:27:18] -!- Jim[work] has quit [Read error: Connection reset by peer]
[07:34:56] -!- abetusk has quit [Ping timeout: 256 seconds]
[07:41:10] -!- jfrmilner has quit [Quit: bye]
[07:42:26] -!- DJ9DJ has quit [Quit: bbl]
[07:44:03] -!- i_tarzan has quit [Ping timeout: 276 seconds]
[07:48:27] abetusk is now known as Guest8671
[08:01:40] -!- Lathe_newbie has quit [Ping timeout: 264 seconds]
[08:06:01] -!- JessicaRN has quit [Quit: Page closed]
[08:16:33] -!- Jim[work] has quit [Read error: Connection reset by peer]
[08:23:45] -!- mackerski has quit [Remote host closed the connection]
[08:40:21] -!- rob_h [rob_h!~rob_h@94.8.141.244] has joined #linuxcnc-devel
[08:57:28] -!- mhaberler has quit [Quit: mhaberler]
[09:08:47] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[09:12:00] -!- erasmo [erasmo!~erasmo@178-36-212-220.adsl.inetia.pl] has joined #linuxcnc-devel
[09:14:43] -!- Bobinho has quit [Quit: Page closed]
[09:18:38] -!- SpeicusX has quit [Ping timeout: 240 seconds]
[09:46:18] -!- cevad has quit [Ping timeout: 264 seconds]
[09:48:48] -!- aksr has quit [Quit: leaving]
[09:50:11] -!- Thetawaves_ has quit [Quit: This computer has gone to sleep]
[10:00:14] -!- SpeicusX has quit [Ping timeout: 240 seconds]
[10:04:54] -!- stsydow has quit [Remote host closed the connection]
[10:28:19] -!- donkey has quit [Read error: Operation timed out]
[10:37:02] -!- Lathe_newbie| has quit [Ping timeout: 240 seconds]
[10:37:55] -!- sumpfralle has quit [Ping timeout: 245 seconds]
[10:55:32] -!- archivist_herron has quit [Ping timeout: 256 seconds]
[11:16:41] -!- King0r has quit [Quit: Page closed]
[11:19:36] -!- skunkworks [skunkworks!~skunkwork@68-115-41-210.static.eucl.wi.charter.com] has joined #linuxcnc-devel
[11:31:57] -!- cpresser has quit [Quit: Lost terminal]
[11:43:08] -!- Jp11 has quit [Ping timeout: 256 seconds]
[11:46:31] -!- Valen has quit [Quit: Leaving.]
[12:10:25] -!- mhaberler has quit [Quit: mhaberler]
[12:12:45] -!- stsydow has quit [Remote host closed the connection]
[12:17:33] -!- Jp11 has quit [Ping timeout: 264 seconds]
[12:22:37] -!- maximilian_h1 has quit [Quit: Leaving.]
[12:31:23] -!- md-2 has quit [Remote host closed the connection]
[12:42:09] -!- psha[work] [psha[work]!~psha@195.135.238.205] has joined #linuxcnc-devel
[12:49:09] -!- Simooon has quit [Quit: Leaving]
[12:58:55] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[12:59:37] -!- fatpandas has quit [Quit: leaving]
[13:15:30] <cradek> ETA: 21:48:37 [-33993 secs]
[13:15:31] <cradek> hmm
[13:15:39] <cradek> apparently I made it worse
[13:17:14] <jepler> doh
[13:17:55] -!- PetefromTn has quit [Remote host closed the connection]
[13:19:36] * cradek sighs
[13:19:55] -!- erasmo has quit [Remote host closed the connection]
[13:20:03] <cradek> I figured it would just skip that one...
[13:20:28] <jepler> that's a reasonable guess
[13:25:11] -!- tmcw has quit [Remote host closed the connection]
[13:27:18] -!- tmcw has quit [Remote host closed the connection]
[13:29:00] -!- psha[work] has quit [Quit: Lost terminal]
[13:29:34] -!- DJ9DJ has quit [Ping timeout: 246 seconds]
[13:33:49] -!- kwallace [kwallace!~kwallace@smb-183.sonnet.com] has joined #linuxcnc-devel
[14:28:21] -!- stephan48 has quit [Ping timeout: 248 seconds]
[14:31:00] -!- skorasaurus has quit [Quit: Elvis has left the building.]
[14:31:14] -!- stephan48 has quit [Changing host]
[14:48:14] -!- mle has quit [Excess Flood]
[14:58:29] -!- kwallace2 [kwallace2!~kwallace@smb-187.sonnet.com] has joined #linuxcnc-devel
[14:59:10] -!- kwallace has quit [Ping timeout: 246 seconds]
[15:24:03] -!- dosas has quit [Quit: Leaving]
[15:32:04] -!- syyl has quit [Ping timeout: 256 seconds]
[15:32:04] -!- syyl_ws has quit [Ping timeout: 246 seconds]
[15:32:44] -!- mhaberler has quit [Quit: mhaberler]
[15:34:27] -!- linuxcnc-build_ has quit [Excess Flood]
[15:34:43] -!- linuxcnc-build [linuxcnc-build!~linuxcnc-@184-96-177-65.hlrn.qwest.net] has joined #linuxcnc-devel
[15:36:57] -!- davec_ has quit [Ping timeout: 268 seconds]
[15:41:33] -!- mackerski has quit [Ping timeout: 264 seconds]
[15:41:34] mackerski_ is now known as mackerski
[15:42:14] -!- jfire has quit [Quit: Leaving.]
[16:03:49] -!- Kup has quit [Quit: Leaving.]
[16:11:59] -!- thomaslindstr_m has quit [Remote host closed the connection]
[16:17:37] -!- zlog has quit [Read error: Connection reset by peer]
[16:17:39] -!- Jp11 has quit [Ping timeout: 268 seconds]
[16:17:58] -!- Tom_itx has quit [Ping timeout: 256 seconds]
[16:19:57] -!- gimps_ has quit [Ping timeout: 264 seconds]
[16:20:00] -!- zlog [zlog!~zlog@ip68-102-199-165.ks.ok.cox.net] has joined #linuxcnc-devel
[16:34:16] -!- mackerski has quit [Quit: mackerski]
[16:47:58] <cradek> jepler: fwiw, you can clone a snapshot to get it mounted normally, and then rsync works
[16:48:06] <cradek> both the clone and destroy of the clone are fast
[16:49:51] -!- nspiel_ has quit [Ping timeout: 250 seconds]
[16:51:47] -!- andypugh [andypugh!~andy2@cpc16-basl9-2-0-cust685.20-1.cable.virginmedia.com] has joined #linuxcnc-devel
[16:52:44] <jepler> cradek: aha I'll have to remember that tip
[16:53:06] <jepler> (troll: anybody tried zfs-on-linux with a realtime kernel?)
[16:53:24] <cradek> ugh
[17:05:40] <andypugh> What is the process for merging 2.5 into master?
[17:06:24] <andypugh> I had imagined that it happened on the server, but on reflection I suspect it is more of a big patch that is pushed?
[17:13:05] -!- zlog has quit [Ping timeout: 240 seconds]
[17:14:50] -!- vladimirek [vladimirek!~vladimire@95.105.250.72] has joined #linuxcnc-devel
[17:15:44] -!- zlog [zlog!~zlog@ip68-102-199-165.ks.ok.cox.net] has joined #linuxcnc-devel
[17:19:43] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[17:23:42] -!- md-2 has quit [Remote host closed the connection]
[17:39:07] -!- chillly has quit [Quit: Leaving]
[17:41:31] -!- tmcw has quit [Remote host closed the connection]
[17:53:48] -!- zlog has quit [Read error: Connection reset by peer]
[17:56:38] -!- zlog [zlog!~zlog@ip68-102-199-165.ks.ok.cox.net] has joined #linuxcnc-devel
[18:02:48] -!- md-2 has quit [Ping timeout: 256 seconds]
[18:06:46] <ve7it> cradek, Do you know if the linuxcnc site is using Joomla? I notice there is a pretty bad vulnerability that needs patching.
[18:07:16] <ve7it> http://krebsonsecurity.com/2013/08/simple-hack-threatens-oudated-joomla-sites/
[18:07:34] <ve7it> http://www.marketwire.com/press-release/versafe-identifies-significant-joomla-cms-vulnerability-corresponding-spike-phishing-1819933.htm
[18:07:54] <ve7it> http://developer.joomla.org/security/news/563-20130801-core-unauthorised-uploads
[18:09:22] <jepler> andypugh: everything is local until you push it
[18:09:59] <andypugh> Yes we are using Joomla. Yes we get hacked a lot.
[18:10:18] <cradek> andypugh: you mean we used to get hacked a lot until I plugged the persistent hole
[18:10:29] <andypugh> So, what I need to do is merge 2.5 into my master, fix the conflicts then push?
[18:10:43] <cradek> yes
[18:11:01] <jepler> andypugh: well...
[18:11:11] <jepler> andypugh: you presented the case that the fix will be essentially different in master than in v2.5_branch
[18:11:31] <jepler> I proposed a workflow that will let you make a different fix in master and won't cause problems down the road
[18:12:02] <andypugh> Yes. In fact it might be an argument for somebody competent merging but leaving the conflict markers in, then I can immediately submit a patch to sort it out.
[18:12:12] <jepler> no
[18:12:30] <jepler> there is never a valid case for leaving conflict markers in
[18:13:00] <andypugh> I suspect you might have suggested the workflow when I wasn't paying attention. I will read back.
[18:13:18] <jepler> OK, I can also walk you through it again
[18:14:44] -!- Tom_itx [Tom_itx!~Tl@unaffiliated/toml/x-013812] has joined #linuxcnc-devel
[18:14:47] <cradek> ve7it: I'm having trouble even figuring out what version we have... this might be something alex has to deal with.
[18:14:51] <cradek> alex_joni: ^^
[18:16:22] <KGB-linuxcnc> 03jthornton 05master 08597ae 06linuxcnc 10docs/ 10(72 files in 12 dirs)
[18:16:23] <KGB-linuxcnc> Docs: add note to untranslated Spanish chapters
[18:16:23] <KGB-linuxcnc> add info for translators on how to get the latest version
[18:16:23] <KGB-linuxcnc> of that chapter before starting a translation.
[18:16:23] <KGB-linuxcnc> Signed-off-by: John Thornton <jthornton@gnipsel.com>
[18:16:39] <KGB-linuxcnc> 03jthornton 05master 2eb0d98 06linuxcnc 10docs/html/gcode.html * Docs: add m61 to quick reference
[18:16:45] <KGB-linuxcnc> 03jepler 05master c9513dd 06linuxcnc * Merge commit '2eb0d983aa4afe3fbd3397a85f38e0b3b1057c21'
[18:18:03] <cradek> that's a weird merge commit message
[18:19:03] <cradek> oh I see what you did
[18:19:08] <cradek> clever
[18:19:24] <jepler> andypugh: the workflow I think will work for your case is:
http://pastebin.com/MuPGqZ6P
[18:20:49] <jepler> this lets you make a different fix in master branch but ensures that when all is said and done, v2.5_branch is merged into master branch
[18:21:58] <andypugh> OK. I will give it a try.
[18:22:10] <jepler> if you are unsure before pushing please ask
[18:23:39] <andypugh> --dry-run will probably help my confidence
[18:29:00] <jepler> "Fight to the death... or die trying" -- video game tagline
[18:36:10] -!- md-2 has quit [Remote host closed the connection]
[18:56:42] -!- skorasaurus has quit [Quit: Elvis has left the building.]
[19:04:14] -!- stsydow has quit [Ping timeout: 240 seconds]
[19:09:45] <andypugh> Hmm, unfortunately the merge does not complete without conflicts.
[19:10:04] <andypugh> Auto-merging configs/sim/axis/check_constraints.hal
[19:10:05] <andypugh> Automatic merge failed; fix conflicts and then commit the result.
[19:14:24] -!- syyl_ws has quit [Quit: Verlassend]
[19:16:03] <andypugh> OK, no worries, it merged after a clean
[19:19:21] -!- L33TG33KG34R has quit [Ping timeout: 264 seconds]
[19:23:36] -!- L33TG33KG34R has quit [Read error: Connection reset by peer]
[19:29:17] -!- tomkralidis has quit [Quit: leaving]
[19:37:47] -!- vladimirek has quit [Remote host closed the connection]
[19:40:30] -!- vladimirek [vladimirek!~vladimire@95.105.250.72] has joined #linuxcnc-devel
[19:40:39] -!- md-2 has quit [Ping timeout: 240 seconds]
[19:42:38] -!- zzolo has quit [Quit: zzolo]
[19:53:16] -!- jfire has quit [Ping timeout: 264 seconds]
[19:53:18] -!- hm2-buildmaster_ has quit [Remote host closed the connection]
[19:53:25] -!- linuxcnc-build has quit [Remote host closed the connection]
[19:53:42] -!- hm2-buildmaster [hm2-buildmaster!~hm2-build@184-96-177-65.hlrn.qwest.net] has joined #linuxcnc-devel
[19:53:45] -!- linuxcnc-build [linuxcnc-build!~linuxcnc-@184-96-177-65.hlrn.qwest.net] has joined #linuxcnc-devel
[19:58:46] -!- Jp11 has quit [Ping timeout: 246 seconds]
[19:59:49] -!- rogge has quit [Quit: Page closed]
[20:05:09] -!- skunkworks has quit [Quit: Leaving]
[20:05:10] -!- nikola_ has quit [Quit: Page closed]
[20:07:39] -!- gimps_ has quit [Ping timeout: 276 seconds]
[20:10:41] -!- vladimirek has quit [Remote host closed the connection]
[20:23:29] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:31:45] <andypugh> jepler: Before I push, does this look right?
http://pastebin.com/31REsFG4
[20:33:00] <jepler> that looks weird, because I expect another commit which is the one that fixes resolvers in the right way for master branch
[20:33:13] <andypugh> Yes, I just noticed that absence
[20:33:44] <jepler> $ git merge origin/master
[20:33:45] <jepler> # This merge should complete without conflicts
[20:33:45] <jepler> # Fix resolver for master; test; commit
[20:33:45] <jepler> $ git checkout master
[20:33:54] <jepler> did you fix, test, commit?
[20:36:24] <andypugh> Gah! I was in completely the wrong terminal window looking at completely the wrong PC.
[20:40:48] -!- Simooon_z has quit [Quit: Leaving]
[20:48:05] -!- klick0 has quit [Ping timeout: 248 seconds]
[20:51:31] -!- i_tarzan_ has quit [Ping timeout: 240 seconds]
[20:52:45] <andypugh> http://pastebin.com/qBQ2SJ9k
[20:52:51] <andypugh> does that look better?
[20:53:36] <andypugh> (You know where I said that a "clean" fixed it? That was when I started working in the wrong teminal. I was editing the right file, just gitting on the wrong PC..
[20:56:51] -!- adb [adb!~IonMoldom@47-122.1-85.cust.bluewin.ch] has joined #linuxcnc-devel
[20:58:04] <andypugh> jepler: I am not convinced that line 53 belongs in a pushed commit?
[20:59:25] -!- DJ9DJ has quit [Quit: bye]
[21:01:55] -!- FinboySlick has quit [Quit: Leaving.]
[21:01:59] <jepler> > Merge remote branch 'origin/master' into hm2-resolver-fix-for-master
[21:02:08] <jepler> that is expected
[21:02:14] <jepler> I think that what you have is right in terms of git
[21:02:28] <jepler> I haven't studied the code enough to know if it's right :-P
[21:03:27] <andypugh> Ah, that part I am confident in. I have tested it.
[21:05:23] <andypugh> I am not _entirely_ sure how it will cope after more than 32-bits-worth of complete revolutions if there is no index in the interim. But that's a long time. 59 hours @ 20,000 rpm.
[21:06:03] <andypugh> I can't imagine that limit messing up a rigid-tapping operation.
[21:06:42] <KGB-linuxcnc> 03andy 05master 6cae47a 06linuxcnc 10src/hal/drivers/mesa-hostmot2/resolver.c
[21:06:42] <KGB-linuxcnc> Use a less bogus way to detect "index" with Resolvers.
[21:06:43] <KGB-linuxcnc> For example, one that only happens once per rev.
[21:06:43] <KGB-linuxcnc> And fix an off-by-one error in the reverse direction too.
[21:06:44] <KGB-linuxcnc> Signed-off-by: Andy Pugh <andy@bodgesoc.org>
[21:06:59] <KGB-linuxcnc> 03andy 05master c3d350d 06linuxcnc 10src/hal/drivers/mesa-hostmot2/resolver.c * Revert "Use a less bogus way to detect "index" with Resolvers."
[21:07:07] <KGB-linuxcnc> 03andy 05master 91efbf5 06linuxcnc * Merge remote branch 'origin/master' into hm2-resolver-fix-for-master
[21:07:13] <KGB-linuxcnc> 03andy 05master 492421b 06linuxcnc 10src/hal/drivers/mesa-hostmot2/resolver.c
[21:07:16] <KGB-linuxcnc> Improve the handling of multi-turn resolvers in the hm2 driver.
[21:07:19] <KGB-linuxcnc> You now get the same zero registered as an index in both directions,
[21:07:21] <KGB-linuxcnc> and you need to pass the zero in the same direction the requisite number of times.
[21:07:24] <KGB-linuxcnc> Signed-off-by: Andy Pugh <andy@bodgesoc.org>
[21:11:55] <jepler> andypugh: thanks
[21:13:21] -!- ctbenergy [ctbenergy!~ewaldwein@178-190-148-200.adsl.highway.telekom.at] has joined #linuxcnc-devel
[21:26:18] -!- AR__ has quit [Ping timeout: 276 seconds]
[21:35:31] -!- Simooon has quit [Quit: Leaving]
[21:35:37] -!- jogger has quit [Quit: Leaving.]
[21:41:31] -!- Jp11 has quit [Remote host closed the connection]
[21:43:45] -!- md-2 has quit [Ping timeout: 245 seconds]
[21:47:53] -!- ctbenergy [ctbenergy!~ewaldwein@178-190-148-200.adsl.highway.telekom.at] has parted #linuxcnc-devel
[21:54:12] -!- JT-Shop has quit [Read error: Connection reset by peer]
[21:55:01] -!- JT-Shop [JT-Shop!~John@198.45.190.160] has joined #linuxcnc-devel
[21:57:46] -!- mhaberler has quit [Quit: mhaberler]
[22:07:02] <andypugh> There is a slight bug in the 5-axis config. The INI needs to have a home-sequence entry for the absent joints, or you get spurious "joints must be homed" messages switching to World Mode.
[22:08:11] -!- zzolo has quit [Quit: zzolo]
[22:15:18] -!- thomaslindstr_m has quit [Remote host closed the connection]
[22:16:50] -!- filadome has quit [Read error: Connection reset by peer]
[22:17:05] -!- md-2 has quit [Remote host closed the connection]
[22:21:50] -!- `Nerobro has quit [Ping timeout: 240 seconds]
[22:22:55] -!- Connor has quit [Quit: Leaving.]
[22:27:45] -!- i_tarzan has quit [Ping timeout: 264 seconds]
[22:35:08] -!- `Nerobro_ has quit [Remote host closed the connection]
[22:38:11] -!- stsydow has quit [Quit: Leaving]
[22:46:08] -!- skorasaurus has quit [Ping timeout: 256 seconds]
[22:46:17] -!- odogono has quit [Quit: odogono]
[23:00:56] -!- gambakufu has quit [Read error: Connection reset by peer]
[23:02:55] -!- rob_h has quit [Ping timeout: 245 seconds]
[23:12:03] -!- toner has quit [Ping timeout: 268 seconds]
[23:40:59] -!- andypugh has quit [Quit: andypugh]
[23:41:16] -!- i_tarzan_ has quit [Ping timeout: 264 seconds]
[23:53:40] -!- tmcw has quit [Remote host closed the connection]
[23:57:12] -!- tomkralidis has quit [Quit: ChatZilla 0.9.90.1 [Firefox 23.0/20130730113002]]