How can I find the revision string for a commit I made? I want to cherry-pick it, but I don't know where to find these identifiers.
Does anyone know what this git error message means?
! [rejected] v2_3_branch -> v2_3_branch (non-fast forward)
error: failed to push some refs to 'ssh://email@example.com/git/emc2.git'
I've pulled, cherry-picked, pushed, committed, rebased, every command I can think of and it's still not happy...
EMC: 03mshaver 07v2.4_branch * r44d5ac25ce72 10/configs/smithy/ (15 files): Add files to support new 622 versions, change 1240 machine velocities, and lower spindle speed PWM output to 100Hz
OK, that worked, but how do I fast-forward the v2_3_branch?
mshaver: git checkout v2_3_branch; git pull
this will give you a merge commit which you can then push
EMC: 03mshaver 07v2_3_branch * r3da9816bac7b 10/configs/smithy/ (15 files): Add files to support new 622 versions, change 1240 machine velocities, and lower spindle speed PWM output to 100Hz
cradek: Yes! It worked! THANKS!
EMC: 03jepler 07master * r80cc6b701b80 10/ (56 files in 7 dirs): remove deprecated hal_m5i20 driver
EMC: 03jepler 07master * rf246b49e2a6f 10/src/emc/usr_intf/stepconf/stepconf.py: stepconf: all home switches and limit switches on one input
EMC: 03jepler 07master * r128efefbe379 10/src/emc/usr_intf/stepconf/stepconf.py: Merge branch 'limits+homes'
EMC: 03jepler 07master * re651b01b6a23 10/src/Makefile: Fix 'make setuid' error introduced in 80cc6b
I didn't know if execution order is important
jepler: (defer-format branch)
micges_work: some C compiler required parameter definitions to be at the beginning of a function
I'm not sure if not C99
alex_joni: begin of section can be too
I've just tested
right.. I'm remembering C90
but even in C90 it's allowed at the beginning of a section
micges_work: thank you
hm, testing it here, something's wrong...
[249066.131393] RTAPI: module '\ ´ø' loaded, ID: 1346458706
it should look more like:
[ 4161.221816] RTAPI: module 'HAL_LIB' loaded, ID: 1
so something's clearly wrong in my own tree
oh, it looks like a "duh" error
"duh" errors are the nicest
so the chapter on the m5i20 driver can be removed from master?
does anyone know how to find the actual output of the build on buildbot?
I follow the link in the email but I can't find the output
the link it gives is http://emc2-buildbot.colorado.edu/buildbot/builders/master-checkin/builds/104
one of the links gives an error - maybe that's the one
I look at http://emc2-buildbot.colorado.edu/buildbot/one_box_per_builder
to find the output of each latest build
sigh, do I test nothing?
EMC: 03jepler 07master * r3c2a3cadca40 10/ (6 files in 3 dirs): fix 'make install' and deb-building error introduced in 80cc6b
EMC: 03jepler 07master * r4bc762a2df3c 10/src/ (5 files in 2 dirs): mark most strings in the motion controller
EMC: 03jepler 07master * r01aa20061349 10/src/hal/drivers/mesa-hostmot2/ (hm2_7i43.c hm2_pci.c hm2_test.c): prefer rtapi_snprintf to snprintf
EMC: 03jepler 07master * r8868436313c3 10/src/ (18 files in 6 dirs): defer formatting of realtime motion messages to userspace
EMC: 03jepler 07master * rc99c6e9181ef 10/src/emc/motion/motion.c: this declaration was unneded
EMC: 03jepler 07master * r3854dcaddafa 10/src/rtapi/vsnprintf.h: a convenience function for adding a single character
EMC: 03jepler 07master * rde31f9742385 10/src/rtapi/ (rtai_rtapi.c rtapi.h vsnprintf.h): use our vsnprintf for %f support
EMC: 03jepler 07master * rb5369ab62196 10/src/rtapi/vsnprintf.h: "formatting" a double as hex is better than nothing
EMC: 03jepler 07master * r60d9ae7d7f0c 10/src/emc/motion/stashf.c: in realtime use our snprintf for %f support
EMC: 03jepler 07master * r6986b2b4e97d 10/src/rtapi/rtai_rtapi.c: remove unused variables
EMC: 03mshaver 07v2_3_branch * r9a6448c6c72f 10/configs/smithy/ (11 files): Changed eztrol plugin library version numbers in anticipation of the 2.3.5 release.
Any idea when the patch for the Mesa 7i48 will be part of git?
have you tried it and found that it works?
I hear it was tested. If I could find it, I would test it.
ah, so you don't even have it
No, I'm getting the card today. Bunch of wiring before I can test it.
If I'm worthy of having it?
I figured it was posted to the mailing list but I'm not seeing it
11:07 <jepler> anyhow, I went ahead and built that firmware: http://emergent.unpy.net/files/sandbox/sv12im_2x7i48_72.bit http://emergent.unpy.net/files/sandbox/sv12im_2x7i48_72.pin
13:33 <jepler> based on pcw saying that the registers are compatible between regular and muxed encoder, I've whipped this together: http://emergent.unpy.net/files/sandbox/0001-untested-support-for-muxed-encoders.patch
13:33 <jepler> it'll load that sv12im_2x7148_72 bitfile and shows plausible things in dmesg and halcmd, but I can't test beyond that
(from my own logs of this channel on feb 11)
ah, here's the link to the public logs: http://www.linuxcnc.org/irc/irc.freenode.net:6667/emcdevel/2010-02-11.txt
timestamp is 17:07 and 19:33 there
(that bitfile is for 5i20 + 7i48)
I'm getting the 5i20
7i48 would be super cool for a dual feedback 3 axis mill
well I guess you'd really want 8 encoders, counting the spindle and jogwheel
Mine is going to be 4 axis + spindle
Thanks for the help. I go back to the (l)users forum until I get something of value;)