josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify printer_smodel_check 

Saves 140 bytes of flash and 4 bytes of SRAM
This commit is contained in:
Guðni Már Gilbert 2022-05-22 17:57:47 +00:00
parent e3f48ead9f
commit 65d500f2ed
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Firmware/util.cpp
View File

@ -444,35 +444,23 @@ pStrEnd=strchr(pStrBegin,GCODE_DELIMITER);
if(!pStrEnd) if(!pStrEnd)
return(NULL); return(NULL);
*nLength=pStrEnd-pStrBegin; *nLength=pStrEnd-pStrBegin;
return(pStrBegin); pStrBegin[*nLength] = '\0';
return pStrBegin;
} }
void printer_smodel_check(char* pStrPos) void printer_smodel_check(char* pStrPos)
{ {
char* pResult; char* pResult;
size_t nLength,nPrinterNameLength; size_t nLength,nPrinterNameLength;
bool bCheckOK;
char sPrinterName[PRINTER_NAME_LENGTH+sizeof(ELLIPSIS)-1+1]="";
nPrinterNameLength=strlen_P(::sPrinterName); nPrinterNameLength = strlen_P(sPrinterName);
pResult=code_string(pStrPos,&nLength); pResult = code_string(pStrPos,&nLength);
if(pResult!=NULL)
{ if(pResult != NULL && nLength == nPrinterNameLength) {
strlcpy(sPrinterName,pResult,min(nPrinterNameLength,nLength)+1); // Only compare them if the lengths match
if(nLength>nPrinterNameLength) if (strcmp_P(pResult, sPrinterName) == 0) return;
strcat(sPrinterName,ELLIPSIS); }
bCheckOK=(nLength==nPrinterNameLength);
if(bCheckOK&&(!strncasecmp_P(pResult,::sPrinterName,nLength))) // i.e. string compare execute only if lengths are same
return;
}
//SERIAL_ECHO_START;
//SERIAL_ECHOLNPGM("Printer model differs from the G-code ...");
//SERIAL_ECHOPGM("actual : \"");
//serialprintPGM(::sPrinterName);
//SERIAL_ECHOLNPGM("\"");
//SERIAL_ECHOPGM("expected: \"");
////SERIAL_ECHO(sPrinterName);
//SERIAL_ECHOLNPGM("\"");
switch(oCheckModel) switch(oCheckModel)
{ {
case ClCheckModel::_Warn: case ClCheckModel::_Warn: