Skip to content

Commit b1222e9

Browse files
committed
338.05 release candidate for 0.93
1 parent d657804 commit b1222e9

File tree

7 files changed

+4484
-4446
lines changed

7 files changed

+4484
-4446
lines changed

firmware/config.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@
6060
// NOTE: The number of SYSTEM_GROUP or SR_DEFAULTS elements cannot exceed CMD_MAX_OBJECTS
6161
#define GROUP_PREFIXES "x,y,z,a,b,c,1,2,3,4,g54,g55,g56,g57,g58,g59"
6262
#define SYSTEM_GROUP "fv,fb,si,gpl,gun,gco,gpa,gdi,ea,ja,ml,ma,mt,ic,il,ec,ee,ex"
63-
#define SR_DEFAULTS "line","posx","posy","posz","posa","feed","vel","unit","coor","dist","frmo","momo","stat","mots","hold"
63+
#define SR_DEFAULTS "line","posx","posy","posz","posa","feed","vel","unit","coor","dist","frmo","momo","stat"
64+
//#define SR_DEFAULTS "line","posx","posy","posz","posa","feed","vel","unit","coor","dist","frmo","momo","stat","mots","hold"
6465
#define DONT_PERSIST "gc,te,de" // commands that should not be persisted (comma separated)
65-
#define DONT_INITIALIZE "gc,sr,te,he,de"
66+
#define DONT_INITIALIZE "gc,sr,te,he,de" // commands that should not be initialized
6667

6768
enum cmdValueType { // value typing for config and JSON
6869
VALUE_TYPE_ERROR = -2, // was unable to process the record
@@ -84,6 +85,7 @@ struct cmdObject { // depending on use, not all elements may be populated
8485
char token[CMD_TOKEN_LEN+1]; // mnemonic token
8586
char vstring[CMD_STRING_LEN+1]; // value string (see note below)
8687
}; // OK, so it's not REALLY an object
88+
typedef struct cmdObject cmdObj; // handy typedef for command onjects
8789

8890
// The cmdObj vstring field is overloaded to save RAM. Its primary use is to
8991
// carry a value-type of string. It is also used in some preliminary operations
@@ -93,7 +95,6 @@ struct cmdObject { // depending on use, not all elements may be populated
9395
#define friendly_name vstring // used here as a friendly name field
9496
#define group_token vstring // used here as a group token field
9597

96-
typedef struct cmdObject cmdObj;
9798
typedef uint8_t (*fptrCmd)(cmdObj *cmd);// required for cmd table access
9899
typedef void (*fptrPrint)(cmdObj *cmd); // required for PROGMEM access
99100

firmware/controller.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ void tg_init(uint8_t default_src)
9595
void tg_reset(void)
9696
{
9797
mp_flush_planner();
98+
tg_system_reset();
9899
tg_application_reset();
99100
}
100101

@@ -246,7 +247,7 @@ void _dispatch_return(uint8_t status, char *buf)
246247
if (tg.communications_mode == TG_TEXT_MODE) {
247248
// for these status codes just send a prompt
248249
switch (status) {
249-
case TG_OK: case TG_EAGAIN: case TG_NOOP: {
250+
case TG_OK: case TG_EAGAIN: case TG_NOOP: case TG_ZERO_LENGTH_MOVE:{
250251
_prompt_without_message();
251252
break;
252253
}

firmware/default/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COMMON = -mmcu=$(MCU)
1515

1616
## Compile options common for all C compilation units.
1717
CFLAGS = $(COMMON)
18-
CFLAGS += -Wall -gdwarf-2 -std=gnu99 -DF_CPU=32000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
18+
CFLAGS += -Wall -gdwarf-2 -std=gnu99 -DF_CPU=32000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
1919
CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d
2020

2121
## Assembly specific flags

0 commit comments

Comments
 (0)