build 339.01 fixes G2 pocket issue

Author: aldenhart

firmware/arc.c

@@ -42,7 +42,7 @@
 #include "planner.h"
 #include "kinematics.h"
 
-struct arArcSingleton 		{	// persistent planner and runtime variables
+struct arArcSingleton {			// persistent planner and runtime variables
 	uint8_t run_state;			// runtime state machine sequence
 	uint32_t linenum;			// gcode line number (Nxxxxx)
 
@@ -183,11 +183,11 @@ void ar_abort_arc()
 }
 
 /*****************************************************************************
- * Canonical Machining arc fucntions (arc prep for planning and runtime)
+ * Canonical Machining arc functions (arc prep for planning and runtime)
  * cm_arc_feed() - entry point for arc prep
  * _compute_center_arc() - compute arc from I and J (arc center point)
- * _get_arc_radius() 	- compute arc center (offset) from radius.
- * _get_arc_time()
+ * _get_arc_radius() 	 - compute arc center (offset) from radius.
+ * _get_arc_time()		 - compute time to complete arc at current feed rate
  */
 uint8_t cm_arc_feed(double target[], double flags[],// arc endpoints
 					double i, double j, double k, 	// offsets

firmware/canonical_machine.c

@@ -627,7 +627,7 @@ uint8_t cm_set_path_control(uint8_t mode)
 /* 
  * Machining Functions (4.3.6)
  *
- * cm_arc_feed() - see plan_arc.c
+ * cm_arc_feed() - see arc.c
  * cm_dwell() - G4, P parameter (seconds)
  * cm_straight_feed() - G1
  */ 

firmware/config.c

@@ -1268,7 +1268,7 @@ static uint8_t _set_defa(cmdObj *cmd)
 	} 
 	cm_set_units_mode(MILLIMETERS);	// must do init in MM mode
 
-	fprintf_P(stderr,PSTR("\n#### Initializing configs to default values ####\n"));
+	fprintf_P(stderr,PSTR(INIT_CONFIGURATION_MESSAGE));		// see settings.h & sub-headers
 	for (cmd->index=0; cmd->index<CMD_INDEX_END_SINGLES; cmd->index++) {
 		if (strstr(DONT_INITIALIZE, cmd_get_token(cmd->index, cmd->token)) != NULL) continue;
 		cmd->value = (double)pgm_read_float(&cfgArray[cmd->index].def_value);
@@ -1307,9 +1307,6 @@ uint8_t cfg_config_parser(char *str)
 	return (TG_OK);
 }
 
-
-
-
 /****************************************************************************
  * _parse_config_string() - parse a command line
  */

firmware/controller.c

@@ -394,28 +394,6 @@ static void _prompt_without_message()
 	} else {
 		fprintf_P(stderr, PSTR("%S%S"), pr1, pr_mm);
 	}
-
-/*
-//##################### BEGIN DIAGNOSTIC #######################
-	fprintf_P(stderr,PSTR("Programmed X =[%1.3f] "),cm_get_runtime_work_position(X));
-// 100 is step/mm=( 360*micro_step/(step angle * travel_per_revolution)) 360*1/(0.72*5)=100
-	double x_factor = (360 * cfg.m[X].microsteps / (cfg.m[X].step_angle * cfg.m[X].travel_rev));
-	fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),x_cnt/x_factor); 
-//	fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),x_cnt/100); 
-
-	fprintf_P(stderr,PSTR("Programmed Y =[%1.3f] "),cm_get_runtime_work_position(Y));
-	double y_factor = (360 * cfg.m[Y].microsteps / (cfg.m[Y].step_angle * cfg.m[Y].travel_rev));
-	fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),y_cnt/y_factor); 
-//	fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),y_cnt/100); 
-
-    fprintf_P(stderr,PSTR("Programmed Z =[%1.3f] "),cm_get_runtime_work_position(Z));
-	double z_factor = (360 * cfg.m[Z].microsteps / (cfg.m[Z].step_angle * cfg.m[Z].travel_rev));
-    fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),z_cnt/z_factor); 
-//    fprintf_P(stderr,PSTR("Real=[%1.3f] mm\n"),z_cnt/100); 
-*/
-
-//##################### EMD DIAGNOSTIC #######################
-
 }
 
 /**** Input source controls ****

firmware/default/Makefile

@@ -15,7 +15,7 @@ COMMON = -mmcu=$(MCU)
 
 ## Compile options common for all C compilation units.
 CFLAGS = $(COMMON)
-CFLAGS += -Wall -gdwarf-2 -std=gnu99                         -DF_CPU=32000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
+CFLAGS += -Wall -gdwarf-2 -std=gnu99                             -DF_CPU=32000000UL -O0 -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
 CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d 
 
 ## Assembly specific flags