Bladeren bron

Fix lost changes during rebase

Guðni Már Gilbert 2 jaren geleden
bovenliggende
commit
e39d1458a1
2 gewijzigde bestanden met toevoegingen van 3 en 4 verwijderingen
  1. 2 3
      Firmware/util.cpp
  2. 1 1
      Firmware/util.h

+ 2 - 3
Firmware/util.cpp

@@ -420,7 +420,7 @@ void gcode_level_check(uint16_t nGcodeLevel) {
 #define GCODE_DELIMITER '"'
 #define ELLIPSIS "..."
 
-char *code_string(char *pStr, size_t *nLength) {
+char *code_string(const char *pStr, size_t *nLength) {
 char* pStrBegin;
 char* pStrEnd;
 
@@ -432,11 +432,10 @@ pStrEnd=strchr(pStrBegin,GCODE_DELIMITER);
 if(!pStrEnd)
      return(NULL);
 *nLength=pStrEnd-pStrBegin;
-pStrBegin[*nLength] = '\0';
 return pStrBegin;
 }
 
-void printer_smodel_check(char *pStrPos) {
+void printer_smodel_check(const char *pStrPos) {
 char* pResult;
 size_t nLength,nPrinterNameLength;
 

+ 1 - 1
Firmware/util.h

@@ -104,7 +104,7 @@ extern ClCheckGcode oCheckGcode;
 void fCheckModeInit();
 void nozzle_diameter_check(uint16_t nDiameter);
 void printer_model_check(uint16_t nPrinterModel);
-void printer_smodel_check(char* pStrPos);
+void printer_smodel_check(const char* pStrPos);
 void fw_version_check(const char *pVersion);
 void gcode_level_check(uint16_t nGcodeLevel);