Ok, I screwed up. This was supposed to commit four new files. The Submakefile and a minor change I made to emcrsh got committed, but the four new files were not added. I got messages from cvs of the form:
? emc/usr_intf/emcsched.cc What did I do wrong. Thanks, Eric Modified file emc2/src/emc/usr_intf/Submakefile Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/Submakefile?rev=1.17> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/Submakefile.diff?r1=1.16; r2=1.17> Branch: TRUNK Log: revision 1.17 date: 2009/04/07 03:32:17; author: eric-johnson; state: Exp; lines: +9 -2 This is the initial submission of the program scheduler. While it compiles without error, nothing has yet been tested. --- Submakefile 2007/03/06 03:19:16 1.16 +++ Submakefile 2009/04/07 03:32:17 1.17 @@ -2,6 +2,9 @@ emc/usr_intf/shcom.cc EMCRSHSRCS := emc/usr_intf/emcrsh.cc \ emc/usr_intf/shcom.cc +EMCSCHEDSRCS := emc/usr_intf/schedrmt.cc \ + emc/usr_intf/emcsched.cc \ + emc/usr_intf/shcom.cc EMCLCDSRCS := emc/usr_intf/emclcd.cc \ emc/usr_intf/shcom.cc \ emc/usr_intf/sockets.c @@ -25,7 +28,7 @@ endif TCLSRCS := emc/usr_intf/emcsh.cc emc/usr_intf/iosh.cc -USERSRCS += $(EMCSHSRCS) $(EMCRSHSRCS) $(EMCLCDSRCS) $(IOSHSRCS) $(USRMOTSRCS) $(HALUISRCS) $(KEYSTICKSRCS) +USERSRCS += $(EMCSHSRCS) $(EMCRSHSRCS) $(EMCSCHEDSRCS) $(EMCLCDSRCS) +$(IOSHSRCS) $(USRMOTSRCS) $(HALUISRCS) $(KEYSTICKSRCS) ifeq "$(HAVE_NCURSES)" "yes" USERSRCS += $(KEYSTICKSRCS) @@ -47,11 +50,15 @@ $(CXX) $(LDFLAGS) -o $@ $(ULFLAGS) $^ -lpthread TARGETS += ../bin/emcrsh +../bin/schedrmt: $(call TOOBJS, $(EMCSCHEDSRCS)) ../lib/libemc.a ../lib/libnml.so.0 ../lib/libemcini.so.0 + $(ECHO) Linking $(notdir $@) + $(CXX) $(LDFLAGS) -o $@ $(ULFLAGS) $^ -lpthread TARGETS += +../bin/schedrmt + ../bin/emclcd: $(call TOOBJS, $(EMCLCDSRCS)) ../lib/libemc.a ../lib/libnml.so.0 ../lib/libemcini.so.0 $(ECHO) Linking $(notdir $@) $(CXX) $(LDFLAGS) -o $@ $(ULFLAGS) $^ TARGETS += ../bin/emclcd - ../bin/iosh: $(call TOOBJS, $(IOSHSRCS)) ../lib/libemc.a ../lib/libnml.so.0 ../lib/libemchal.so.0 ../lib/libemcini.so.0 $(ECHO) Linking $(notdir $@) Modified file emc2/src/emc/usr_intf/emcrsh.cc Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/emcrsh.cc?rev=1.15> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/emc/usr_intf/emcrsh.cc.diff?r1=1.14;r2 =1.15> Branch: TRUNK Log: revision 1.15 date: 2009/04/07 03:32:17; author: eric-johnson; state: Exp; lines: +10 -4 This is the initial submission of the program scheduler. While it compiles without error, nothing has yet been tested. --- emcrsh.cc 2008/12/28 16:56:04 1.14 +++ emcrsh.cc 2009/04/07 03:32:17 1.15 @@ -55,6 +55,8 @@ With -- --enablepw <password> Sets the enable password to 'password'. Default EMCTOO With -- --sessions <max sessions> Sets the maximum number of simultaneous connextions to max sessions. Default is no limit (-1). + With -- --path Sets the base path to program (G-Code) files, default is "../../nc_files/". + Make sure to include the final slash (/). With -- -ini <inifile>, uses inifile instead of emc.ini. There are six commands supported, Where the commands set and get contain EMC @@ -465,6 +467,7 @@ char pwd[16] = "EMC\0"; char enablePWD[16] = "EMCTOO\0"; char serverName[24] = "EMCNETSVR\0"; +char defaultPath[80] = "../../nc_files/"; int sessions = 0; int maxSessions = -1; @@ -490,7 +493,8 @@ {"name", 1, NULL, 'n'}, {"sessions", 1, NULL, 's'}, {"connectpw", 1, NULL, 'w'}, - {"enablepw", 1, NULL, 'e'}}; + {"enablepw", 1, NULL, 'e'}, + {"path", 1, NULL, 'd'}}; /* static char *skipWhite(char *s) { @@ -937,7 +941,7 @@ pch = strtok(NULL, delims); if (pch == NULL) return rtStandardError; - if (sscanf(pch, "%d", &tool) <=0) return rtStandardError; + if (sscanf(pch, "%d", &tool) <= 0) return rtStandardError; pch = strtok(NULL, delims); if (pch == NULL) return rtStandardError; if (sscanf(pch, "%f", &length) <= 0) return rtStandardError; @@ -1051,7 +1055,8 @@ pch = strtok(NULL, "\n\r\0"); if (pch == NULL) return rtStandardError; strcpy(context->progName, pch); - strcpy(fileStr, "../../nc_files/"); +// strcpy(fileStr, "../../nc_files/"); + strcpy(fileStr, defaultPath); strcat(fileStr, pch); if (sendProgramOpen(fileStr) != 0) return rtStandardError; return rtNoError; @@ -2744,13 +2749,14 @@ initMain(); // process local command line args - while((opt = getopt_long(argc, argv, "e:n:p:s:w:", longopts, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "e:n:p:s:w:d:", longopts, + NULL)) != -1) { switch(opt) { case 'e': strncpy(enablePWD, optarg, strlen(optarg) + 1); break; case 'n': strncpy(serverName, optarg, strlen(optarg) + 1); break; case 'p': sscanf(optarg, "%d", &port); break; case 's': sscanf(optarg, "%d", &maxSessions); break; case 'w': strncpy(pwd, optarg, strlen(optarg) + 1); break; + case 'd': strncpy(defaultPath, optarg, strlen(optarg) + 1); } } ---------------------------------------------------------------------------- -- This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com http://cvsbook.red-bean.com/ - CVS Guide and mandatory reading. _____________________________________________ Emc-commit mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-commit ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
