From: Jim Morris <morris@wolfman.com>
Date: Mon, 29 Feb 2016 07:26:44 +0000 (-0800)
Subject: make grid file name a define
X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/commitdiff_plain/18679bb72c7e4528895359ced8e5049437a918cd

make grid file name a define
allow deletion of the grid file
---

diff --git a/src/modules/tools/zprobe/DeltaGridStrategy.cpp b/src/modules/tools/zprobe/DeltaGridStrategy.cpp
index a7af85ae..916719f1 100644
--- a/src/modules/tools/zprobe/DeltaGridStrategy.cpp
+++ b/src/modules/tools/zprobe/DeltaGridStrategy.cpp
@@ -29,6 +29,8 @@
 #define probe_offsets_checksum       CHECKSUM("probe_offsets")
 #define initial_height_checksum      CHECKSUM("initial_height")
 
+#define GRIDFILE "/sd/delta.grid"
+
 DeltaGridStrategy::DeltaGridStrategy(ZProbe *zprobe) : LevelingStrategy(zprobe)
 {
     // TODO allocate grid in AHB0 or AHB1
@@ -65,7 +67,7 @@ bool DeltaGridStrategy::handleConfig()
 
 void DeltaGridStrategy::save_grid(StreamOutput *stream)
 {
-    FILE *fp= fopen("/sd/delta.grid", "w");
+    FILE *fp= fopen(GRIDFILE, "w");
     if(fp == NULL) {
         stream->printf("error:Failed to open grid\n");
         return;
@@ -85,7 +87,7 @@ void DeltaGridStrategy::save_grid(StreamOutput *stream)
 
 void DeltaGridStrategy::load_grid(StreamOutput *stream)
 {
-    FILE *fp= fopen("/sd/delta.grid", "r");
+    FILE *fp= fopen(GRIDFILE, "r");
     if(fp == NULL) {
         stream->printf("error:Failed to open grid\n");
         return;
@@ -123,11 +125,15 @@ bool DeltaGridStrategy::handleGcode(Gcode *gcode)
             // delete the compensationTransform in robot
             setAdjustFunction(false);
             reset_bed_level();
-            remove("delta.grid");
             return true;
 
-        } else if(gcode->m == 374) { // M374: Save grid
-            save_grid(gcode->stream);
+        } else if(gcode->m == 374) { // M374: Save grid, M374.1: delete saved grid
+            if(subcode == 1) {
+                remove(GRIDFILE);
+            }else{
+                save_grid(gcode->stream);
+            }
+
             return true;
 
         } else if(gcode->m == 375) { // M375: load grid, M375.1 display grid