Back
[00:39:37] <skunkworks> Lerman: heh - no. You just let the cat out of the bag. (git) :)
[00:40:54] <lerman_> Nope. Not me. If you want to keep the cat in the bag, don't put it in the Wiki.
[00:41:11] <lerman_> http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?BoardOfDirectors
[00:42:44] <jmkasunich> note that the motion was "prepare a message to the list"
[00:43:15] <jmkasunich> we were still doing that when you mentioned (on the list) that we want to go to git
[00:45:35] <lerman_> Sorry. When I read it on the wiki, I assumed that it would be OK to discuss it.
[00:46:07] <cradek> it wasn't a secret, but we wanted to announce it correctly (with justifications etc) which is now done
[00:46:15] <cradek> no harm done whatsoever
[00:46:17] <jmkasunich> no harm done - it prompted us to quit editing the message and send it already
[00:47:17] <lerman_> So... Should I create a CVS repository or use git or wait?
[00:49:23] <cradek> I don't know the answer to that.
[00:50:42] <lerman_> Do we have someone who can guess better than I can?
[00:52:14] <jmkasunich> "wait" is the simplest choice - least chance of doing something over
[00:52:24] <jmkasunich> but I don't know how long you are willing to wait
[00:53:42] <lerman_> I can do that. I'll just create a package and let people download it from my site if they want it. I don't think anyone else will want to modify it in the short term.
[02:31:52] <jepler> lerman_: I think it would be a great opportunity to learn a bit of git
[02:32:31] <jepler> if putting gwiz in cvs means learning cvs you don't know today, then I'd say that's another reason to do it in git
[04:51:34] <CIA-48> EMC: 03seb 07v2_3_branch * 10emc2/configs/hm2-servo/hm2-servo.hal: Use the [AXIS_?]INPUT_SCALE value from the .ini as the encoder scale, instead of hardcoding it in the .hal.
[04:55:24] <CIA-48> EMC: 03cmorley 07TRUNK * 10emc2/src/emc/usr_intf/pncconf/pncconf.py:
[04:55:24] <CIA-48> EMC: fix conversion of pwm from gpio on gui
[04:55:24] <CIA-48> EMC: fix flood, spindle brake, spindle ccw, flood and mist signals
[04:55:24] <CIA-48> EMC: not being recognised/connected.
[04:55:24] <CIA-48> EMC: fixed pdm frequency update problems
[04:55:25] <CIA-48> EMC: added info to configuration readme
[05:03:47] <CIA-48> EMC: 03seb 07TRUNK * 10emc2/configs/hm2-servo/hm2-servo.hal: merge hm2-servo config fix from 2.3 branch: use [AXIS_?]INPUT_SCALE for encoder scale
[12:32:32] <BigJohnT> gitty up mule
[12:58:35] <BigJohnT> hmmm the HAL manual does not work in 2.3.1 it's on the menu but won't display
[13:02:49] <cradek> Exec=/usr/bin/see /usr/share/doc/emc2/HAL_Manual.pdf
[13:02:57] <cradek> I think it's spelled HAL_User_Manual.pdf
[13:07:07] <BigJohnT> even if I correct the menu is still won't display for some reason
[13:08:12] <BigJohnT> if I just navigate to it and click on it it works
[13:14:34] <cradek> check the spelling and capitalization a few more times?
[13:16:25] <BigJohnT> ok
[13:17:46] <BigJohnT> yep it is spelled correctly
[13:19:26] <BigJohnT> in a terminal I get Permission denied
[13:25:46] <jepler> if you type /usr/share/doc/emc2/HAL_User_Manual.pdf as a command in the terminal it won't work. pdf files are documents, not executable programs. "/usr/bin/see" is what opens the document in the right viewer.
[13:31:52] <BigJohnT> I typed "Exec=/usr/bin/see /usr/share/doc/emc2/HAL_Manual.pdf"
[13:32:32] <jepler> if you want to test it in the terminal, use everything after Exec=
[13:32:48] <BigJohnT> ok
[13:33:21] <BigJohnT> that works
[13:33:56] <BigJohnT> mmm breakfast
[14:04:18] <BigJohnT> if I copy and paste this "/usr/bin/see /usr/share/doc/emc2/HAL_Manual.pdf" into the menu launcher properties is does not work but it works from the command line
[14:35:47] <BigJohnT> If I create a brand new launcher it works
[14:49:47] <jepler> there must be something else funky in that .desktop file, then
[14:49:51] <jepler> I wonder what it is
[14:50:59] <BigJohnT> how can you just open the .desktop file with a plain text editor?
[14:52:10] <BigJohnT> also if you edit menus/properties on the HAL one the icon is different than the rest of them
[14:54:49] <jepler> you should be able to open it with a text editor .. if you want to open the one in /usr then you will have to 'sudo gedit' since it is a system file not a user file
[14:55:00] <jepler> (if you want to save changes, anyway)
[15:03:18] <BigJohnT> ok, if I edit usr/share/applications/emc2-halmanual.desktop with sudo gedit the changes work
[15:05:26] <BigJohnT> still gitting
[15:10:19] <jepler> you mean your 'git clone'? it's going to be rather brutal on a slow line.
[15:11:06] <jepler> you could clone it on a box with a fast connection and then transport it to your computer on a thumb drive or whatnot..
[15:19:10] <BigJohnT> yea, my git clone :)
[15:20:40] <BigJohnT> 49.2Kbs today
[15:22:25] <jepler> hm my arithmetic says that if it took 5 minutes on a 3 megabit line, you're in for about 5 hours
[15:22:44] <cradek> ouch.
[15:23:16] <BigJohnT> 3 down 2 to go :)
[15:25:43] <BigJohnT> after I edited the usr/share/applications/emc2-halmanual.desktop and saved it the menu worked but when I right click on the menu and edit menus my change did not show up :/
[15:34:37] <BigJohnT> done with the walk now it is got
[16:29:39] <CIA-48> EMC: 03cmorley 07TRUNK * 10emc2/src/emc/usr_intf/stepconf/stepconf.py: fix second and third parport direction not being updated properly
[17:04:15] <CIA-48> EMC: 03cmorley 07v2_3_branch * 10emc2/src/emc/usr_intf/stepconf/stepconf.py: fixsecond and third parport direction not being updated properlt
[17:25:51] <jepler> a bash syntax I don't recall seeing before: for ((i=1;i<10;i++)); do echo $i; done
[17:28:02] <CIA-48> EMC: 03cmorley 07v2_3_branch * 10emc2/debian/changelog: update changelog about fix. Hope it in the right spot-easy to fix
[17:30:39] <CIA-48> EMC: 03jepler 07v2_3_branch * 10emc2/debian/changelog: proper format for debian/changelog
[19:11:18] <seb_kuzminsky> jmkasunich: at fest you showed me a diagram of how emc makes motion happen - is it in our CVS or on the web somewhere?
[19:41:02] <jmkasunich> seb_kuzminsky: on the web
[19:41:04] <jmkasunich> url in a sec
[19:41:41] <jmkasunich> http://jmkasunich.com/pics/emc2-motion-dataflow.pdf
[19:41:51] <jmkasunich> see also:
http://cvs.linuxcnc.org/cvs/emc2/src/emc/motion/teleop-notes?rev=1.2
[19:41:57] <jmkasunich> the latter has a link to the former
[19:42:25] <jmkasunich> note that the drawing is a proposal of how things might be once we get joints and axes properly separated, and teleop working
[19:42:33] <jmkasunich> it is not quite what we have now
[19:42:41] <seb_kuzminsky> thanks
[19:43:12] <seb_kuzminsky> i found something similar that will work for me:
http://www.linuxcnc.org/docs/2.3/html/code_Code_Notes.html#r3_2
[19:43:33] <jmkasunich> that one is a more accurate representation of what we have now
[19:44:50] <seb_kuzminsky> the Code Code Notes doesnt show how the homing logic informs the joint controller's motor offset, but other than that it's good
[20:03:26] <CIA-48> EMC: 03bigjohnt 07TRUNK * 10emc2/debian/extras-Ubuntu-6.06/usr/share/applications/emc2-halmanual.desktop: fix hal user manual spelling in .desktop
[20:03:27] <CIA-48> EMC: 03bigjohnt 07TRUNK * 10emc2/debian/extras-Ubuntu-8.04/usr/share/applications/ (emc2-gettingstarted.desktop emc2-halmanual.desktop): fix hal user manual spelling in .desktop
[20:03:52] <BigJohnT_> BigJohnT_ is now known as BigJohnT
[20:04:52] <CIA-48> EMC: 03bigjohnt 07v2_3_branch * 10emc2/debian/extras-Ubuntu-6.06/usr/share/applications/emc2-halmanual.desktop: fix hal user manual spelling in .desktop
[20:05:02] <CIA-48> EMC: 03bigjohnt 07v2_3_branch * 10emc2/debian/extras-Ubuntu-8.04/usr/share/applications/emc2-halmanual.desktop: fix hal user manual spelling in .desktop
[20:10:04] <BigJohnT> git :)
[20:19:19] <BigJohnT> * BigJohnT likes qgit
[20:25:49] <mozmck> so did emc2 go to git?
[20:26:41] <cradek> the board would like to, and sent a proposal/statement of intent to the developers yesterday. there hasn't been any response yet.
[20:28:20] <BigJohnT> well it took me 5 hours to download on my string :)
[20:28:48] <cradek> BigJohnT: well it'll be easy to keep up, from then on
[20:29:01] <BigJohnT> so far it is very intutive to work with the gui
[20:29:19] <cradek> a slow connection is all the more reason to have the history information local
[20:29:23] <mozmck> I see. just wondered what came from the discussion at the fest.
[20:29:26] <cradek> that's good to hear
[20:30:00] <BigJohnT> commits using qgit are easier to see what your about to commit
[20:30:14] <cradek> http://article.gmane.org/gmane.linux.distributions.emc.devel/2247
[20:31:46] <BigJohnT> Jeff saved Git for the Lazy for last :)
[20:34:04] <BigJohnT> do you have to clone the branch like you did the master?
[20:37:53] <cradek> no, you never have to do the big copy again
[20:38:04] <cradek> your local repository is just as good as any other
[20:38:34] <BigJohnT> how do I just work on a branch?
[20:38:41] <cradek> git branch --track v2_3_branch origin/v2_3_branch
[20:38:49] <cradek> git checkout v2_3_branch
[20:38:53] <BigJohnT> I did that
[20:39:02] <cradek> ok, you're on the branch
[20:39:40] <BigJohnT> so after doing that I change something in emc2-experimental and it is only applied to branch?
[20:41:01] <cradek> yes if you commit it will be on the branch
[20:41:10] <cradek> then you'd do a push if you want to share that change
[20:41:24] <cradek> (I don't think emc2-experimental accepts pushes right now)
[20:45:21] <BigJohnT> ok thanks
[20:51:18] <BigJohnT> * BigJohnT wanders out to the shop to paint tractor parts
[20:54:02] <jepler> right, you can't "push" back to linuxcnc.org yet
[20:54:09] <jepler> but you can make changes and "commit" them locally
[21:53:10] <seb_kuzminsky> yay git!
[22:08:40] <cradek> seb_kuzminsky: there sure is a lot of silence about it...
[22:19:18] <Roguish> programmers, et. al.: if git is a significant improvement, go for it.