pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #95 from AxTheB/master

Browse source 
simplified string-to-number conversions
This commit is contained in:
kliment 2011-09-18 07:05:53 -07:00
commit a27649c455
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Sprinter/Sprinter.pde
View file

@ -408,7 +408,7 @@ inline void get_command()
if(strstr(cmdbuffer[bufindw], "N") != NULL) if(strstr(cmdbuffer[bufindw], "N") != NULL)
{ {
strchr_pointer = strchr(cmdbuffer[bufindw], 'N'); strchr_pointer = strchr(cmdbuffer[bufindw], 'N');
gcode_N = (strtol(&cmdbuffer[bufindw][strchr_pointer - cmdbuffer[bufindw] + 1], NULL, 10)); gcode_N = atol(strchr_pointer+1);
if(gcode_N != gcode_LastN+1 && (strstr(cmdbuffer[bufindw], "M110") == NULL) ) { if(gcode_N != gcode_LastN+1 && (strstr(cmdbuffer[bufindw], "M110") == NULL) ) {
Serial.print("Serial Error: Line Number is not Last Line Number+1, Last Line:"); Serial.print("Serial Error: Line Number is not Last Line Number+1, Last Line:");
Serial.println(gcode_LastN); Serial.println(gcode_LastN);
@ -425,7 +425,7 @@ inline void get_command()
while(cmdbuffer[bufindw][count] != '*') checksum = checksum^cmdbuffer[bufindw][count++]; while(cmdbuffer[bufindw][count] != '*') checksum = checksum^cmdbuffer[bufindw][count++];
strchr_pointer = strchr(cmdbuffer[bufindw], '*'); strchr_pointer = strchr(cmdbuffer[bufindw], '*');
if( (int)(strtod(&cmdbuffer[bufindw][strchr_pointer - cmdbuffer[bufindw] + 1], NULL)) != checksum) { if( atoi(strchr_pointer+1) != checksum) {
Serial.print("Error: checksum mismatch, Last Line:"); Serial.print("Error: checksum mismatch, Last Line:");
Serial.println(gcode_LastN); Serial.println(gcode_LastN);
FlushSerialRequestResend(); FlushSerialRequestResend();
@ -458,7 +458,7 @@ inline void get_command()
} }
if((strstr(cmdbuffer[bufindw], "G") != NULL)){ if((strstr(cmdbuffer[bufindw], "G") != NULL)){
strchr_pointer = strchr(cmdbuffer[bufindw], 'G'); strchr_pointer = strchr(cmdbuffer[bufindw], 'G');
switch((int)((strtod(&cmdbuffer[bufindw][strchr_pointer - cmdbuffer[bufindw] + 1], NULL)))){ switch(atoi(strchr_pointer+1)){
case 0: case 0:
case 1: case 1:
#ifdef SDSUPPORT #ifdef SDSUPPORT
@ -520,8 +520,8 @@ if(!sdmode || serial_count!=0){
} }
inline float code_value() { return (strtod(&cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1], NULL)); } inline float code_value() { return strtod(strchr_pointer, NULL); }
inline long code_value_long() { return (strtol(&cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1], NULL, 10)); } inline long code_value_long() { return atol(strchr_pointer); }
inline bool code_seen(char code_string[]) { return (strstr(cmdbuffer[bufindr], code_string) != NULL); } //Return True if the string was found inline bool code_seen(char code_string[]) { return (strstr(cmdbuffer[bufindr], code_string) != NULL); } //Return True if the string was found
inline bool code_seen(char code) inline bool code_seen(char code)