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] ?
micges: it should be 0,1,2,3,4
and on this machine must be used some mapping kins ? (gantrykins) to make B => joint ?
I was thinking on renaming gantrykins to something else
genmapkins or something like that
BigJohnT_ is now known as BigJohnT
how can I see whole diff between branches ?
nm found it
cradek: I think (maybe wrong) that you accidentally commit some cchanges to control.c about line 1050
(some changed stuff of simple_tp)
micges: which branch?
i think in fb75422df063eb4e8cb6b781c9fddb104a08a2e7
err sorry in commit: a416751386f3688abf8d46fcb2317a14d06169d5
git log -p -c a416751 will show a "diff" that represents the merge
how to get output to file?
oh I see, > works but git doesn't return
it returns to the prompt here
here too I have slow pc here ;|
wow 115MB diff
I must have left out -1, show only one diff
you got all diffs back to the start of time
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
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()
micges: I don't understand what happened there
It seems that you have changed master and merge it to ja3
It has removed/changed parts of code of simple tp
on master there is part of code at 1050 but on joints_axes3 there isn't
I don't even understand why that merge would have changed control.c
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
I think that diff is correct
those changes are intentional
yes I think it's right.
free_tp was encapsulated and moved to another file - so it could be used for both joints and axes
john k did that a couple years ago
ok but there is no that change in trunk
right, I agree
we will eventually merge joints_axes3 into trunk and we will have that change
oh sorry so I've lost
john k wanted to have one free_tp for each joint and for each axis
that's why free_tp has a new interface in joints_axes3
I'm just searching becouse ja3 on hardy doesn't work
but on dapper it is (!)
doesn't work how?
it returns EMCMOT_COMM_ERROR_TIMEOUT
sim or realtime?
on bottom of that page is new ja3 config: http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?IniChanges
you should put the new config in git
ok will do
sim also doesn't work, I think I've borken some by the way :|
ok, going home, bbl
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
EMC: 03micges 07joints_axes3 * rff5deb70b660 10/configs/sim/axis.ini: Update sim inch config too
map is somehow starting to work again ;)
currently it's full of users (even banned accounts/spammers)
can you delete spam users?
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
micges: yay, it looks like you're making huge progress
I hope so ;)
* alex_joni is glad somebody picked it up ;)
ok, map should be ok now
good night all
EMC: 03micges 07joints_axes3 * r7387064716e2 10/src/emc/ (4 files in 2 dirs): Change global axis config info variables into global structure
EMC: 03micges 07joints_axes3 * r0e5b1d4cf8f2 10/src/emc/ (4 files in 3 dirs): Move Axes home position globals to new AxisConfig structure
EMC: 03micges 07joints_axes3 * rabb445626af9 10/src/emc/task/emccanon.cc: Add variables to hold vel and acc values, calculate them only once
EMC: 03micges 07joints_axes3 * rff45f2b49c30 10/src/emc/task/taskintf.cc: Use Axis inited flag in new AxisConfig
EMC: 03micges 07joints_axes3 * re1d0fb26106c 10/src/emc/task/emctaskmain.cc: Checking homed joints only when they exists
EMC: 03micges 07joints_axes3 * r24a1dd20f2f7 10/src/emc/usr_intf/axis/scripts/emctop.py: Remove joints data dictionary from main window
good night all