Conditional machine definition override

If the command line machine definition is the same as the same as
gpx.ini then the machine definition is no longer re-loaded - which used
to clobber variables set in gpx.ini
Fixed input buffer overflow behaviour. Added print statistics in
verbode mode
master
WHPThomas 2013-11-16 03:17:33 +10:00
parent e28aad0282
commit 9ddb1a953a
3 changed files with 713 additions and 556 deletions

View File

@ -4,7 +4,7 @@ CC_FLAGS = -w
L_FLAGS = -lm L_FLAGS = -lm
# File names # File names
VERSION = 1.3 VERSION = 1.4
PLATFORM=osx PLATFORM=osx
ARCHIVE = gpx-$(PLATFORM)-$(VERSION) ARCHIVE = gpx-$(PLATFORM)-$(VERSION)
PREFIX = /usr/local PREFIX = /usr/local

1260
gpx.c

File diff suppressed because it is too large Load Diff

7
gpx.h
View File

@ -29,7 +29,9 @@
#include <limits.h> #include <limits.h>
#define GPX_VERSION "1.3" #define GPX_VERSION "1.4"
#define COMMAND_QUE_MAX 15
/* Nonzero to 'simulate' RPM using 5D, zero to disable */ /* Nonzero to 'simulate' RPM using 5D, zero to disable */
@ -38,7 +40,7 @@
// BOUNDS CHECKING VARIABLES // BOUNDS CHECKING VARIABLES
#define TEMPERATURE_MAX 280 #define TEMPERATURE_MAX 280
#define HBP_MAX 160 #define HBP_MAX 120
#ifdef _WIN32 #ifdef _WIN32
@ -161,6 +163,7 @@ typedef struct tMachine {
double nozzle_diameter; double nozzle_diameter;
unsigned extruder_count; unsigned extruder_count;
unsigned timeout; unsigned timeout;
unsigned ordinal;
} Machine; } Machine;
typedef struct tTool { typedef struct tTool {