Back
[01:12:11] <CIA-1> EMC: 03jepler 07master * r84d98ba24b66 10/src/hal/classicladder/arrays.h: remove unused file
[01:12:12] <CIA-1> EMC: 03jepler 07master * r7a9e8d1e086f 10/src/ (63 files in 9 dirs): get rid of many unneeded #ifs
[01:25:54] <jepler> Widget *popup = new Widget; // this will be freed automatically at exit
[01:26:39] <jepler> insofar as all allocated memory is freed when a program exits, I suppose that's probably true
[01:51:39] <CIA-1> EMC: 03jepler 07master * rce6c61f950fc 10/src/libnml/cms/cmsdiag.hh: ensure derived class destructor is called
[01:51:41] <CIA-1> EMC: 03jepler 07master * r4fb8baaae568 10/src/emc/usr_intf/axis/extensions/emcmodule.cc: fix memory leak in error case
[01:51:41] <CIA-1> EMC: 03jepler 07master * r8a8b1cc5cca9 10/src/hal/classicladder/files_project.c: fix resource leak
[01:51:42] <CIA-1> EMC: 03jepler 07master * r96fc5a4ff3c3 10/src/hal/utils/halcmd_commands.c: fix resource leak
[01:51:43] <CIA-1> EMC: 03jepler 07master * r9184c59f2aa0 10/src/libnml/cms/tcp_srv.cc: fix truncation warnings on 64-bit systems
[01:51:46] <CIA-1> EMC: 03jepler 07master * r7565ed145dbc 10/src/emc/usr_intf/emclcd.cc: fix resource leak
[01:51:48] <CIA-1> EMC: 03jepler 07master * rcdf35a1992c9 10/src/rtapi/sim_rtapi.c: linker errors are better than runtime errors
[01:51:51] <CIA-1> EMC: 03jepler 07master * r8c38645da6bb 10/src/emc/rs274ngc/ (rs274ngc_interp.hh rs274ngc_pre.cc): make sure log_file is initialized and later closed
[01:51:56] <CIA-1> EMC: 03jepler 07master * r1c4e1490addc 10/src/hal/classicladder/vars_access.c: remove unused code
[01:51:59] <CIA-1> EMC: 03jepler 07master * r27339c50ba66 10/src/emc/sai/saicanon.cc: remove unused code
[01:52:03] <CIA-1> EMC: 03jepler 07master * rd0bf06a01ce1 10/src/hal/classicladder/classicladder.c: remove unused code
[01:52:06] <CIA-1> EMC: 03jepler 07master * r0ff185551042 10/src/emc/usr_intf/axis/extensions/emcmodule.cc: remove unused code
[01:52:09] <CIA-1> EMC: 03jepler 07master * r17f42076fd5e 10/src/emc/sai/saicanon.cc: remove unused code
[01:52:11] <CIA-1> EMC: 03jepler 07master * r57d099e24e0a 10/src/emc/usr_intf/axis/extensions/togl.c: remove unused code
[01:52:11] <jepler> spew spew spew! (it was a deliberate choice to do only one file worth of removals in each commit; that makes reverting later easier)
[01:52:14] <CIA-1> EMC: 03jepler 07master * re10db77bd033 10/src/emc/rs274ngc/gcodemodule.cc: remove unused code
[01:52:16] <CIA-1> EMC: 03jepler 07master * rb4956d039760 10/src/libnml/nml/nml.cc: remove unused code
[01:52:20] <CIA-1> EMC: 03jepler 07master * r2b6e8ca7bdc7 10/src/emc/task/emccanon.cc: remove unused code
[01:52:22] <CIA-1> EMC: 03jepler 07master * re0cde890b3b6 10/src/emc/ini/iniaxis.cc: remove unused code
[01:52:26] <CIA-1> EMC: 03jepler 07master * rd6c07de8045b 10/src/emc/task/emccanon.cc: remove unused code
[01:52:28] <CIA-1> EMC: 03jepler 07master * r31e14df03ea8 10/src/emc/rs274ngc/gcodemodule.cc: remove unused code
[02:09:21] <cradek> wow!
[02:18:48] <jepler> I did a good 2/3 of the stuff from that list; some of the remainder are wrong and some (like the xemc line I pasted above) I dunno how to fix
[02:19:03] <jepler> and the truncation warnings are just a fix of a long-time gcc warning, not from cppcheck
[02:47:08] <mozmck> jepler: how did the debian packages turn out?
[03:05:12] <jepler> mozmck: it looked OK, but I didn't install or run it
[03:07:01] <mozmck> but the directories for the images looked correct?\
[03:07:28] <jepler> yeah, seemed to
[03:10:04] <mozmck> cradek just set me up to push, so I guess I'll push that change then
[03:10:39] <jepler> cool, great
[03:12:30] <cradek> mozmck: I think the invocation you need may be "git merge origin/master" and then git push
[03:12:49] <cradek> since you had a local commit and then pulled
[03:13:06] <mozmck> ok, I'll try that
[03:13:22] <mozmck> says already up-to-date
[03:14:43] <cradek> I sure am still learning to use this...
[03:14:56] <CIA-1> EMC: 03m-mcknight 07master * r054d6c0a5b61 10/src/ (Makefile configure.in hal/utils/comp.g): moved non-configuration files from etc to share/emc, more make install fixes
[03:15:02] <cradek> slick
[03:15:08] <jepler> yay, goodnight
[03:15:23] <mozmck> :) thanks!
[03:15:39] <mozmck> ! [rejected] joints_axes3 -> joints_axes3 (non-fast forward)
[03:15:58] <mozmck> maybe I should have specified the branch to push to
[03:16:13] <cradek> I think that's not an error, even though it looks like one
[03:17:02] <mozmck> ok
[03:17:07] <cradek> your branch that is tracking origin/joints_axes3 is not up to date - you can checkout it and then pull to it if you want it to be. but it doesn't matter unless you want to do some work there.
[03:17:40] <cradek> you are subscribed to emc-commit?
[03:17:55] <mozmck> I see. I was thinking that all the branches got updated when I do a git pull
[03:18:11] <mozmck> not that I know of
[03:18:26] <cradek> I think you get the changes but your branch doesn't fast-forward
[03:18:39] <mozmck> fast-forward?
[03:18:58] <cradek> ok, you ought to subscribe to that - it shows you all the commits that happen, and also buildbot errors if you happen to break some platform's build
[03:19:28] <mozmck> I see. I didn't know it existed - where do I find it?
[03:19:43] <cradek> it's on sourceforge with the other lists
[03:20:00] <mozmck> I just found it
[03:20:06] <cradek> amazing, sf looks different again
[03:20:15] <cradek> ok, you are faster at finding stuff than me :-)
[03:21:31] <cradek> also I recommend emc-developers if you're not subscribed to that yet
[03:22:34] <mozmck> been on that one for quite a while
[03:22:57] <cradek> ah
[03:55:45] <cradek> mozmck: if you have configs that work with your products it is perfectly appropriate to put them in git. if you put them on v2_3_branch too, they will make it into the next release.
[03:56:38] <cradek> goodnight!
[03:56:42] <mozmck> ok, thanks. I'm still working on them right now. the charge-pump stuff was probably the main holdup and I think I know what to do there
[03:57:05] <mozmck> should I put the components in the directory with the rest of them?
[03:57:41] <mozmck> goodnight
[14:19:54] <CIA-1> EMC: 03bigjohnt 07v2_3_branch * r5b5e4eab677c 10/docs/src/hal/hal-examples.lyx: Add info on HAL Manual Tool Change
[14:38:45] <CIA-1> EMC: 03bigjohnt 07master * r3e8543eff428 10/docs/src/hal/hal-examples.lyx: Add info on HAL Manual Tool Change
[14:55:52] <CIA-1> EMC: 03tissf 07master * r3c51e38851ec 10/src/po/fr.po: French translation update