Back
[00:01:41] -!-
uwe_ has quit [Ping timeout: 240 seconds]
[00:02:35] -!-
fjay has quit [Ping timeout: 276 seconds]
[00:02:42] -!-
Calyp has quit [Quit: Leaving]
[00:02:43] jay_ is now known as
fjay
[00:02:57] -!-
tlab has quit [Remote host closed the connection]
[00:03:40] -!-
theorbtwo has quit [Ping timeout: 240 seconds]
[00:03:46] theorb is now known as
theorbtwo
[00:14:47] -!-
Valen has quit [Quit: Leaving.]
[00:23:06] -!-
crazy_imp has quit [Ping timeout: 248 seconds]
[00:51:26] <KimK> Bah, got back just *not* in time. Oh, well.
[00:53:54] -!-
OoBIGeye has quit [Ping timeout: 260 seconds]
[00:59:08] -!-
tlab has quit [Quit: Leaving]
[01:00:19] -!-
OoBIGeye has quit [Ping timeout: 260 seconds]
[01:06:37] -!-
elmo40 has quit [Ping timeout: 246 seconds]
[01:12:42] -!-
tsingi has quit [Ping timeout: 248 seconds]
[01:22:05] -!-
AC-130U has quit [Ping timeout: 276 seconds]
[01:22:53] -!-
mozmck [mozmck!~moses@client-173.225.233.241.dfwtx.partnershipbroadband.com] has joined #emc-devel
[01:23:09] -!-
tom3p has quit [Quit: Ex-Chat]
[01:53:13] -!-
findux has quit [Quit: Page closed]
[01:54:33] -!-
tlab has quit [Quit: Leaving]
[01:55:50] -!-
FinboySlick has quit [Quit: Leaving.]
[02:19:38] -!-
tom3p [tom3p!~tomp@r74-192-62-131.vctrcmta01.vctatx.tl.dh.suddenlink.net] has joined #emc-devel
[02:48:25] -!-
elmo401 has quit [Ping timeout: 250 seconds]
[02:53:47] -!-
Tom_L has quit []
[03:49:24] -!-
tom3p has quit [Quit: Ex-Chat]
[03:51:41] -!-
ries has quit [Quit: ries]
[04:07:31] -!-
seb_kuzminsky [
[email protected]] has joined #emc-devel
[04:08:14] <seb_kuzminsky> cradek, the merge conflicts you had when you last merged 2.5 into master are showing up when I try to merge 2.5 into master now
[04:09:44] <seb_kuzminsky> i think all the docs should be the way they are in 2.5, does that sound right?
[04:19:36] -!-
izua has quit [Quit: brb reboot]
[04:25:29] -!-
izua has quit [Changing host]
[04:26:35] <cradek> yes I think so
[04:26:45] <cradek> I don't remember a big conflict...?
[04:29:36] <cradek> ugh, what happened?
[04:32:04] <seb_kuzminsky> you merged 2.5 into master on April 23 and resolved some conflicts
[04:32:28] <seb_kuzminsky> then a few commits on master and a ton on 2.5, but apparently not touching any of the same files
[04:32:39] <seb_kuzminsky> but now, a merge of 2.5 into master gives a bunch of conflicts
[04:32:57] <cradek> but I don't understand why that would be
[04:33:06] <seb_kuzminsky> me neither
[04:33:09] <seb_kuzminsky> it's super strange
[04:33:19] <seb_kuzminsky> master's history since the merge is dead simple
[04:33:26] <seb_kuzminsky> but the history before the merge is pretty hairy
[04:33:37] <seb_kuzminsky> do you see it too or am i insane?
[04:33:50] <cradek> I see it too
[04:37:22] <cradek> I hesitate to do anything without understanding it first...
[04:39:44] <cradek> in overview.txt it looks like some good new stuff is in master
[04:39:51] <cradek> but where is the commit that adds it? I'm so stumped
[04:40:56] <seb_kuzminsky> my mental model of git feels violated
[04:41:33] <cradek> did I screw up the previous merge?
[04:42:42] <cradek> +The tool orientation (Q field) describes the centerline angle of the tool as
[04:42:45] <cradek> +
[04:43:18] <cradek> ^ this conflict resolution seems like a mistake - but it's not even listed in Conflicts: in the commit message
[04:43:44] <seb_kuzminsky> the commit message is initialized by git merge, and yours to fuck up after that
[04:44:05] <cradek> yes and perhaps I did that (but I'm really careful...)
[04:45:10] <cradek> yes - that one line is a bogus merge - but that doesn't explain the rest
[04:53:09] <cradek> overview.txt conflicts come from mhaberler - I think he's been known to freely use rebase...
[04:54:24] <cradek> or at least I think they come from his commit b47d62749
[04:55:57] <cradek> I'm not getting it, and I need to sleep! goodnight...
[04:58:35] <seb_kuzminsky> good night :-)
[05:24:37] -!-
ve7it has quit [Remote host closed the connection]
[05:40:39] -!-
schwege has quit [Quit: leaving]
[06:08:56] -!-
robh__ [
[email protected]] has joined #emc-devel
[06:22:07] -!-
kb8wmc has quit [Quit: ChatZilla 0.9.86.1 [Firefox 3.6.17/20110422054454]]
[06:37:28] -!-
vladimirek has quit [Remote host closed the connection]
[07:04:10] <CIA-9> EMC: 03seb 07v2.4_branch * ra5a06861a50a 10/docs/man/man1/emcrsh.1: add a manpage for emcrsh
[07:04:12] <CIA-9> EMC: 03seb 07v2.4_branch * rb46c5432d00a 10/src/emc/usr_intf/emcrsh.cc: fix a couple of minor bugs in emcrsh
[07:06:39] -!-
Birdman3131 has quit [Ping timeout: 255 seconds]
[07:21:14] -!-
capricorn_one has quit [Remote host closed the connection]
[07:22:09] <CIA-9> EMC: 03seb 07v2.5_branch * rf8317b058438 10/configs/smithy/1240gecko.hal: Add spindle direction option for PMDX 110 vs 131 boards.
[07:22:10] <CIA-9> EMC: 03seb 07v2.5_branch * rc89f8e98a16d 10/configs/smithy/ (14 files): Change eztrol shared library version.
[07:22:10] <CIA-9> EMC: 03seb 07v2.5_branch * r2db6a4524ef3 10/src/hal/components/toggle2nist.comp: comp: add missing description
[07:22:11] <CIA-9> EMC: 03seb 07v2.5_branch * ra5a06861a50a 10/docs/man/man1/emcrsh.1: add a manpage for emcrsh
[07:22:12] <CIA-9> EMC: 03seb 07v2.5_branch * rb46c5432d00a 10/src/emc/usr_intf/emcrsh.cc: fix a couple of minor bugs in emcrsh
[07:22:13] <CIA-9> EMC: 03seb 07v2.5_branch * r365f755e7129 10/ (18 files in 4 dirs): Merge branch 'v2.4_branch' into v2.5_branch
[07:35:39] -!-
mhaberler [
[email protected]] has joined #emc-devel
[07:36:46] <CIA-9> EMC: 03seb 07v2.5_branch * rd2afe1db5739 10/ (docs/man/man1/emcrsh.1 src/emc/usr_intf/emcrsh.cc): emcrsh: be more accepting of line endings
[07:40:53] -!-
seb_kuzminsky has quit [Quit: Leaving]
[08:05:04] Tech_Talk is now known as
Birdman3131
[08:22:13] -!-
awallin__ [awallin__!~quassel@2001:708:110:1020:224:7eff:feda:7c7d] has joined #emc-devel
[09:19:25] -!-
kljsdfhklj has quit [Quit: kljsdfhklj]
[09:22:13] <CIA-9> EMC: 03seb 07v2.4_branch * r00fe414d536b 10/debian/emc2.files.in: include the new emcrsh.1 manpage in emc2.deb
[09:24:06] -!-
mhaberler has quit [Quit: mhaberler]
[09:43:49] -!-
awallin__ has quit [Remote host closed the connection]
[10:17:41] -!-
L84Supper has quit [Ping timeout: 240 seconds]
[10:52:51] -!-
mhaberler [
[email protected]] has joined #emc-devel
[10:58:51] -!-
SWPadnos has quit [Ping timeout: 255 seconds]
[12:00:52] -!-
Valen has quit [Quit: Leaving.]
[12:09:34] -!-
nullie has quit [Quit: Ex-Chat]
[12:14:36] -!-
nullie has quit [Client Quit]
[12:20:15] -!-
nullie has quit [Client Quit]
[12:23:59] -!-
nullie has quit [Client Quit]
[12:52:09] -!-
mhaberler has quit [Quit: mhaberler]
[13:35:03] -!-
mhaberler [
[email protected]] has joined #emc-devel
[13:41:52] -!-
seb_james has quit [Quit: Ex-Chat]
[14:06:00] -!-
willburrrr2003 has quit [Quit: He who laughs last, thinks slowest]
[14:09:03] -!-
theorbtwo has quit [Ping timeout: 246 seconds]
[14:09:11] theorb is now known as
theorbtwo
[14:19:33] -!-
vladimirek [
[email protected]] has joined #emc-devel
[14:27:42] -!-
SWPadnos [
[email protected]] has joined #emc-devel
[14:27:55] -!-
SWPadnos has quit [Changing host]
[14:27:55] -!-
SWPadnos [SWPadnos!~Me@emc/developer/SWPadnos] has joined #emc-devel
[14:31:33] -!-
mhaberler has quit [Quit: mhaberler]
[14:39:40] -!-
L84Supper has quit [Ping timeout: 240 seconds]
[15:08:22] -!-
nullie has quit [Ping timeout: 258 seconds]
[15:09:05] -!-
psha [
[email protected]] has joined #emc-devel
[15:13:10] -!-
mk0 has quit [Quit: Ухожу я от вас (xchat 2.4.5 или старше)]
[15:16:02] -!-
nullie has quit [Ping timeout: 276 seconds]
[15:19:04] -!-
isssy has quit [Client Quit]
[15:20:57] -!-
ve7it [
[email protected]] has joined #emc-devel
[15:31:40] -!-
adb has quit [Ping timeout: 240 seconds]
[15:52:45] -!-
nullie has quit [Ping timeout: 250 seconds]
[16:17:36] -!-
adb [
[email protected]] has joined #emc-devel
[16:19:18] -!-
kb8wmc [
[email protected]] has joined #emc-devel
[16:22:48] -!-
kb8wmc has quit [Client Quit]
[16:47:47] -!-
kljsdfhklj has quit [Quit: kljsdfhklj]
[16:52:39] -!-
mhaberler [
[email protected]] has joined #emc-devel
[18:00:56] -!-
logger[mah] has quit [Ping timeout: 276 seconds]
[18:03:18] -!-
logger[mah] [logger[mah]
[email protected]] has joined #emc-devel
[18:13:10] -!-
IchGuckLive [
[email protected]] has joined #emc-devel
[18:13:54] <IchGuckLive> Hi all . Got a big problem with my students ! cant we set a limit to the while loops
[18:14:18] <cradek> I don't understand the question
[18:14:33] <IchGuckLive> Problem if a student forget to count down or reatch the loop end it will generate forever !
[18:14:57] <IchGuckLive> when i stop the PC on Hardy the hole system goes crash
[18:15:44] <IchGuckLive> so it woudt be good to have in the ini a max while loop and then it gioes to faulth
[18:16:10] <cradek> I like to use O-repeat instead of O-while for this reason
[18:16:54] <IchGuckLive> cradek: ofcause
[18:17:14] <IchGuckLive> but then you got a extra parameter or a other thinking system
[18:17:45] <cradek> fixing whatever goes wrong when you have an overly long program would be a more complete solution than what you are suggesting
[18:19:25] <IchGuckLive> it is easy to forget something therfore in the ini a Maxloop number that everyone can change if needet maybee 100 holes but to set this as standart to 50
[18:19:57] <IchGuckLive> and then if while or reaped is calld to start this as a count don when reatcht stepp out
[18:19:58] <cradek> I was suggesting that you can make an overly long program in many ways, not just with a while loop
[18:20:13] <IchGuckLive> i now
[18:21:04] <IchGuckLive> this week i had to set up 5 CNC pc with this crashed the EMC 2.3.5 woudt not start anymore if it wars resetet at the enless loop
[18:22:40] <IchGuckLive> do you now in what C file the While is in
[18:23:00] <IchGuckLive> so i will look at this and compile my own
[18:26:37] <alex_joni> but can't you stop the endless loop with "Esc" ?
[18:26:44] <archivist> students need to experience their own faults
[18:26:47] <alex_joni> or do you mean while running the program?
[18:27:13] <IchGuckLive> no while generating at the load file
[18:27:45] <alex_joni> while the preview gets generated?
[18:27:54] <alex_joni> I thought you can cancel that with esc
[18:27:56] <IchGuckLive> yes
[18:28:32] <IchGuckLive> the G-code is generated by gedit then load into emc2 at that point it generates the priview tool path
[18:28:47] <IchGuckLive> if there is a endless loop its unstopable
[18:29:34] <IchGuckLive> even xkill is not stopping the loop generatian the GUI goes of but it still generating
[18:31:24] -!-
Aero-Tec has quit [Quit: ChatZilla 0.9.86.1 [Firefox 4.0.1/20110413222027]]
[18:32:16] <IchGuckLive> so i guess a C-file that generates a tuple of points is still runing and waiting to get out of the Develscircle
[18:33:51] <alex_joni> you're using AXIS as the interface?
[18:33:56] <IchGuckLive> yes
[18:34:08] <alex_joni> try pushing escape during the preview..
[18:35:16] <IchGuckLive> i will do on friday most students are off so i will check this with the most hasardez PC
[18:36:37] <IchGuckLive> By for today THANKS for this wonderfull thing at all !
[18:36:47] -!-
IchGuckLive has quit [Quit: ChatZilla 0.9.86 [Firefox 3.6.3/20100423140709]]
[19:12:29] -!-
Loetmichel has quit [Ping timeout: 240 seconds]
[19:17:46] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[19:29:27] -!-
isssy has quit [Client Quit]
[19:46:26] -!-
micges [
[email protected]] has joined #emc-devel
[19:58:44] -!-
cevad has quit [Quit: Leaving]
[20:15:44] -!-
Techrat has quit [Quit: Leaving]
[20:27:39] -!-
micges has quit [Quit: Ex-Chat]
[20:28:48] -!-
maximilian_h [
[email protected]] has joined #emc-devel
[20:28:48] -!-
maximilian_h has quit [Client Quit]
[20:33:02] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust1037.basl.cable.virginmedia.com] has joined #emc-devel
[21:10:26] -!-
factor has quit [Quit: Leaving]
[21:24:58] -!-
FinboySlick has quit [Quit: Leaving.]
[21:28:11] -!-
willburrrr2003 has quit [Quit: Depression is merely anger without enthusiasm]
[21:35:20] -!-
motioncontrol has quit [Ping timeout: 240 seconds]
[21:42:29] -!-
Polan_User has quit [Read error: Connection reset by peer]
[21:48:09] -!-
nullie has quit [Quit: Ex-Chat]
[21:50:55] -!-
psha has quit [Quit: leaving]
[21:53:26] -!-
motioncontrol1 has quit [Quit: Sto andando via]
[21:53:39] -!-
phreak has quit [Remote host closed the connection]
[21:54:29] -!-
Fox_Muldr has quit [Ping timeout: 276 seconds]
[22:07:30] -!-
ewidance [
[email protected]] has joined #emc-devel
[22:08:11] -!-
acemi has quit [Quit: WeeChat 0.3.2]
[22:12:20] -!-
ewidance has quit [Client Quit]
[22:43:19] -!-
micges has quit [Quit: Ex-Chat]
[22:59:30] -!-
willburrrr2003 has quit [Quit: If you think nobody cares, try missing a few payments]
[23:24:28] -!-
tsingi has quit [Quit: Leaving.]
[23:31:37] -!-
vladimirek has quit [Remote host closed the connection]
[23:34:52] -!-
Techrat has quit [Changing host]
[23:53:21] -!-
andypugh has quit [Quit: andypugh]