Back
[06:26:36] <micges> alex_joni: about joints_axes3: when I have XYZBC machine, what would be joints for it? [0 1 2 4 5] or [0 1 2 3 4] ?
[06:54:24] <alex_joni> micges: it should be 0,1,2,3,4
[07:00:26] <micges> and on this machine must be used some mapping kins ? (gantrykins) to make B[5] => joint[4] ?
[07:50:41] <alex_joni> micges: right
[07:51:01] <alex_joni> I was thinking on renaming gantrykins to something else
[07:51:21] <alex_joni> genmapkins or something like that
[07:58:17] <micges> I see
[08:04:41] <alex_joni> bbl
[11:19:07] <BigJohnT_> BigJohnT_ is now known as BigJohnT
[11:54:55] <micges> how can I see whole diff between branches ?
[12:00:39] <micges> nm found it
[12:45:04] <micges> cradek: I think (maybe wrong) that you accidentally commit some cchanges to control.c about line 1050
[12:45:36] <micges> (some changed stuff of simple_tp)
[12:57:39] <cradek> micges: which branch?
[13:01:39] <micges> joints_axes3
[13:03:45] <micges> i think in fb75422df063eb4e8cb6b781c9fddb104a08a2e7
[13:05:02] <micges> err sorry in commit: a416751386f3688abf8d46fcb2317a14d06169d5
[13:09:33] <jepler> git log -p -c a416751 will show a "diff" that represents the merge
[13:11:17] <micges> how to get output to file?
[13:11:29] <jepler> with >
[13:12:45] <micges> oh I see, > works but git doesn't return
[13:13:39] <jepler> it returns to the prompt here
[13:14:13] <micges> here too I have slow pc here ;|
[13:17:37] <micges> wow 115MB diff
[13:18:16] <jepler> oops
[13:18:26] <jepler> I must have left out -1, show only one diff
[13:18:35] <jepler> you got all diffs back to the start of time
[13:22:58] <jepler> bbl
[13:23:07] <CIA-1> EMC: 03jepler 07master * r370286b29ea5 10/src/hal/utils/comp.g: Added 'include' options. This adds a #include to the beginning of the C file. For instance: include "myheader.h" will output #include "myheader.h" near the beginning of the header file
[13:23:07] <CIA-1> EMC: 03jepler 07master * rd4d2bbd4d62a 10/src/hal/utils/comp.g: Changed EXTRA_SETUP() in comp to include the prefix This allows you to create your own pins in EXTRA_SETUP()
[13:28:11] <cradek> micges: I don't understand what happened there
[13:30:02] <micges> It seems that you have changed master and merge it to ja3
[13:30:25] <micges> It has removed/changed parts of code of simple tp
[13:31:09] <micges> on master there is part of code at 1050 but on joints_axes3 there isn't
[13:33:49] <cradek> I don't even understand why that merge would have changed control.c
[13:37:13] <micges> that are goofy changes:
http://git.linuxcnc.org/gitweb?p=emc2.git;a=blobdiff;f=src/emc/motion/control.c;h=fcbf9204532984d479866f3883d89039b2cffd8f;hp=1c6324417fbe483cec1313a0e0a7cc804b27cd24;hb=a416751386f3688abf8d46fcb2317a14d06169d5;hpb=2947e10bd0497acf150b15e9899844415146fe60
[13:37:54] <cradek> I think that diff is correct
[13:38:06] <cradek> those changes are intentional
[13:39:24] <cradek> yes I think it's right.
[13:39:55] <micges> ok
[13:40:19] <cradek> free_tp was encapsulated and moved to another file - so it could be used for both joints and axes
[13:40:45] <cradek> john k did that a couple years ago
[13:41:41] <micges> ok but there is no that change in trunk
[13:41:44] <micges> master*
[13:41:53] <cradek> right, I agree
[13:42:21] <cradek> we will eventually merge joints_axes3 into trunk and we will have that change
[13:42:35] <micges> oh sorry so I've lost
[13:42:51] <cradek> john k wanted to have one free_tp for each joint and for each axis
[13:43:03] <cradek> that's why free_tp has a new interface in joints_axes3
[13:43:06] <micges> I'm just searching becouse ja3 on hardy doesn't work
[13:43:13] <micges> but on dapper it is (!)
[13:43:14] <cradek> doesn't work how?
[13:43:29] <micges> don't load
[13:43:49] <micges> it returns EMCMOT_COMM_ERROR_TIMEOUT
[13:44:28] <micges> in usrmotWriteEmcmotCommand()
[13:47:00] <cradek> sim or realtime?
[13:47:07] <micges> on bottom of that page is new ja3 config:
http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?IniChanges
[13:47:14] <micges> realtime
[13:47:34] <cradek> you should put the new config in git
[13:48:29] <micges> ok will do
[13:48:31] <micges> this
[13:57:03] <micges> sim also doesn't work, I think I've borken some by the way :|
[13:57:24] <micges> ok, going home, bbl
[17:28:40] <CIA-1> EMC: 03micges 07joints_axes3 * r0b34a605d948 10/configs/sim/ (axis_9axis.ini axis_mm.ini): Update sim_mm and sim_9axis configs with new inifile structure
[17:35:12] <CIA-1> EMC: 03micges 07joints_axes3 * rff5deb70b660 10/configs/sim/axis.ini: Update sim inch config too
[19:02:30] <alex_joni> map is somehow starting to work again ;)
[19:03:51] <alex_joni> currently it's full of users (even banned accounts/spammers)
[19:10:10] <micges> can you delete spam users?
[20:23:33] <CIA-1> EMC: 03micges 07joints_axes3 * rbc310d530fa0 10/src/emc/ (nml_intf/emcglb.c nml_intf/emcglb.h task/taskintf.cc): Change globals joint info variables to local structure
[20:34:39] <cradek> micges: yay, it looks like you're making huge progress
[20:35:48] <micges> I hope so ;)
[20:53:01] <alex_joni> * alex_joni is glad somebody picked it up ;)
[20:54:27] <cradek> me too!
[21:24:51] <alex_joni> ok, map should be ok now
[21:26:28] <micges> coo;
[21:26:33] <micges> l
[21:31:16] <alex_joni> good night all
[21:32:50] <micges> good night
[23:13:47] <micges> cradek: around?
[23:37:50] <CIA-1> EMC: 03micges 07joints_axes3 * r7387064716e2 10/src/emc/ (4 files in 2 dirs): Change global axis config info variables into global structure
[23:37:50] <CIA-1> EMC: 03micges 07joints_axes3 * r0e5b1d4cf8f2 10/src/emc/ (4 files in 3 dirs): Move Axes home position globals to new AxisConfig structure
[23:37:51] <CIA-1> EMC: 03micges 07joints_axes3 * rabb445626af9 10/src/emc/task/emccanon.cc: Add variables to hold vel and acc values, calculate them only once
[23:37:52] <CIA-1> EMC: 03micges 07joints_axes3 * rff45f2b49c30 10/src/emc/task/taskintf.cc: Use Axis inited flag in new AxisConfig
[23:37:53] <CIA-1> EMC: 03micges 07joints_axes3 * re1d0fb26106c 10/src/emc/task/emctaskmain.cc: Checking homed joints only when they exists
[23:37:58] <CIA-1> EMC: 03micges 07joints_axes3 * r24a1dd20f2f7 10/src/emc/usr_intf/axis/scripts/emctop.py: Remove joints data dictionary from main window
[23:38:13] <micges> good night all