Merge branch 'develop'

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GCAM 2015.04.13.
+# Generated by GNU Autoconf 2.68 for GCAM 2015.05.13.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GCAM'
 PACKAGE_TARNAME='gcam'
-PACKAGE_VERSION='2015.04.13'
-PACKAGE_STRING='GCAM 2015.04.13'
+PACKAGE_VERSION='2015.05.13'
+PACKAGE_STRING='GCAM 2015.05.13'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GCAM 2015.04.13 to adapt to many kinds of systems.
+\`configure' configures GCAM 2015.05.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1373,7 +1373,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GCAM 2015.04.13:";;
+     short | recursive ) echo "Configuration of GCAM 2015.05.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1479,7 +1479,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GCAM configure 2015.04.13
+GCAM configure 2015.05.13
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1757,7 +1757,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GCAM $as_me 2015.04.13, which was
+It was created by GCAM $as_me 2015.05.13, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2686,7 +2686,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gcam'
- VERSION='2015.04.13'
+ VERSION='2015.05.13'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12545,7 +12545,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GCAM $as_me 2015.04.13, which was
+This file was extended by GCAM $as_me 2015.05.13, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12602,7 +12602,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GCAM config.status 2015.04.13
+GCAM config.status 2015.05.13
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -19,7 +19,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ########################################################################
-AC_INIT([GCAM], [2015.04.13])
+AC_INIT([GCAM], [2015.05.13])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([gcam.c])
 AC_CONFIG_MACRO_DIR([m4])

libgcode/gcode.c

@@ -894,6 +894,7 @@ gcode_init (gcode_t *gcode)
   strcpy (gcode->machine_name, "");
 
   gcode->drilling_motion = GCODE_DRILLING_CANNED;
+  gcode->pocketing_style = GCODE_POCKETING_TRADITIONAL;
 
   gcode->machine_options = 0;
   gcode->decimals = 5;

libgcode/gcode_bolt_holes.c

@@ -183,7 +183,7 @@ gcode_bolt_holes_make (gcode_block_t *block)
   {
     if (block->gcode->drilling_motion == GCODE_DRILLING_CANNED)
     {
-      GCODE_DRILL (block, "G81", z1, tool->feed * tool->plunge_ratio, safe_z);
+      GCODE_DRILL (block, z1, tool->feed * tool->plunge_ratio, safe_z);
     }
   }
 
@@ -248,9 +248,9 @@ gcode_bolt_holes_make (gcode_block_t *block)
         {
           gcode_pocket_t pocket;
 
-          gcode_pocket_init (&pocket, tool_radius);                             // Create a pocket for 'offset_block';
+          gcode_pocket_init (&pocket, block, tool);                             // Create a pocket for 'offset_block';
           gcode_pocket_prep (&pocket, offset_block, NULL);                      // Create a raster of paths based on the contour;
-          gcode_pocket_make (&pocket, block, z, touch_z, tool);                 // Create the g-code from the pocket's path list;
+          gcode_pocket_make (&pocket, z, touch_z);                              // Create the g-code from the pocket's path list;
           gcode_pocket_free (&pocket);                                          // Dispose of the no longer needed pocket;
         }
 

libgcode/gcode_drill_holes.c

@@ -146,13 +146,13 @@ gcode_drill_holes_make (gcode_block_t *block)
 
   if (block->gcode->drilling_motion == GCODE_DRILLING_CANNED)
   {
-    if (drill_holes->increment <= GCODE_PRECISION)                              // Start of peck drilling cycle (G83);
+    if (drill_holes->increment <= GCODE_PRECISION)                              // Start of peck drilling cycle (G83 or G81 if peck depth is zero);
     {
-      GCODE_DRILL (block, "G83", target_z, tool->feed * tool->plunge_ratio, safe_z);
+      GCODE_DRILL (block, target_z, tool->feed * tool->plunge_ratio, safe_z);
     }
     else
     {
-      GCODE_Q_DRILL (block, "G83", target_z, tool->feed * tool->plunge_ratio, safe_z, drill_holes->increment);
+      GCODE_PECK_DRILL (block, target_z, tool->feed * tool->plunge_ratio, safe_z, drill_holes->increment);
     }
   }
 

libgcode/gcode_internal.h

@@ -87,6 +87,9 @@
 #define GCODE_DRILLING_CANNED         0x00
 #define GCODE_DRILLING_SIMPLE         0x01
 
+#define GCODE_POCKETING_TRADITIONAL   0x00
+#define GCODE_POCKETING_ALTERNATE_1   0x01
+
 /* *INDENT-OFF* */
 
 enum
@@ -335,6 +338,7 @@ typedef struct gcode_s
   uint8_t machine_options;
 
   uint8_t drilling_motion;
+  uint8_t pocketing_style;
 
   uint32_t decimals;                                                            // Number of decimal places to print
 
@@ -630,15 +634,15 @@ void strswp (char *target, char oldchar, char newchar);
 
 /* Canned cycle macros */
 
-#define GCODE_DRILL(_block, _code, _z, _f, _r) { \
+#define GCODE_DRILL(_block, _z, _f, _r) { \
         char _string[256]; \
-        gsprintf (_string, _block->gcode->decimals, "%s Z%z F%.3f R%z ", _code, _z, _f, _r); \
+        gsprintf (_string, _block->gcode->decimals, "G81 Z%z F%.3f R%z ", _z, _f, _r); \
         GCODE_APPEND (_block, _string); \
         _block->gcode->tool_zpos = FLT_MAX; }
 
-#define GCODE_Q_DRILL(_block, _code, _z, _f, _r, _q) { \
+#define GCODE_PECK_DRILL(_block, _z, _f, _r, _q) { \
         char _string[256]; \
-        gsprintf (_string, _block->gcode->decimals, "%s Z%z F%.3f R%z Q%z ", _code, _z, _f, _r, _q); \
+        gsprintf (_string, _block->gcode->decimals, "G83 Z%z F%.3f R%z Q%z ", _z, _f, _r, _q); \
         GCODE_APPEND (_block, _string); \
         _block->gcode->tool_zpos = FLT_MAX; }