is random_tool change in master now?
I think so
how come when i do a git pull, it dont see any of the changes?
yet i see other recent changes
hmmm. I could be wrong ...
nope meaning ?
it should be there as of a few days ago
yes it was merged into master
what is the correct command for pulling then?
git checkout master (if that's not where you are) then git pull
you may need to checkout a newer version
what he said (or says :) )
you should get ref 74d6628d9679e584e746b2b13070514ad696f0e3 right now
that includes the change you submitted today
git checkout master \n$ Switched to branch "master" \n $ git pull
git log -1
does it show you 74d66...?
i dont see any 74d66 ???
that commit is not in my tree - what is it?
what is command for that?
you must have some local changes
yes, i've worked on the introspection thing
if you run gitk, maybe you'll see how master and origin/master relate
and thought when git said Already up-to-date that i was current
hard to say what "current" means - but you probably have all the changes I have, plus more of your own
well i'm lost
git log origin/master..master
this will show what changes you have on top of origin/master (the linuxcnc git server is "origin")
[04:44:36] <dgarr> http://www.panix.com/~dgarrett/stuff/git.log
the top commit is a merge commit. it merges 80fe4f8 (a previous merge commit specific to you) with 74d6628 which is the latest commit in the linuxcnc server
so you have all your changes and all the linuxcnc changes
so i have the random_tool_change?
if you use gitk you'll see the tree - it is hard to understand the tree structure in git log, since it shows it as linear
i'm looking at gitk for the first time and dont' really understand it either
yes the merge of random_toolchange is in the history of 74d6628
that was the last revision on the random_toolchange branch. you will see by following the lines that it merges upward and becomes part of your current master
also ss-wrapped-rotary was merged into master
f2 on gitk does nothing for me
um, file/list references?
i see a green dot on remotes/origin/random_toolchange
ok does a line go upward from it and merge with another line?
with the log message 'merge branch random_toolchange'
that's a merge commit, where two branches came together
oh did you mean a green dot on it in the popup dialog? click it
the green dot was on the page from file/list references
it will find that ref in your main window
I didn't understand what you meant
I'm getting this error running debuild on emc2 v2_3_branch on karmic: http://pastebin.ca/1657924
everything compiled fine. where should I look to fix this?
emc2.files.in expects those to be named site-packages, not dist-packages
in the tree view, there is a leftwards red line from remotes/orign/random_toolchange
dgarr: ok that is where the master and random_toolchange branches come back together (merge)
dgarr: if you follow it up, you will see many other things come together, including your own changes, and become what's currently your 'master'
mozmck: I don't know what that difference means, if anything
22:57 < cradek> emc2.files.in expects those to be named site-packages, not dist-packages
the site python directory name is determined by configure with this: SITEPY=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`
oh, maybe the directory name has changed on karmic?
more likely just a python2.6 change
I bet emc2.files.in should use @SITEPY@ instead of assuming usr/lib/python@PYTHON_VERSION@/site-packages/
ah, let me change that and see if that helps.
I'm a bit puzzled by how all this works (no surprise there)
heh, me too, but I'm learning I think...
I'm off to bed, goodnight
hope you get it
emc2.files.in could maybe just list usr/lib/python@PYTHON_VERSION@ .. or someone can take the time to figure out pycentral, which appears to be the debian-specific stuff used on 8.04 and 9.10 to manage python add-ons installed by debian packages
we should egg-ify emc2
* alex_joni runs and hides
hi jepler: I added the SITEPY line cradek mentioned to the configure script and changed emc2.files.in to use it, and I was able to build the packages after that.
hmm, I thought that line already was in configure - that's where I found it
the only thing I may change is that I made it depend on tk/tcl 8.5, but I noticed that 8.4 is still default on karmic.
cradek: this is the configure script in the debian directory
oh I meant the other one
this one sets up the debian stuff. I don't think the other one touches emc2.files.in
I see - you are right
I got all the packages built and working though. I may change the tk dependency but then they'll be ready to put in experimental if anyone is interested.
you got a kernel and rtai build and packaged up too?
yes, they are already in experimental
I re-did the rtai packages though because I got the version number wrong, and the linux source directory given by rtai-config was wrong
neat, that's quite an accomplishment
thanks! a bit of work anyhow!
The kernel is a generic smp build. My hope is that the kernel will work on most machines, smp or not.
everything I read says it should now with the latest rtai and the right settings.
SMP kernels are generally fine on UP systems, though sometimes slower
mozmck: did you enable part of ACPI to allow the cpus to be started up? I recall I had to mess with that.
... on my P3 smp machine
same deal on multicore CPUs
yes, and button so the computer can be shut down
before 3.7.1 rtai didn't like single-core if it was compiled for smp from what I heard
oh, that could be
EMC: 03jthornton 07master * rffd003cd83de 10/docs/src/ladder/classic_ladder.lyx: Fix typos and spellos
EMC: 03jthornton 07master * rd23bbcc3ec53 10/src/hal/drivers/mesa-hostmot2/ (hostmot2.c hostmot2.h): Merge branch 'master' of ssh://firstname.lastname@example.org/git/emc2
EMC: 03jthornton 07master * r8ce71a04c449 10/ (4 files in 4 dirs): Merge branch 'master' of ssh://email@example.com/git/emc2
EMC: 03jthornton 07master * rdf1e96f6719a 10/docs/src/common/Linux_FAQ.lyx: Add info on auto starting EMC
EMC: 03jthornton 07v2_3_branch * ra01808cbdc97 10/docs/src/common/Linux_FAQ.lyx: Add info on auto starting EMC
jthornton: looks like your commit d23bbcc3ec53 has the same changes to hostmot2.x that I made the other day. I wonder why that is?
that is a merge commit. look at it in gitk and you will see the branch (his change vs your change) and then his merge which brings the two divergent paths back together
er, shouldn't say "branch", that means something specific
you guys both had 664fecd25c. he made one changed based on that, and you made another. the merge commit is what combines them.
oh, I see. I'm on Windows here so I was just looking on the web.
I think the web git interface isn't very good - it should look more like gitk.
the diff looked the same as mine on the web, and I didn't know how that would work.
cradek: I was wondering what that merge was too
how goes the translation?
joomla is somewhat messy but I found all that I need
it's a bit strange the first time, but one you know your way around it's quite easy
I'll try to translate rest of main pages today
In a week or so I'll back to my emc improvements ;)
EMC: 03jepler 07v2_3_branch * r3c1616d44209 10/src/emc/usr_intf/axis/extensions/emcmodule.cc: fix rendering error of selected lines
EMC: 03jepler 07v2_3_branch * r7dea0e73348f 10/src/emc/task/emccanon.cc: fix corner case where naive cam detector skips full circle arcs with i+,j0
jepler: good choice - I had forgotten about that fix.
It was 'flagged' in my mailbox, and I happened to notice it today
I still need to figure out if it's worth backporting some part of that offsets-related fix to 2.3
jepler: I'll try and send you a patch later with the changes I had to make to build packages on karmic if you're interested. Except for the hostmot2 change it was all in the debian directory and there wasn't that much.
I wonder if it would be good for us to set up a git repo with kernel / RTAI config files
SWPadnos: last time we used one hosted by jeff
so I'd say yes-ish
ok, I see the 2.6.24 config in infrastructure now
that's only the config I commited
it's basicly a clone of the hardy git
with some files added
heh 'I take it FF0 in emc2 is feed forward. That's a sign they know what they are doing.'
jepler: what issue 3c1616d44209 fix?
ok, python on karmic requires tk/tcl 8.5 so my packages are good.
SWPadnos or someone want to put them on experimental?
same location. you need to replace all the rtai debs with the new ones.
micges: I'm not entirely sure -- cradek fixed it.
micges: I think it's for full circles with i>0 and j==0, but that's just because of the commit message
jepler: no I meant the second one
micges: oh, sorry, I didn't check the ref
micges: it's a fix related to drawing the selected line in the AXIS preview when there is also a rotary axis motion
the bug caused some incorrect lines to be drawn, and others missed
I see thanks
SWPadnos_ is now known as SWPadnos
jepler: I bet people very rarely have offsets on rotaries.
jepler: thanks for your irssi patch. trying it now...
I dunno; for people who naturally "wind up" their rotaries, setting an offset to get back to 0 degrees is the most natural thing in 2.3.
oh, you are right, I forgot about that usage
I can't wait for wrapped rotaries to get some use - I think that change is cool and handy.
cradek: saying offsets on rotaries you mean G10 ?
micges: yes there is sometimes a problem in the AXIS preview if rotaries are offset with G10 or G92
only preview is wrong; motion is correct
cradek: what irssi patch?
alex_joni: don't give up reconnecting if there is a dns failure
* alex_joni didn't have that problem yet
maybe your dns is better!
but I still have the links issues
I probably have more servers :D
probably 4-5 now
(in my resolv.conf I mean)
??? undefined symbol GET_EXTERNAL_TOOL_MAX ???
need some help... :-)
just finished the pascal interfaces to emc, gui is running
now i made the interface to the canon, rs274 etc...
its a module similar to the gcodemodule.cc
sorry to hear that you had to write yet another version of that stuff
from the sound of your error it must be incomplete
yes.. where is this declaration???
im linking the rs274.so and there is the symbol missing...
in git master, there is no such canon call
there is int GET_EXTERNAL_POCKETS_MAX()
made a git rebase 2 days ago... 2 diff versions of canon.hh ???
so i have to export this GET_EXTERNAL_TOOL
this has changed recently - '2 days ago' doesn't mean much to me, there are so many branches etc
ok... wil do a rebase...
seems like you have conflicting versions of things - not sure what all
the new gui looks awesome...
what is it for?
I didn't know anyone was working on another gui
i am doing a "copy" of the Heidenhein cnc-control
cool, can't wait to see it
started 1 week ago an i can jog, open & exec programs, enter mdi-code etc..
still buggy but working... :-)
see the first attempts on googlecode -> "moccagui"
end of this week ill commit the first release...
a search on google code shows no "moccagui"
ah, moccagui.googlecode.com got it.
[23:04:56] <gtom> http://code.google.com/p/moccagui/
you need freepascal & lazarus to compile it...
some nice features are on the way...
"smooth" jogging... means that if you start a jog the axis moves slow...
the longer you jog the same axis the faster this axis gets...
if you open a editor for nc-code the code that you enter gets displayed in a preview window...
are the EMC2-related GUI components part of a library that can be used to make other UIs in the Lazarus designer?
so you can enter some lines of NC code and you see what the interpreter will do with this code...
we are implementing the emc stuff in "components" at the moment.
this has the advantage that the code gets seperated from the UI
at the moment im doing the DRO- component...
this one can be connected to the TEMCState class, reads the position and shows the position on the screen
cool. one day, I may install FeePascal/Lazarus
So, if you want to create your own UI, just open lazarus, place the components like you want, compile, ready!
still lot ofwork to do...
I can imagine
spend 3 day to write the interface to the interpreter... :-(
if it all works, that's pretty fast :)
well, the interface from and to emc works! this one is REALLY fast!
one advantage is the amount of "ready to use" components for lazarus/fpc
using opengl is just dropping the openglcomponent on a TTorm...
the interpreter output is stored in a TList object...
I guess putting the G-code paths into the openGL component is the hard part :)
no, i have the output in a TList (straight_feeds,arc_feeds etc...)
at the moment i can display 3 Axes (just the straight_)
i need an idea to have the arcstosegments (py code) in pascal... (or "C")
take a look at how it's done in AXIS (if you haven't yet) There's more to the preview than just putting arcs and lines into an openGL display list
unless you're taking the canon output from the interpreter, which I think is the way AXIS does it (more or less)
i know but im not the right person to translate py code into something "readable"
in my code the "arctosegments" is still missing, also the rotational axes...
think that axis is using a"own" matrix to do the rotations...
well, let's give it another week and see how you're doing :)
probably ill will comitt the first release without a preview...
ll go to bed... 2oclock in the morning... :-(