Back
[00:04:23] -!-
theorbtwo has quit [Ping timeout: 256 seconds]
[00:04:38] theorb is now known as
theorbtwo
[00:12:34] -!-
micges has quit [Quit: Ex-Chat]
[00:18:42] -!-
Loetmichel has quit [Ping timeout: 276 seconds]
[00:21:04] -!-
Danimal_garage|2 has quit [Read error: Connection reset by peer]
[00:34:33] -!-
WalterN has quit [Read error: Connection reset by peer]
[00:41:07] -!-
A2Sheds has quit [Ping timeout: 258 seconds]
[00:48:04] -!-
Calyp has quit [Ping timeout: 244 seconds]
[00:50:18] -!-
mhaberler has quit [Quit: mhaberler]
[00:57:22] -!-
Calyp has quit [Ping timeout: 244 seconds]
[00:57:37] -!-
stormlight has quit [Quit: stormlight]
[01:08:09] -!-
atom1 has quit [Quit: Leaving]
[01:11:01] -!-
crazy_imp has quit [Ping timeout: 258 seconds]
[01:42:12] -!-
A2Sheds has quit [Quit: puff of smoke]
[01:44:02] -!-
seb_kuzminsky has quit [Quit: Leaving]
[01:45:42] -!-
Calyp has quit [Ping timeout: 259 seconds]
[01:52:12] -!-
A2Sheds has quit [Quit: puff of smoke]
[02:00:26] -!-
|n0b0dy| has quit [Ping timeout: 260 seconds]
[02:19:12] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust492.basl.cable.virginmedia.com] has parted #emc-devel
[02:29:06] -!-
ries has quit [Quit: ries]
[02:31:13] -!-
A2Sheds has quit [Quit: puff of smoke]
[02:42:06] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[02:47:57] -!-
Calyp has quit [Quit: Leaving]
[02:52:54] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[02:58:18] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[03:03:15] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[03:10:15] -!-
theos has quit [Ping timeout: 260 seconds]
[03:15:33] -!-
stormlight has quit [Quit: stormlight]
[03:26:42] -!-
atom1 has quit [Quit: Leaving]
[03:44:37] -!-
theos has quit [Ping timeout: 252 seconds]
[04:08:33] -!-
cevad has quit [Quit: Leaving]
[04:33:40] -!-
bootnecklad has quit [Ping timeout: 260 seconds]
[04:34:37] -!-
FinboySlick has quit [Quit: Leaving.]
[04:45:19] -!-
bootnecklad1 has quit [Ping timeout: 260 seconds]
[04:51:58] -!-
ve7it has quit [Remote host closed the connection]
[05:02:48] davec is now known as
Guest48408
[05:03:14] Guest48408 is now known as
cevad
[05:11:13] -!-
MarkusBec has quit [Ping timeout: 245 seconds]
[05:12:31] -!-
psha[work] [psha[work]!~psha@195.135.238.205] has joined #emc-devel
[05:19:44] -!-
crazy_imp has quit [Ping timeout: 260 seconds]
[05:24:00] -!-
Eartaker has quit [Quit: OOOOOO Whats that....]
[05:30:51] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[06:18:45] -!-
vladimirek [vladimirek!~vladimire@adsl-dyn-35.95-102-159.t-com.sk] has joined #emc-devel
[06:22:37] -!-
factor has quit [Ping timeout: 240 seconds]
[06:25:51] -!-
maxster has quit [Ping timeout: 248 seconds]
[06:54:40] -!-
vladimirek has quit [Ping timeout: 258 seconds]
[07:03:25] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[07:29:04] -!-
micges_work [micges_work!~x@afrp114.neoplus.adsl.tpnet.pl] has joined #emc-devel
[07:48:22] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-ajfwzzudblbgamoi] has joined #emc-devel
[08:12:35] -!-
WalterN has quit [Read error: Connection reset by peer]
[08:22:01] -!-
factor has quit [Read error: Connection reset by peer]
[09:46:44] -!-
psha[work] has quit [Quit: Lost terminal]
[10:15:22] -!-
bootnecklad_ has quit [Ping timeout: 244 seconds]
[10:28:13] -!-
CIA-95 [CIA-95!~CIA@cia.atheme.org] has joined #emc-devel
[10:28:34] -!-
Jymmm has quit [*.net *.split]
[10:28:35] -!-
crazy_imp has quit [*.net *.split]
[10:28:37] -!-
Calyp has quit [*.net *.split]
[10:28:39] -!-
logger_dev has quit [*.net *.split]
[10:28:39] -!-
logger_emc has quit [*.net *.split]
[10:28:40] -!-
mhaberler has quit [*.net *.split]
[10:28:40] -!-
theorbtwo has quit [*.net *.split]
[10:28:40] -!-
DaViruz has quit [*.net *.split]
[10:28:41] -!-
The_Ball has quit [*.net *.split]
[10:28:41] -!-
elmo40 has quit [*.net *.split]
[10:28:41] -!-
emcrules has quit [*.net *.split]
[10:28:42] -!-
alex4nder has quit [*.net *.split]
[10:28:42] -!-
kanzure has quit [*.net *.split]
[10:28:44] -!-
Nick001 has quit [*.net *.split]
[10:28:44] -!-
mikegg has quit [*.net *.split]
[10:28:45] -!-
PCW has quit [*.net *.split]
[10:28:45] -!-
SWPadnos has quit [*.net *.split]
[10:28:47] -!-
MattyMatt has quit [*.net *.split]
[10:28:47] -!-
e-ndy has quit [*.net *.split]
[10:28:47] -!-
Fox_Muldr has quit [*.net *.split]
[10:28:49] -!-
bootnecklad1 has quit [*.net *.split]
[10:28:50] -!-
morfic has quit [*.net *.split]
[10:28:51] -!-
emc2-buildmaster has quit [*.net *.split]
[10:28:52] -!-
micges_work has quit [*.net *.split]
[10:28:53] -!-
the_wench has quit [*.net *.split]
[10:28:57] -!-
jstenback has quit [*.net *.split]
[10:28:58] -!-
Poincare has quit [*.net *.split]
[10:28:58] -!-
Farthen has quit [*.net *.split]
[10:29:00] -!-
Spida has quit [*.net *.split]
[10:29:00] -!-
frysteev has quit [*.net *.split]
[10:29:01] -!-
anonimasu has quit [*.net *.split]
[10:29:01] -!-
KimK has quit [*.net *.split]
[10:29:01] -!-
cpresser has quit [*.net *.split]
[10:29:01] -!-
Vq has quit [*.net *.split]
[10:29:01] -!-
tris has quit [*.net *.split]
[10:29:02] -!-
Valen has quit [*.net *.split]
[10:29:02] -!-
A2Sheds has quit [*.net *.split]
[10:29:02] -!-
logger[mah] has quit [*.net *.split]
[10:29:02] -!-
awallin has quit [*.net *.split]
[10:29:03] -!-
chester88 has quit [*.net *.split]
[10:29:05] -!-
jdhNC has quit [*.net *.split]
[10:29:05] -!-
SadMan has quit [*.net *.split]
[10:29:06] -!-
factor has quit [*.net *.split]
[10:29:06] -!-
Loetmichel has quit [*.net *.split]
[10:29:06] -!-
H264 has quit [*.net *.split]
[10:29:07] -!-
zlog has quit [*.net *.split]
[10:29:08] -!-
norias has quit [*.net *.split]
[10:29:09] -!-
i_tarzan has quit [*.net *.split]
[10:29:09] -!-
mrsun has quit [*.net *.split]
[10:29:09] -!-
rooks has quit [*.net *.split]
[10:29:11] -!-
uwe_ has quit [*.net *.split]
[10:29:11] -!-
lilalinux has quit [*.net *.split]
[10:29:12] -!-
bootnecklad has quit [*.net *.split]
[10:29:13] -!-
|n0b0dy| has quit [*.net *.split]
[10:29:13] -!-
packrat has quit [*.net *.split]
[10:29:14] -!-
kp has quit [*.net *.split]
[10:29:14] -!-
uwe_mobile has quit [*.net *.split]
[10:29:15] -!-
archivist_emc has quit [*.net *.split]
[10:29:15] -!-
cradek has quit [*.net *.split]
[10:29:15] -!-
ds3 has quit [*.net *.split]
[10:29:15] -!-
steves_logging has quit [*.net *.split]
[10:29:15] -!-
fragalot has quit [*.net *.split]
[10:29:16] -!-
CIA-62 has quit [*.net *.split]
[10:29:17] -!-
cevad has quit [*.net *.split]
[10:29:18] -!-
emc_rules has quit [*.net *.split]
[10:29:18] -!-
toastyde1th has quit [*.net *.split]
[10:29:18] -!-
Tom_itx has quit [*.net *.split]
[10:29:20] -!-
jepler has quit [*.net *.split]
[10:29:21] -!-
ChanServ has quit [*.net *.split]
[10:30:50] -!-
jepler [jepler!~jepler@dsl.unpythonic.net] has joined #emc-devel
[10:32:56] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-ajfwzzudblbgamoi] has joined #emc-devel
[10:32:57] -!-
micges_work [micges_work!~x@afrp114.neoplus.adsl.tpnet.pl] has joined #emc-devel
[10:32:57] -!-
PCW [PCW!~chatzilla@99.88.10.65] has joined #emc-devel
[10:32:57] -!-
logger[mah] [logger[mah]!~loggermah@burgi.mah.priv.at] has joined #emc-devel
[10:32:57] -!-
awallin [awallin!awallin@lakka.kapsi.fi] has joined #emc-devel
[10:32:57] -!-
the_wench [the_wench!~the_wench@host81-149-189-98.in-addr.btopenworld.com] has joined #emc-devel
[10:32:57] -!-
chester88 [chester88!~chris@64.180.197.163] has joined #emc-devel
[10:32:57] -!-
SWPadnos [SWPadnos!~Me@74-92-8-208-NewEngland.hfc.comcastbusiness.net] has joined #emc-devel
[10:32:57] -!-
emc2-buildmaster [emc2-buildmaster!~emc2-buil@174-16-115-184.hlrn.qwest.net] has joined #emc-devel
[10:32:57] -!-
logger_dev [logger_dev!~emc-deve-@vox.dreamhost.com] has joined #emc-devel
[10:32:57] -!-
Jymmm [Jymmm!~jymmm@unaffiliated/jymmm] has joined #emc-devel
[10:32:57] -!-
KimK [KimK!~Kim__@209.248.147.2.nw.nuvox.net] has joined #emc-devel
[10:42:15] -!-
cradek [cradek!~chris@outpost.timeguy.com] has joined #emc-devel
[10:42:33] temp is now known as
kp
[10:44:05] -!-
kp has quit [Quit: Konversation terminated!]
[10:51:44] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[10:51:45] -!-
ChanServ [ChanServ!ChanServ@services.] has joined #emc-devel
[10:51:45] -!- mode/
#emc-devel [+o ChanServ] by card.freenode.net
[10:51:45] -!-
micges_work1 [micges_work1!~x@djq75.neoplus.adsl.tpnet.pl] has joined #emc-devel
[10:52:42] -!-
micges_work has quit [Ping timeout: 260 seconds]
[10:59:45] -!-
mhaberler has quit [Quit: mhaberler]
[11:03:05] archivist_emc is now known as
Guest43109
[11:03:06] fragalot is now known as
Guest23174
[11:32:40] -!-
adb [adb!~Moldovean@178-211-227-55.dhcp.voenergies.net] has joined #emc-devel
[11:34:08] -!-
pingufan has quit [Remote host closed the connection]
[11:40:25] -!-
bootnecklad has quit [Ping timeout: 258 seconds]
[11:55:22] -!-
skunkworks has quit [Ping timeout: 258 seconds]
[11:55:52] -!-
i_tarzan has quit [Ping timeout: 255 seconds]
[12:00:23] -!-
emc2-buildmaster has quit [Ping timeout: 258 seconds]
[12:02:35] -!-
SWPadnos has quit [Changing host]
[12:02:36] -!-
SWPadnos [SWPadnos!~Me@emc/developer/SWPadnos] has joined #emc-devel
[12:40:38] -!-
SteveStallings [SteveStallings!~Steve@wsip-70-168-134-18.dc.dc.cox.net] has joined #emc-devel
[12:40:50] SteveStallings is now known as
steves_loggg
[12:41:02] steves_loggg is now known as
steves_logging
[13:08:47] -!-
skunkworks [skunkworks!~skunkwork@68-115-41-210.static.eucl.wi.charter.com] has joined #emc-devel
[13:08:51] -!-
adb has quit [Remote host closed the connection]
[13:10:39] -!-
theos has quit [Ping timeout: 248 seconds]
[13:18:15] -!-
adb [adb!~Moldovean@178-211-227-55.dhcp.voenergies.net] has joined #emc-devel
[13:29:19] -!-
maxster has quit [Ping timeout: 258 seconds]
[13:56:16] -!-
Valen has quit [Quit: Leaving.]
[14:03:56] -!-
seb_kuzminsky [seb_kuzminsky!~seb@97-122-101-221.hlrn.qwest.net] has joined #emc-devel
[14:04:20] -!-
CapnKernel has quit [Ping timeout: 276 seconds]
[14:20:36] -!-
adb has quit [Remote host closed the connection]
[14:40:15] -!-
pingufan has quit [Remote host closed the connection]
[14:49:11] -!-
jepler has quit [Changing host]
[14:49:11] -!-
jepler [jepler!~jepler@emc/developer/pdpc.professional.jepler] has joined #emc-devel
[15:39:45] -!-
pingufan has quit [Remote host closed the connection]
[15:40:29] -!-
A2Sheds has quit [Quit: puff of smoke]
[15:42:46] -!-
cncbasher [cncbasher!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has joined #emc-devel
[15:48:29] -!-
bootnecklad_ has quit [Ping timeout: 240 seconds]
[16:00:19] -!-
e-ndy has quit [Quit: Ex-Chat]
[16:02:06] -!-
syyl has quit [Client Quit]
[16:07:49] -!-
micges_work1 has quit [Ping timeout: 240 seconds]
[16:09:27] -!-
micges_work [micges_work!~x@djq75.neoplus.adsl.tpnet.pl] has joined #emc-devel
[16:23:17] -!-
micges_work [micges_work!~x@djq75.neoplus.adsl.tpnet.pl] has parted #emc-devel
[16:23:55] -!-
A2Sheds has quit [Quit: puff of smoke]
[16:37:41] -!-
e-ndy [e-ndy!~jkastner@static-84-242-102-36.net.upcbroadband.cz] has joined #emc-devel
[17:00:55] -!-
bootnecklad has quit [Ping timeout: 260 seconds]
[17:03:28] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[17:08:10] -!-
seb_kuzminsky has quit [Ping timeout: 258 seconds]
[17:15:52] -!-
cjdavis has quit [Read error: Connection reset by peer]
[17:20:04] -!-
seb_kuzminsky [seb_kuzminsky!~seb@184-96-97-62.hlrn.qwest.net] has joined #emc-devel
[18:13:20] -!-
bootnecklad_ has quit [Ping timeout: 258 seconds]
[18:23:10] -!-
vladimirek [vladimirek!~vladimire@adsl-dyn-35.95-102-159.t-com.sk] has joined #emc-devel
[18:24:31] -!-
robh__ [robh__!~robert@5ace70a4.bb.sky.com] has joined #emc-devel
[18:51:24] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust492.basl.cable.virginmedia.com] has joined #emc-devel
[18:54:08] -!-
isssy has quit [Client Quit]
[19:09:54] <cradek> andypugh: there's a very minor conflict in hm2 when merging v2.5_branch into master.
[19:10:25] <cradek> I think I know how it resolves but I don't have the ability to test the result.
[19:10:38] <andypugh> Which module?
[19:10:48] -!-
|n0b0dy| has quit [Ping timeout: 260 seconds]
[19:10:54] -!-
micges [micges!~x@epy215.neoplus.adsl.tpnet.pl] has joined #emc-devel
[19:11:01] <cradek> CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/hostmot2.h
[19:11:04] <cradek> CONFLICT (content): Merge conflict in src/hal/drivers/mesa-hostmot2/sserial.c
[19:12:09] <andypugh> Let me guess, <7 and <=8 ?
[19:12:20] <andypugh> (sorry, other way round)
[19:12:40] <cradek> it's several lines
[19:13:16] <andypugh> Odd, as I don't recall changing master for some time
[19:13:48] <andypugh> What's the process?
[19:14:31] <andypugh> Do you want to guess, then I can test a new pull of master?
[19:15:09] <andypugh> It's presumably the change to sserial_port_N?
[19:16:24] <cradek> http://pastebin.com/8PJhyqLr
[19:22:59] -!-
mhaberler has quit [Quit: mhaberler]
[19:25:35] -!-
vladimirek has quit [Ping timeout: 248 seconds]
[19:25:47] <PCW> Andy BTW remote faults has an added bit: Bit 6 = IllegaMode Fault
[19:26:19] -!-
vladimirek [vladimirek!~vladimire@bband-dyn173.178-40-128.t-com.sk] has joined #emc-devel
[19:31:16] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[19:34:13] -!-
micges has quit [Quit: Ex-Chat]
[19:38:27] <andypugh> OK
[19:40:23] <andypugh> cradek: You want to lose the tag_other section, and use the %4s version of the "unknown card" message
[19:40:50] <andypugh> (%4.4s would be even better)
[19:41:09] <andypugh> But I will put that in the next commit.
[19:46:40] <andypugh> cradek: Actually, the merge isn't as trivial as I thought.
[19:47:02] <andypugh> I thought that mesa_other_sserial was gone and expunged from master.
[19:48:52] -!-
cnc-9-Achsen has quit [Ping timeout: 244 seconds]
[19:49:17] -!-
pingufan has quit [Remote host closed the connection]
[19:51:43] -!-
vladimirek has quit [Ping timeout: 248 seconds]
[19:52:00] -!-
vladimirek [vladimirek!~vladimire@adsl-dyn-132.95-102-159.t-com.sk] has joined #emc-devel
[19:53:47] -!-
mhaberler has quit [Quit: mhaberler]
[19:56:14] <andypugh> I am a little confused now. 2.5 and master still have the sserial_other option for unknown Smart Serial cards. What I don't understand is why my latest commit into sserial, which was a patch based on master, doesn't have them.
[19:57:40] <andypugh> I have a commit waiting in the wings which requires that code to be gone, but the commit-diffs here don't have them.
[20:02:56] <andypugh> I think I might need to rebase
[20:27:30] -!-
MOGLI has quit [Ping timeout: 258 seconds]
[20:48:10] <andypugh> cradek: Seems I got lost in git.linuxcnc.org. There isn't a sserial_other in the 2.5 branch, that is only in Master. I don't want it in Master any more, is there a straightforward way to unroll the commit that introduced it (it was overtaken by events)
[20:48:47] <cradek> you can revert [commit the opposite of] a commit if you've mistakenly committed something in the past
[20:48:56] <cradek> but I'm not sure if that's what you are asking
[20:51:29] <andypugh> Well, it wasn't a mistake. However the unknown-card handler in Master needs to be replaced by the auto-configuring handler that I intend to push to 2.5/
[20:52:44] <andypugh> I have not figured our how you tell which branch a commit was pushed to (in the git.linuxcnc.... interfac)
[20:53:09] <cradek> it is a mistake to try to figure out anything nontrivial in gitweb. use gitk.
[20:53:41] <andypugh> Does gitk see the actual repository though?
[20:53:58] <andypugh> I thought it worked on my local one.
[20:54:05] <cradek> yes it does
[20:54:39] <cradek> gitk shows origin's branches as origin/something
[21:00:41] <andypugh> It was b91a6c1585f52f73f9ace19391abafec83bfa463 which was into master only.
[21:01:40] <andypugh> Quite a while ago.
[21:02:07] <cradek> that reverts trivially
[21:02:36] <andypugh> Can you "make it so" then. That should remove the merge conflict.
[21:02:51] <cradek> no, you do it, and make sure it's right and/or test, then push it
[21:03:57] <cradek> (it does remove half the conflict, I think the other half is very simple)
[21:04:03] <andypugh> OK, I guess as I have almost nothing but unknown hardware attached at the moment that should be an easy test.
[21:06:28] -!-
syyl has quit [Ping timeout: 260 seconds]
[21:10:01] <andypugh> I just realised today that I never pushed the 7i49 (Resolver card) driver
[21:10:19] <andypugh> This is partly because I have never seen one.
[21:10:33] <andypugh> So I guess that ought to be a "master" push?
[21:11:06] -!-
skunkworks has quit []
[21:20:34] -!-
acemi has quit [Quit: WeeChat 0.3.2]
[21:22:59] <CIA-95> EMC: 03andypugh 07master * rb2283a43d10f 10/src/ (4 files in 2 dirs): Revert "Add raw-register access for unrecognised Smart-Serial devices"
[21:23:55] -!-
bootnecklad has quit [Ping timeout: 252 seconds]
[21:25:00] -!-
MOGLI has quit [Ping timeout: 258 seconds]
[21:25:24] -!-
cncbasher_ [cncbasher_!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has joined #emc-devel
[21:25:41] -!-
cncbasher has quit [Ping timeout: 240 seconds]
[21:30:46] -!-
micges [micges!~x@epy215.neoplus.adsl.tpnet.pl] has joined #emc-devel
[21:33:02] -!-
esmiralda_Q has quit [Quit: ChatZilla 0.9.87 [Firefox 7.0.1/20110928134238]]
[21:35:44] -!-
cncbasher [cncbasher!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has joined #emc-devel
[21:36:05] -!-
cncbasher_ has quit [Ping timeout: 240 seconds]
[21:44:20] -!-
vladimirek has quit [Remote host closed the connection]
[21:45:32] -!-
factor has quit [Remote host closed the connection]
[21:47:08] -!-
factor has quit [Remote host closed the connection]
[21:50:29] -!-
FinboySlick has quit [Quit: Leaving.]
[21:59:34] -!-
MOGLI has quit [Quit: Visitor from www.linuxcnc.org]
[21:59:40] -!-
MrTrick has quit [Ping timeout: 260 seconds]
[22:01:01] -!-
e-ndy has quit [Quit: Ex-Chat]
[22:24:16] -!-
skunkKandT [skunkKandT!~chatzilla@184-158-48-171.dyn.centurytel.net] has joined #emc-devel
[22:28:15] -!-
bootnecklad_ has quit [Ping timeout: 258 seconds]
[22:32:08] -!-
KimK has quit [Ping timeout: 244 seconds]
[22:38:57] -!-
ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #emc-devel
[22:39:56] Guest23174 is now known as
fragalot
[22:40:01] -!-
fragalot has quit [Changing host]
[22:44:17] -!-
tissf [tissf!5a13da4c@gateway/web/freenode/ip.90.19.218.76] has joined #emc-devel
[22:45:15] <tissf> hi all
[22:45:22] <andypugh> Hi
[22:47:51] <tissf> How long does it take to commit that appear in gitweb?
[22:48:28] <andypugh> I am not sure
[22:49:26] <andypugh> My last one appeared about 20 minutes before I committed it, according to Gitweb.
[22:49:48] <andypugh> So, I would guess 40 minutes and a disparity in summer time changeover weekends.
[22:49:49] <tissf> ok thank
[22:50:02] <andypugh> Have you committed something?
[22:50:20] <tissf> yes a french translation update
[22:50:33] <andypugh> Do you have push access?
[22:50:45] <tissf> yes
[22:51:29] <andypugh> Hmm, it doesn't look like it got through.
[22:51:56] <tissf> I am not familiar with git
[22:52:58] -!-
Fox_Muldr has quit [Ping timeout: 260 seconds]
[22:53:13] <andypugh> Did you commit and then push, or just commit?
[22:53:33] <tissf> just commit, thats my bad
[22:53:44] <andypugh> :-)
[22:59:04] <CIA-95> EMC: 03tissf 07master * r0e12cf3ee132 10/src/po/fr.po: french translation update
[23:00:55] <andypugh> You might have wanted to push that to the 2.5 branch?
[23:01:52] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #emc-devel
[23:02:16] <tissf> no cradek tel me to push in the master
[23:03:48] <andypugh> OK. You should always pay more attention to him than to me.
[23:04:20] <tissf> :)
[23:06:44] <tissf> there is still possible for v2.5?
[23:06:57] <andypugh> Ask Cradek, I guess.
[23:07:06] <tissf> ok
[23:09:41] -!-
Tom_L has quit []
[23:09:50] -!-
atom1 has quit [Quit: Leaving]
[23:13:18] -!-
zlog has quit [Ping timeout: 245 seconds]
[23:13:26] -!-
Tom_itx has quit [Ping timeout: 260 seconds]
[23:13:37] Tom_L is now known as
Tom_itx
[23:19:42] <cradek> no, I suggested you make your changes to 2.5 and then merge it into master
[23:19:54] <cradek> I don't think it will be hard to fix though, let me do it
[23:21:24] <andypugh> cradek: It might not be that easy, it seems to be mainly line-number changes, which might be different between the versions.
[23:22:01] <andypugh> Or are the numbers auto-generated and git is too dumb to know?
[23:23:35] -!-
emcrules_mobile has quit [Quit: Chatmosphere for Blackberry]
[23:24:06] <cradek> it worked fine, yay
[23:24:24] <cradek> building to test the very minor hm2 merge conflict
[23:24:35] <andypugh> What is left?
[23:25:11] <cradek> + int num_bspis;
[23:25:12] <cradek> - int num_sserial_chans[4];
[23:25:12] <cradek> + char sserial_modes[4][8];
[23:25:59] <cradek> in 2.5 you switched from num_serial_chans[] to sserial_modes[][], and in master you added bspis?
[23:26:51] <andypugh> Ah, yes.
[23:27:02] <cradek> then my merge is probably correct
[23:27:44] <andypugh> I lose track. Like the resolvers that fell down the back of the coding sofa.
[23:28:02] <CIA-95> EMC: 03cradek 07master * r715c18fbef8a 10/ (4 files in 2 dirs): Add support for multi-mode Mesa SSLBP (Smart serial) cards.
[23:28:03] <CIA-95> EMC: 03cradek 07master * r5fb4c9c3befa 10/debian/changelog: changelog for v2.4.7 release
[23:28:04] <CIA-95> EMC: 03cradek 07master * r14363c8f5887 10/src/hal/drivers/mesa-hostmot2/ (hm2_7i43.c hm2_pci.c hostmot2-lowlevel.h led.c): Count the onboard LEDs of the Mesa FPGA cards more reliably.
[23:28:05] <CIA-95> EMC: 03cradek 07master * rd4b7edc1e2ad 10/docs/src/gui/axis.lyx: Docs: explain file properties
[23:28:06] <CIA-95> EMC: 03cradek 07master * r47f0aa58c757 10/docs/src/gui/axis.txt: Docs: explain file properties
[23:28:07] <CIA-95> EMC: 03cradek 07master * re2692404982f 10/configs/ (hm2-servo/3x20-small.ini hm2-stepper/3x20-small.ini): sample configs: fix firmware path for 3x20 configs
[23:28:08] <CIA-95> EMC: 03cradek 07master * r4c7a60342b9c 10/ (4 files in 4 dirs): Merge remote branch 'origin/v2.4_branch' into v2.5_branch
[23:28:09] <CIA-95> EMC: 03cradek 07master * rd7e8b18c61d9 10/nc_files/ngcgui_lib/ (db25.ngc mfiles/M110): ngcgui fixes
[23:28:10] <CIA-95> EMC: 03cradek 07master * rea08d3202c6c 10/tcl/twopass.tcl: twopass.tcl: improve parsing of ini file items
[23:28:11] <CIA-95> EMC: 03cradek 07master * r503f204b79e3 10/ (3 files in 2 dirs): twopass: Add options for debugging
[23:28:12] <CIA-95> EMC: 03cradek 07master * r47e46e1eff56 10/docs/src/gcode/ (main.txt overview.txt): Docs: arc deviation error and suggested decimal precision
[23:28:13] <CIA-95> EMC: 03cradek 07master * r6b909232bea4 10/docs/ (143 files in 15 dirs): Docs: remove lyx files no longer used
[23:28:14] <CIA-95> EMC: 03cradek 07master * r3c5d11f3cedf 10/ (docs/src/Submakefile docs/src/a2x src/configure.in): use the installed a2x instead of our own copy
[23:28:15] <CIA-95> EMC: 03cradek 07master * rcfa46e2ee5d2 10/configs/hm2-stepper/ (10 files): Config: add 20% cap to hostmot2 stepper configs
[23:28:16] <CIA-95> EMC: 03cradek 07master * r82f12f7e9da2 10/configs/gantry/gantry-hs.ini: Config: fix typo calling non-existent hal file
[23:28:17] <CIA-95> EMC: 03cradek 07master * r89341b9869bd 10/ (2 files in 2 dirs): Change the sserial (SSLBP) mode setting modparam clearer, and
[23:28:18] <CIA-95> EMC: 03cradek 07master * rb3a4546d5603 10/src/po/fr.po: french translation update
[23:28:21] <CIA-95> EMC: 03cradek 07master * r9ce0d17a35b5 10/ (175 files in 26 dirs): Merge branch 'v2.5_branch'
[23:29:10] <cradek> tissf: thank you! for any further translation work, please work on v2.5_branch
[23:29:43] -!-
mhaberler has quit [Quit: mhaberler]
[23:31:04] <andypugh> We should have a polish translation, po.po
[23:31:18] -!-
tissf has quit [Ping timeout: 265 seconds]
[23:31:55] <andypugh> Ah, we do, and it is pl.po.
[23:38:45] <micges> yes I should update translation too :)
[23:39:58] <andypugh> I have passed a friend of mine the link to the Japanese file.
[23:41:11] <andypugh> Are the line numbers auto-generated?
[23:41:34] <micges> yes
[23:41:55] <andypugh> And, should I be prepending something to any strings that I put in the code?
[23:43:11] <andypugh> (In fact, as I use almost exclsively the HM2_ERR macro, a simple change there would do it for the whole driver.
[23:43:24] <micges> I don't know if drivers are translatable
[23:43:26] <micges> letme check
[23:43:41] -!-
cjdavis has quit [Ping timeout: 240 seconds]
[23:46:59] <micges> nope
[23:47:20] <micges> drivers are pure english
[23:49:39] <andypugh> That's unfair. We should translate them into random languages so nobody feels left out.
[23:53:34] <micges> good night
[23:53:37] -!-
micges has quit [Quit: Ex-Chat]