Back
[00:02:56] -!-
Valen has quit [Ping timeout: 260 seconds]
[00:05:31] -!-
roberth__ [roberth__!~robert@5ace70f8.bb.sky.com] has joined #emc-devel
[00:05:35] <tissf> haha, git gui has a French interface, interesting
[00:08:04] <andypugh> gît guant?
[00:08:36] -!-
roberth_ has quit [Ping timeout: 240 seconds]
[00:14:05] -!-
stormlight has quit [Quit: stormlight]
[00:16:59] <tissf> I totally agree with the mail from John
[00:17:28] -!-
Loetmichel has quit [Ping timeout: 245 seconds]
[00:34:39] <tissf> git gui solved my problem :)
[00:43:10] -!-
andypugh has quit [Quit: andypugh]
[00:43:13] -!-
Calyp has quit [Quit: Leaving]
[00:46:20] -!-
servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[00:52:18] -!-
MOGLI has quit [Quit: Visitor from www.linuxcnc.org]
[00:53:35] -!-
Nick001-Shop has quit [Quit: ChatZilla 0.9.85 [Firefox 3.6.10/20100915193946]]
[00:57:45] -!-
skunkworks [skunkworks!~chatzilla@str-bb-cable-south2-static-6-425.dsl.airstreamcomm.net] has joined #emc-devel
[01:05:52] -!-
MDesade has quit [Remote host closed the connection]
[01:09:14] -!-
jsr has quit [Remote host closed the connection]
[01:11:28] -!-
roberth__ has quit [Ping timeout: 255 seconds]
[01:11:35] -!-
crazy_imp has quit [Ping timeout: 260 seconds]
[01:46:08] -!-
JT-Shop has quit [Ping timeout: 276 seconds]
[01:49:06] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[01:49:17] <cradek> I think I've fixed the incorrect merge
[01:49:39] <cradek> if you pulled in the meantime you must be careful not to push the incorrect merge again
[01:51:50] <CIA-95> EMC: 03cradek 07master * r188597c5d997 10/tcl/bin/pickconfig.tcl: pickconfig: minor refactor, use implicit global naming
[01:51:50] <CIA-95> EMC: 03cradek 07master * rfe042995f862 10/tcl/bin/pickconfig.tcl: pickconfig: fix var name error
[01:51:52] <CIA-95> EMC: 03cradek 07master * rf535aaf434d7 10/tcl/bin/pickconfig.tcl: pickconfig: support recursion into directories
[01:51:53] <CIA-95> EMC: 03cradek 07master * r7f8f6d9e06ae 10/tcl/bin/pickconfig.tcl: pickconfig: improve detail_box text display
[01:51:54] <CIA-95> EMC: 03cradek 07master * rfaf7a3a02d0d 10/configs/ (21 files in 4 dirs): configs: modify some examples to demo nested configurations
[01:51:55] <CIA-95> EMC: 03cradek 07master * r4b4e9923ff59 10/tcl/bin/pickconfig.tcl: pickconfig: show minimal tree when starting
[01:51:56] <CIA-95> EMC: 03cradek 07master * r0d938107ad47 10/tcl/bin/pickconfig.tcl: pickconfig: use emc::standard_fixed_font for detail_box
[01:51:57] <CIA-95> EMC: 03cradek 07master * r446f4a633f65 10/configs/sim/ (27 files in 3 dirs): configs/sim: make subdirs for axis and tkemc configs
[01:51:57] <CIA-95> EMC: 03cradek 07master * rba064b83b80f 10/configs/sim/ (7 files in 2 dirs): configs/sim use subdirectory for gladevcp
[01:51:58] <CIA-95> EMC: 03cradek 07master * rf78bfe069c04 10/share/axis/tcl/axis.tcl: axis.tcl: make auto_path work for RIP with tcl packages
[01:51:59] <CIA-95> EMC: 03cradek 07master * r5c51a5f913d2 10/docs/src/quickstart/stepper_quickstart_fr.txt: deleted unnecessary latexmath
[01:52:00] <CIA-95> EMC: 03cradek 07master * rcd8431e5fc68 10/docs/src/config/ (copy_and_run_fr.txt emc2hal_fr.txt ini_config_fr.txt): French translation update, deleted latexmath not working
[01:52:01] <CIA-95> EMC: 03cradek 07master * ra58cbcb070e2 10/ (60 files in 11 dirs): Merge branch 'v2.5_branch'
[01:54:45] -!-
JT-Shop has quit [Ping timeout: 260 seconds]
[01:58:35] <cradek> huh weird, I can't post to emc-commit. I thought I could.
[01:59:21] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[02:06:36] -!-
chester88 has quit [Ping timeout: 240 seconds]
[02:10:10] -!-
syyl has quit [Quit: Leaving]
[02:16:13] -!-
JT-Shop has quit [Ping timeout: 245 seconds]
[02:17:52] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[02:22:02] -!-
chester88 [chester88!~chris@S010688ae1d61f51a.no.shawcable.net] has joined #emc-devel
[02:23:48] -!-
adb has quit [Ping timeout: 240 seconds]
[02:30:39] -!-
emc_rules has quit [Ping timeout: 248 seconds]
[02:58:28] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[02:59:19] -!-
Quack has quit [Ping timeout: 260 seconds]
[02:59:47] -!-
JT-Shop has quit [Ping timeout: 260 seconds]
[03:00:26] JT-Shop_ is now known as
JT-Shop
[03:05:00] -!-
Quack has quit [Ping timeout: 240 seconds]
[03:28:12] -!-
emc_rules has quit [Ping timeout: 240 seconds]
[03:28:13] -!-
The_Ball has quit [Ping timeout: 240 seconds]
[03:55:19] -!-
Quack has quit [Ping timeout: 260 seconds]
[04:14:59] -!-
mikegg has quit [Ping timeout: 276 seconds]
[04:25:50] -!-
emc_rules has quit [Ping timeout: 260 seconds]
[04:27:15] -!-
emcrules_w700 has quit [Quit: Visitor from www.linuxcnc.org]
[04:33:31] -!-
Valen has quit [Quit: Leaving.]
[04:37:22] -!-
ve7it has quit [Remote host closed the connection]
[04:52:15] -!-
psha[work] [psha[work]!~psha@195.135.238.205] has joined #emc-devel
[04:53:16] -!-
tissf has quit [Ping timeout: 265 seconds]
[04:59:08] -!-
H264 has quit [Ping timeout: 245 seconds]
[04:59:19] -!-
WalterN has quit [Ping timeout: 258 seconds]
[05:02:39] -!-
factor has quit [Ping timeout: 256 seconds]
[05:12:10] -!-
Quack has quit [Ping timeout: 260 seconds]
[05:39:48] -!-
chester88 has quit [Ping timeout: 240 seconds]
[05:41:36] -!-
jsr__ has quit [Quit: Leaving]
[05:42:11] -!-
memleak has quit [Quit: Leaving]
[05:43:15] -!-
FinboySlick has quit [Quit: Leaving.]
[05:51:23] -!-
capricorn_one has quit [Remote host closed the connection]
[05:58:04] -!-
chester88 [chester88!~chris@64.180.197.163] has joined #emc-devel
[06:08:09] -!-
vladimirek [vladimirek!~vladimire@adsl-dyn-132.95-102-159.t-com.sk] has joined #emc-devel
[06:08:21] -!-
WalterN has quit [Quit: Leaving]
[06:10:43] -!-
Quack has quit [Ping timeout: 255 seconds]
[07:03:47] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[07:19:16] -!-
pingufan has quit [Remote host closed the connection]
[07:33:16] Eartaker is now known as
Eartaker-AFK
[07:33:20] -!-
factor has quit [Ping timeout: 258 seconds]
[07:41:00] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-hyqdffspmcyppelj] has joined #emc-devel
[07:42:20] -!-
e-ndy has quit [Remote host closed the connection]
[07:43:53] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-wuvvbyejlmbtctgr] has joined #emc-devel
[07:58:43] -!-
Quack has quit [Ping timeout: 258 seconds]
[08:02:27] -!-
Guest635 has quit [Client Quit]
[08:04:29] -!-
cradek has quit [Ping timeout: 260 seconds]
[08:19:54] -!-
cradek [cradek!~chris@outpost.timeguy.com] has joined #emc-devel
[08:26:01] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[08:26:30] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[08:42:09] -!-
mhaberler has quit [Quit: mhaberler]
[08:42:43] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[08:43:43] -!-
JT-Shop has quit [Ping timeout: 245 seconds]
[08:45:03] JT-Shop_ is now known as
JT-Shop
[08:48:57] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[08:49:24] -!-
JT-Shop has quit [Ping timeout: 240 seconds]
[08:49:31] JT-Shop_ is now known as
JT-Shop
[08:55:08] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[08:57:55] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[08:59:48] -!-
JT-Shop has quit [Ping timeout: 240 seconds]
[08:59:53] JT-Shop_ is now known as
JT-Shop
[09:01:13] -!-
emc_rules has quit [Ping timeout: 245 seconds]
[09:03:58] -!-
Eartaker-AFK has quit [Ping timeout: 255 seconds]
[09:06:10] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[09:08:02] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:11:19] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:13:10] -!-
cevad has quit [Quit: Leaving]
[09:13:20] -!-
JT-Shop has quit [Ping timeout: 276 seconds]
[09:15:51] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:17:19] -!-
JT-Shop__ [JT-Shop__!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:17:45] -!-
JT-Shop_ has quit [Ping timeout: 260 seconds]
[09:19:32] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:20:40] -!-
JT-Shop has quit [Ping timeout: 258 seconds]
[09:20:42] JT-Shop_ is now known as
JT-Shop
[09:21:49] -!-
JT-Shop__ has quit [Ping timeout: 258 seconds]
[09:30:42] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[09:31:31] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:33:40] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[09:34:07] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:36:23] -!-
stormlight has quit [Quit: stormlight]
[09:37:53] -!-
Calyp has quit [Ping timeout: 245 seconds]
[09:49:44] -!-
JT-Shop has quit [Ping timeout: 276 seconds]
[09:50:13] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[09:50:34] -!-
Calyp has quit [Ping timeout: 258 seconds]
[09:55:24] -!-
Quack has quit [Ping timeout: 260 seconds]
[10:05:54] -!-
JT-Shop has quit [Ping timeout: 260 seconds]
[10:16:23] -!-
Quack has quit [Ping timeout: 276 seconds]
[10:27:29] -!-
robh__ [robh__!~robert@5ace70f8.bb.sky.com] has joined #emc-devel
[11:04:41] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[11:20:42] -!-
vladimirek has quit [Remote host closed the connection]
[11:21:10] -!-
tissf [tissf!5a13d1ee@gateway/web/freenode/ip.90.19.209.238] has joined #emc-devel
[11:33:00] -!-
mhaberler has quit [Quit: mhaberler]
[12:49:18] -!-
factor has quit [Ping timeout: 240 seconds]
[13:01:38] -!-
ssi has quit [Ping timeout: 245 seconds]
[13:03:14] -!-
skunkworks has quit [Ping timeout: 260 seconds]
[13:31:43] -!-
cncbasher [cncbasher!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has parted #emc-devel
[13:35:13] -!-
cncbasher [cncbasher!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has joined #emc-devel
[13:52:08] -!-
skunkworks [skunkworks!~skunkwork@68-115-41-210.static.eucl.wi.charter.com] has joined #emc-devel
[13:52:57] -!-
psha[work] has quit [Quit: Lost terminal]
[13:54:15] -!-
factor has quit [Client Quit]
[13:59:26] -!-
pingufan has quit [Remote host closed the connection]
[14:03:24] -!-
Calyp has quit [Remote host closed the connection]
[14:04:32] -!-
Valen has quit [Quit: Leaving.]
[14:05:54] -!-
pcw_home has quit [Remote host closed the connection]
[14:14:59] -!-
Calyp has quit [Quit: Leaving]
[14:39:39] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[14:40:31] -!-
mhaberler has quit [Client Quit]
[14:42:11] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[15:14:55] -!-
mhaberler has quit [Quit: mhaberler]
[15:17:13] -!-
psha [psha!~psha@195.135.237.18] has joined #emc-devel
[15:53:00] -!-
bootnecklad_ has quit [Ping timeout: 260 seconds]
[16:14:42] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[16:25:11] -!-
ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #emc-devel
[16:26:55] -!-
factor has quit [Quit: Leaving]
[16:36:44] -!-
bootnecklad has quit [Quit: WeeChat 0.2.6]
[16:40:19] -!-
e-ndy has quit [Quit: Ex-Chat]
[16:42:12] -!-
bootnecklad_ has quit [Ping timeout: 240 seconds]
[16:42:24] -!-
JT-Shop has quit [Ping timeout: 252 seconds]
[16:44:37] -!-
cevad has quit [Quit: Leaving]
[16:48:31] -!-
JT-Shop has quit [Ping timeout: 260 seconds]
[16:49:07] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[16:49:07] JT-Shop_ is now known as
JT-Shop
[16:52:54] <jepler> cradek: thanks for sorting out that git problem yesterday
[16:53:59] -!-
psha has quit [Quit: Lost terminal]
[16:58:16] -!-
bootnecklad has quit [Ping timeout: 260 seconds]
[16:59:36] <cradek> welcome. I'm glad I got it right in one try. I had not done that before.
[17:02:58] -!-
chester88 has quit [Ping timeout: 258 seconds]
[17:15:58] -!-
Nick001 has quit [Ping timeout: 252 seconds]
[17:17:57] -!-
chester88 [chester88!~chris@64.180.207.113] has joined #emc-devel
[17:43:33] -!-
rooks has quit [Read error: Operation timed out]
[17:45:39] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[17:55:30] -!-
mhaberler has quit [Quit: mhaberler]
[17:58:20] -!-
psha [psha!~psha@213.208.162.69] has joined #emc-devel
[18:11:00] -!-
chester88 has quit [Ping timeout: 240 seconds]
[18:12:06] -!-
bootnecklad__ has quit [Ping timeout: 240 seconds]
[18:13:42] -!-
emc_rules has quit [Ping timeout: 240 seconds]
[18:32:47] -!-
vladimirek [vladimirek!~vladimire@95.102.159.132] has joined #emc-devel
[18:51:55] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[18:52:14] -!-
JT-Shop has quit [Ping timeout: 252 seconds]
[18:52:28] JT-Shop_ is now known as
JT-Shop
[19:10:30] -!-
robin_sz has quit [Ping timeout: 240 seconds]
[19:10:59] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[19:11:24] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[19:18:25] -!-
psha has quit [Quit: leaving]
[19:21:14] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[19:25:58] -!-
IchGucksLive has quit [Quit: ChatZilla 0.9.86 [Firefox 3.6.23/20110921065534]]
[19:26:59] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust492.basl.cable.virginmedia.com] has joined #emc-devel
[19:32:38] -!-
Goslowjimbo has quit [Quit: Leaving]
[19:56:18] -!-
chester88 [chester88!~chris@64.180.204.57] has joined #emc-devel
[20:26:13] -!-
bootnecklad_ has quit [Ping timeout: 245 seconds]
[20:49:33] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[20:52:05] -!-
Quack has quit [Ping timeout: 276 seconds]
[20:59:53] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[21:08:16] -!-
vladimirek has quit [Remote host closed the connection]
[21:21:09] -!-
JT-Shop_ [JT-Shop_!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[21:21:31] -!-
JT-Shop has quit [Ping timeout: 255 seconds]
[21:21:45] JT-Shop_ is now known as
JT-Shop
[21:44:24] -!-
JT-Shop has quit [Read error: Connection reset by peer]
[21:53:36] <CIA-95> EMC: 03tissf 07v2.5_branch * r0683d43820b6 10/docs/ (TODO src/motion/kinematics_fr.txt): French update - 1rst after wrong merge...
[21:54:26] <andypugh> tissf: Glad you do't lose your nerve :-)
[21:54:34] <cradek> yes!
[21:55:49] <tissf> pfff... ! Thanks for help
[21:56:25] <cradek> that was not the first or last mistaken merge we've had
[21:56:53] <andypugh> I anticipate another tonight.
[21:57:03] * cradek shivers
[21:57:17] <andypugh> (Resolver driver, if that's OK with your release schedule, cradek?)
[21:57:33] <cradek> ooh, how does it work?
[21:57:48] <andypugh> Well, it needs the Mesa 7i49
[21:58:12] <andypugh> So not as exciting as it might have sounded
[21:59:11] <cradek> does it look like regular encoders?
[21:59:17] <cradek> at the hal level I mean
[21:59:32] <andypugh> Largely
[22:00:03] <andypugh> You get position/velocity/index-enable/reset/counts/rawcounts
[22:00:10] <cradek> excellent
[22:01:16] <andypugh> counts/rawcounts is only really for compatibility, but emulates a 16777216 ppr encoder
[22:01:42] <andypugh> Simply because 32 bits of data seemed silly
[22:01:50] <cradek> cool
[22:02:13] -!-
Spida has quit [Ping timeout: 260 seconds]
[22:02:17] <andypugh> I don't know if it works, I am doing my special party trick of writing a driver with no hardware.
[22:02:39] <andypugh> (Pete is testing)
[22:03:23] <cradek> that's better than any party trick I know
[22:04:38] -!-
isssy has quit [Client Quit]
[22:10:50] -!-
Goslowjimbo has quit [Client Quit]
[22:11:44] -!-
mhaberler has quit [Quit: mhaberler]
[22:17:25] -!-
skunkworks has quit []
[22:23:08] -!-
MOGLI has quit [Ping timeout: 258 seconds]
[22:29:35] -!-
odiug has quit [Ping timeout: 276 seconds]
[22:30:23] -!-
Quack has quit [Ping timeout: 256 seconds]
[22:43:11] <andypugh> I am trying to make a patch between my development branch and origin/v2.5_branch. I end up with 904 patch files, which is not what I was hoping for.
[22:44:24] <andypugh> The puzzling thing is that there is only one commit in the development branch, and it has been rebased to origin/master
[22:44:52] <andypugh> Not origin/master, origin/v2.5_branch
[22:45:01] -!-
acemi has quit [Quit: WeeChat 0.3.2]
[22:45:22] -!-
Calyp has quit [Quit: Leaving]
[22:46:36] <andypugh> Actually, not even that. It is rebased onto my local tracking v2.5_branch. Which has been reset and pulled
[22:54:43] -!-
Fox_Muldr has quit [Ping timeout: 260 seconds]
[22:59:27] -!-
FinboySlick has quit [Quit: Leaving.]
[23:20:06] -!-
Nick001-Shop has quit [Remote host closed the connection]
[23:22:08] -!-
servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[23:24:41] -!-
factor has quit [Ping timeout: 260 seconds]
[23:24:53] -!-
jsr__ has quit [Quit: Leaving]
[23:40:12] -!-
skunkworks [skunkworks!~chatzilla@str-bb-cable-south2-static-6-425.dsl.airstreamcomm.net] has joined #emc-devel
[23:54:07] -!-
tissf has quit [Quit: Page closed]
[23:55:57] -!-
Quack has quit [Ping timeout: 256 seconds]
[23:56:37] -!-
robh__ has quit [Read error: Connection reset by peer]
[23:57:01] -!-
robh__ [robh__!~robert@5ace70f8.bb.sky.com] has joined #emc-devel