motion/ecmc_plugin_grbl
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix load file command

Browse Source
This commit is contained in:
Anders Sandstrom
2022-01-28 15:34:45 +01:00
parent 5f736b5e1f
commit 2e9b1426a4
4 changed files with 453 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ecmc_plugin_grbl/ecmcGrbl.cpp
View File

@@ -740,7 +740,7 @@ void ecmcGrbl::addCommand(std::string command) {
grblCommandBuffer_.push_back(command.c_str());
epicsMutexUnlock(grblCommandBufferMutex_);
if(cfgDbgMode_){
printf("%s:%s:%d:GRBL: INFO: Buffer size %d\n",
printf("%s:%s:%d: GRBL: INFO: Buffer size %d\n",
__FILE__,__FUNCTION__,__LINE__,grblCommandBuffer_.size());
}
}
@@ -753,8 +753,8 @@ void ecmcGrbl::loadFile(std::string fileName, int append) {
file.open(fileName);
if (!file.good()) {
if(cfgDbgMode_){
printf("%s:%s:%d:GRBL: ERROR: File not found: %s (0x%x)\n",
__FILE__,__FUNCTION__,__LINE__,fileName,ECMC_PLUGIN_LOAD_FILE_ERROR_CODE);
printf("%s:%s:%d: GRBL: ERROR: File not found: %s (0x%x)\n",
__FILE__,__FUNCTION__,__LINE__,fileName.c_str(),ECMC_PLUGIN_LOAD_FILE_ERROR_CODE);
}
errorCode_ = ECMC_PLUGIN_LOAD_FILE_ERROR_CODE;
throw std::runtime_error("Error: File not found.");
@@ -770,12 +770,10 @@ void ecmcGrbl::loadFile(std::string fileName, int append) {
}
std::string line, lineNoComments;
int lineNumber = 1;
int errorCode = 0;
while (std::getline(file, line)) {
if(lineNoComments.length()>0) {
addCommand(lineNoComments);
if(line.length()>0) {
addCommand(line);
}
}
}

35
iocsh/cfg/test.gcode Normal file
View File

@@ -0,0 +1,35 @@
G1X20Y20F360
G4P2
G2X0Y0R20
G4P2
G0X10Y10
G4P2
G1X0Y0
G1X20Y20F360
G4P2
G2X0Y0R20
G4P2
G0X10Y10
G4P2
G1X0Y0
G1X20Y20F360
G4P2
G2X0Y0R20
G4P2
G0X10Y10
G4P2
G1X0Y0
G1X20Y20F360
G4P2
G2X0Y0R20
G4P2
G0X10Y10
G4P2
G1X0Y0
G1X20Y20F360
G4P2
G2X0Y0R20
G4P2
G0X10Y10
G4P2
G1X0Y0

2050
iocsh/log.log
View File

File diff suppressed because it is too large Load Diff

16
iocsh/test.script
View File

@@ -64,13 +64,15 @@ ${SCRIPTEXEC} ${ecmccfg_DIR}loadPlugin.cmd, "PLUGIN_ID=0,FILE=${ECMC_PLUGIN_FILN
epicsEnvUnset(ECMC_PLUGIN_FILNAME)
epicsEnvUnset(ECMC_PLUGIN_CONFIG)
ecmcGrblAddCommand("G1X20Y20F360");
ecmcGrblAddCommand("G4P2");
ecmcGrblAddCommand("G2X0Y0R20");
ecmcGrblAddCommand("G4P2");
ecmcGrblAddCommand("G0X10Y10");
ecmcGrblAddCommand("G4P2");
ecmcGrblAddCommand("G1X0Y0");
ecmcGrblLoadFile("./cfg/test.gcode",0)
#ecmcGrblAddCommand("G1X20Y20F360");
#ecmcGrblAddCommand("G4P2");
#ecmcGrblAddCommand("G2X0Y0R20");
#ecmcGrblAddCommand("G4P2");
#ecmcGrblAddCommand("G0X10Y10");
#ecmcGrblAddCommand("G4P2");
#ecmcGrblAddCommand("G1X0Y0");
#ecmcGrblAddCommand("G2X0adadsdY0R20");
#ecmcGrblAddCommand("G1X0Y20");