Back
[00:00:29] -!-
Nick001-Shop has quit [Quit: ChatZilla 0.9.88.2 [Firefox 11.0/20120312181643]]
[00:20:13] -!-
Loetmichel has quit [Ping timeout: 252 seconds]
[00:45:10] -!-
phantoxe has quit []
[01:04:22] <andypugh> Anyone going to pick up that patch from the bug reporting site? The patch looks valid, but I am not familiar with that part of the code. The guy has done all the right things, it would be a shame if everyone waited for someone else to push it.
[01:07:07] -!-
pfred1 has quit [Quit: switching WMs]
[01:21:27] -!-
mhaberler has quit [Quit: mhaberler]
[01:36:13] -!-
sumpfralle has quit [Read error: Connection reset by peer]
[01:36:52] -!-
sumpfralle1 has quit [Read error: Connection reset by peer]
[02:20:46] -!-
kb8wmc has quit [Ping timeout: 276 seconds]
[02:34:52] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[02:37:38] -!-
koax [koax!~kelb@p508D6485.dip.t-dialin.net] has joined #linuxcnc-devel
[02:41:22] -!-
koax_ has quit [Ping timeout: 265 seconds]
[02:48:29] -!-
demacus has quit [Ping timeout: 245 seconds]
[02:52:09] -!-
atom1 has quit [Quit: Leaving]
[03:00:08] -!-
A0Sheds has quit [Ping timeout: 240 seconds]
[03:12:28] -!-
cylly2 has quit [Read error: Connection reset by peer]
[03:29:26] -!-
andypugh has quit [Quit: andypugh]
[03:40:08] -!-
pfred1 has quit [Quit: Lost terminal]
[04:02:27] -!-
Valen has quit [Quit: Leaving.]
[04:08:56] -!-
cmorley has quit [Ping timeout: 272 seconds]
[04:17:33] -!-
ve7it has quit [Remote host closed the connection]
[04:25:19] -!-
cmorley [cmorley!~chris@d64-180-200-50.bchsia.telus.net] has joined #linuxcnc-devel
[04:51:43] -!-
joe9 has quit [Quit: leaving]
[04:52:25] -!-
psha[work] [psha[work]!~psha@195.135.238.205] has joined #linuxcnc-devel
[04:58:31] -!-
Thetawaves has quit [Quit: This computer has gone to sleep]
[06:09:20] -!-
cevad has quit [Quit: Leaving]
[06:15:48] <CIA-68> 03cmorley 07v2.5_branch * r1366194d7a21 10/src/emc/usr_intf/pncconf/pncconf.glade: pncconf -fix BLDC options were sensitive by default
[06:15:49] <CIA-68> 03cmorley 07v2.5_branch * r3b399df5d6a2 10/src/emc/usr_intf/pncconf/pncconf.glade: pncconf -fix layout of basic machine info page
[06:15:49] <CIA-68> 03cmorley 07v2.5_branch * r64441d00aa1c 10/src/emc/usr_intf/pncconf/pncconf-help/ (help-axismotor.txt help-mesa.txt): pncconf -add info to help pages
[06:15:49] <CIA-68> 03cmorley 07v2.5_branch * r6481c8a502c9 10/src/emc/usr_intf/pncconf/pncconf.py: pncconf -fix some 5i25 sserial errors
[06:22:34] -!-
kb8wmc has quit [Ping timeout: 276 seconds]
[06:29:07] -!-
pingufan has quit [Quit: Konversation terminated!]
[06:36:05] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[07:03:18] -!-
iwoj has quit [Quit: Textual IRC Client:
http://www.textualapp.com/]
[07:07:04] -!-
WalterN has quit [Read error: Connection reset by peer]
[07:29:29] -!-
iwoj has quit [Quit: Textual IRC Client:
http://www.textualapp.com/]
[07:35:56] -!-
capricorn_one has quit [Remote host closed the connection]
[07:41:56] -!-
iwoj has quit [Quit: Textual IRC Client:
http://www.textualapp.com/]
[07:55:10] -!-
tiago has quit [Ping timeout: 260 seconds]
[07:57:26] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[08:05:42] e-ndy|afk is now known as
e-ndy
[08:11:58] -!-
the-jub has quit [Remote host closed the connection]
[08:16:50] -!-
erasmo [erasmo!~erasmo@212.106.27.195] has joined #linuxcnc-devel
[08:23:29] -!-
cnc-9-Achsen has quit [Quit: ChatZilla 0.9.87 [Firefox 3.6.8/20100723084720]]
[08:23:58] -!-
rob_h [rob_h!~rob_h@5ace7005.bb.sky.com] has joined #linuxcnc-devel
[08:26:17] -!-
tiago has quit [Ping timeout: 245 seconds]
[08:26:43] -!-
vladimirek has quit [Ping timeout: 276 seconds]
[09:15:19] -!-
sumpfralle has quit [Quit: Leaving.]
[09:27:57] -!-
tiago has quit [Ping timeout: 245 seconds]
[09:35:44] -!-
Thetawaves has quit [Quit: This computer has gone to sleep]
[09:55:38] -!-
elmo40 has quit [Quit: Leaving.]
[10:01:52] -!-
pjm has quit [Ping timeout: 246 seconds]
[10:33:20] e-ndy is now known as
e-ndy|afk
[11:09:04] -!-
phantoxe has quit [Ping timeout: 260 seconds]
[11:27:04] -!-
mhaberler has quit [Quit: mhaberler]
[11:32:51] e-ndy|afk is now known as
e-ndy
[11:35:00] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[11:43:43] -!-
mhaberler has quit [Quit: mhaberler]
[11:48:52] -!-
the-jub has quit [Quit: ill be back soon! :-/ ....maybe..]
[12:02:14] -!-
Thetawaves has quit [Quit: This computer has gone to sleep]
[12:16:32] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[12:29:20] -!-
kb8wmc has quit [Ping timeout: 265 seconds]
[12:31:40] -!-
joe9 [joe9!~joe9@c-24-99-80-97.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[12:32:25] -!-
stevegt_ has quit [Ping timeout: 276 seconds]
[12:34:57] -!-
skunkworks__ has quit [Remote host closed the connection]
[12:43:51] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[13:20:18] -!-
psha[work] has quit [Quit: Lost terminal]
[13:25:53] -!-
steves_logging has quit [Ping timeout: 265 seconds]
[13:39:48] -!-
mrsun has quit [Read error: Connection timed out]
[14:01:46] -!-
Valen has quit [Quit: Leaving.]
[14:06:32] -!-
psha [psha!~psha@213.208.162.69] has joined #linuxcnc-devel
[14:06:58] <mhaberler> looks reasonable to me, too
[14:10:34] -!-
pjm__ has quit [Read error: Connection reset by peer]
[14:13:28] <CIA-68> 03mhaberler 07master * r88d19ac346eb 10/src/emc/rs274ngc/interp_convert.cc: interp: fix ID 3519235
[14:15:12] <mhaberler> I guess this should go into v2.4_branch and v2.5_branch as well
[14:16:13] -!-
pjm__ has quit [Read error: Connection reset by peer]
[14:18:04] -!-
joe9 has quit [Ping timeout: 245 seconds]
[14:21:04] -!-
joe9 [joe9!~joe9@c-24-99-80-97.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[14:22:03] <cradek> then you should have put it there and merged
[14:22:42] <cradek> also I was just noticing that the default is not explicitly set in ::init()
[14:22:56] <cradek> sorry, I should have said I was working on it :-/
[14:23:23] <CIA-68> 03mhaberler 07v2.4_branch * rc914a0036c60 10/src/emc/rs274ngc/interp_convert.cc: interp: fix ID 3519235
[14:26:11] <cradek> mhaberler: why did you claim authorship for his change?
[14:26:31] <mhaberler> Why? I signed it off, thats all
[14:26:55] <cradek> it shows you as the author
[14:27:28] <cradek> when I did git am, it showed him as author, me as committer
[14:27:28] <mhaberler> I used git apply 0001-… so whats wrong with that
[14:27:37] <cradek> hmm I'm not sure
[14:28:42] <mhaberler> I am happy to take a backseat on applying patches, provided somebody else picks them up in finite time.
[14:29:20] -!-
micges [micges!~micges@ddx180.neoplus.adsl.tpnet.pl] has joined #linuxcnc-devel
[14:30:05] <cradek> sorry, I didn't mean to sound like I didn't want you to help. I do think it's important to do it carefully, though.
[14:30:11] <psha> git apply just applies patch
[14:30:24] <psha> git am picks full commit and records it with original author name
[14:30:30] <mhaberler> yeah, I see - I should have used git am instead of git apply
[14:30:32] <cradek> oh ok, I have always used am
[14:30:48] <mhaberler> well, too late for that one, I'll roll it forward from v2.4_branch
[14:30:57] <cradek> wait
[14:31:03] <psha> there is also form of git am -s with sign-off line added automaticaly
[14:31:22] <psha> to solve cases like this
[14:31:27] <mhaberler> aja
[14:34:57] <cradek> I am a bit tempted to force-push to fix this authorship. what do you guys think?
[14:35:25] <mhaberler> what do you gain?
[14:35:58] <cradek> correct credit to the author
[14:36:08] <psha> less then ~15 minutes - probably ok
[14:36:25] <cradek> (and a clean forward merge)
[14:36:29] <psha> if there is not automatic mirroring
[14:36:39] <psha> s/not/no
[14:36:53] <mhaberler> ok, then please keep your hands off until I'm done.
[14:37:27] <cradek> hang on a sec
[14:37:33] -!-
dimas has quit [Quit: Ухожу я от вас (xchat 2.4.5 или старше)]
[14:37:46] <cradek> http://timeguy.com/cradek-files/emc/0001-explicitly-set-default-spindle-mode.patch
[14:38:00] <cradek> I think this is the second half of a complete fix
[14:39:38] <cradek> I will keep out of the way if you are handling it. Thanks.
[14:41:14] <mhaberler> ok
[14:41:33] <cradek> I think I have reset all my branches so your force won't hurt me...
[14:42:12] <cradek> I suggest removing the patch from master, then putting both patches on 2.4 and merging 2.4->2.5 and 2.5->master
[14:43:22] -!-
joe9 has quit [Quit: leaving]
[14:43:56] <mhaberler> ok
[14:44:40] -!-
joe9 [joe9!~joe9@c-24-99-80-97.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[14:46:37] <CIA-68> 03mhaberler 07v2.4_branch * rd7e387354fb5 10/src/emc/rs274ngc/interp_convert.cc: Correctly set settings->spindle_mode on G96/G97 in interp_convert.cc. Fixes bug where Active GCodes string in Axis incorrectly displays current G96/G97 mode.
[14:46:39] <CIA-68> 03mhaberler 07v2.4_branch * rcc829033bbb9 10/src/emc/rs274ngc/rs274ngc_pre.cc: explicitly set default spindle mode
[14:48:49] <CIA-68> 03mhaberler 07v2.5_branch * rfbc69200fcde 10/src/emc/rs274ngc/ (interp_convert.cc rs274ngc_pre.cc): Merge branch 'v2.4_branch' into v2.5_branch
[14:50:50] -!-
steve_stallings [steve_stallings!~Steve@wsip-70-168-134-18.dc.dc.cox.net] has joined #linuxcnc-devel
[14:51:18] <CIA-68> 03mhaberler 07master * r5d1ca1409507 10/ (8 files in 5 dirs): Merge branch 'v2.5_branch'
[14:51:59] <mhaberler> ok, done
[14:52:13] <cradek> thanks!
[15:10:34] -!-
kent_ has quit [Ping timeout: 260 seconds]
[15:11:06] -!-
mhaberler has quit [Quit: mhaberler]
[15:16:59] -!-
Vq has quit [Ping timeout: 260 seconds]
[15:23:45] -!-
stevegt_ has quit [Ping timeout: 260 seconds]
[15:36:09] -!-
Nick001 has quit [Ping timeout: 265 seconds]
[15:37:00] -!-
mk0 has quit [Quit: LinuxCNC 2.5.0!]
[15:39:24] e-ndy is now known as
e-ndy|afk
[15:40:27] -!-
IchGuckLive has quit [Quit: ChatZilla 0.9.87 [Firefox 11.0/20120310193829]]
[15:45:03] -!-
tiago has quit [Remote host closed the connection]
[15:46:13] phantone is now known as
phantoxe
[16:36:43] e-ndy|afk is now known as
e-ndy
[16:47:04] -!-
ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #linuxcnc-devel
[16:47:18] -!-
maximilian_h [maximilian_h!~bonsai@xdsl-89-0-190-86.netcologne.de] has joined #linuxcnc-devel
[17:02:52] -!-
maximilian_h has quit [Quit: Leaving.]
[17:09:09] -!-
phantoxe has quit []
[17:27:48] -!-
pcw_home has quit [Ping timeout: 244 seconds]
[17:34:02] -!-
isssy has quit [Quit: Bye Bye]
[18:16:31] -!-
kb8wmc has quit [Read error: Connection reset by peer]
[18:21:53] -!-
IchGuckLive has quit [Quit: ChatZilla 0.9.87 [Firefox 11.0/20120310193829]]
[18:24:25] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[18:26:20] -!-
joe9 has quit [Ping timeout: 260 seconds]
[18:34:26] -!-
sumpfralle has quit [Quit: Leaving.]
[18:50:02] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[18:56:44] -!-
gambakufu has quit [Ping timeout: 265 seconds]
[19:12:12] -!-
davec_ has quit [Ping timeout: 260 seconds]
[19:13:21] -!-
Himanshu_ has quit [Ping timeout: 245 seconds]
[19:21:39] e-ndy is now known as
e-ndy|gone
[19:22:29] e-ndy|gone is now known as
e-ndy|afk
[19:51:16] -!-
martinst [martinst!~martin@p5DCBC3C9.dip0.t-ipconnect.de] has joined #linuxcnc-devel
[19:54:20] -!-
fliebel has quit [Remote host closed the connection]
[19:57:05] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust639.basl.cable.virginmedia.com] has joined #linuxcnc-devel
[20:07:33] -!-
WalterN has quit [Read error: Connection reset by peer]
[20:17:31] -!-
olivius67 has quit [Quit: Ex-Chat]
[20:22:40] -!-
bedah has quit [Quit: bye]
[20:38:01] -!-
mozmck has quit [Quit: Leaving.]
[20:38:22] -!-
olivius67 has quit [Quit: Ex-Chat]
[20:39:09] -!-
mozmck [mozmck!~moses@client-74.117.92.175.dfwtx.partnershipbroadband.com] has joined #linuxcnc-devel
[20:41:18] -!-
martinst has quit [Quit: Leaving]
[20:41:19] -!-
kb8wmc has quit [Ping timeout: 246 seconds]
[20:41:48] -!-
joe9 [joe9!~joe9@c-24-99-80-97.hsd1.ga.comcast.net] has joined #linuxcnc-devel
[20:48:22] -!-
A0Sheds has quit [Ping timeout: 276 seconds]
[20:50:00] -!-
vladimirek has quit [Remote host closed the connection]
[21:00:37] -!-
micges has quit [Quit: Leaving]
[21:07:12] -!-
FinboySlick has quit [Quit: Leaving.]
[21:07:51] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[21:10:56] -!-
DJ9DJ has quit [Quit: bye]
[21:13:17] -!-
adb [adb!~adb@178-211-226-40.dhcp.voenergies.net] has joined #linuxcnc-devel
[21:21:11] -!-
erasmo has quit [Read error: Connection reset by peer]
[21:24:08] -!-
ReadPhone has quit [Remote host closed the connection]
[21:43:13] -!-
andypugh has quit [Quit: andypugh]
[21:46:25] -!-
isssy has quit [Read error: Connection reset by peer]
[21:53:09] -!-
Fox_Muldr has quit [Ping timeout: 265 seconds]
[22:05:32] -!-
syyl has quit [Quit: Leaving]
[22:20:29] -!-
sumpfralle has quit [Ping timeout: 260 seconds]
[22:35:43] -!-
psha has quit [Quit: Lost terminal]
[22:38:24] -!-
skunkworks__ [skunkworks__!~chatzilla@wsip-174-76-136-99.tu.ok.cox.net] has joined #linuxcnc-devel
[22:39:04] -!-
asdfasd has quit [Ping timeout: 265 seconds]
[23:03:04] <CIA-68> 03mhaberler 07master * rd5bcd75bdd3b 10/src/emc/rs274ngc/interp_o_word.cc: interp: fix sequence number tracking in external oword subroutines
[23:03:05] <CIA-68> 03mhaberler 07master * rd121938c4c50 10/tests/interp/sequence-number/ (README expected rm400.ngc test.ini test.ngc test.sh): tests: show correct sequence number tracking in oword subroutines
[23:09:08] <cradek> woo!
[23:10:04] -!-
rob_h has quit [Ping timeout: 260 seconds]
[23:11:29] -!-
mhaberler has quit [Ping timeout: 252 seconds]
[23:16:20] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[23:16:27] -!-
elmo40 has quit [Read error: Connection reset by peer]