Add G90 in _GO_PROBE_STRING

mstrens · Apr 25, 2020 · bca2837 · bca2837
1 parent 40e990c
commit bca2837
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/.vscode/arduino.json b/.vscode/arduino.json
@@ -0,0 +1,5 @@
+{
+    "board": "esp8266:esp8266:huzzah",
+    "configuration": "xtal=80,vt=flash,exception=enabled,eesz=4M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200",
+    "port": "COM8"
+}
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,14 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "C:\\Users\\Acer\\AppData\\Local\\Arduino15\\packages\\esp8266\\tools\\**",
+                "C:\\Users\\Acer\\AppData\\Local\\Arduino15\\packages\\esp8266\\hardware\\esp8266\\2.5.0-beta2\\**"
+            ],
+            "forcedInclude": [],
+            "intelliSenseMode": "msvc-x64"
+        }
+    ],
+    "version": 4
+}
diff --git a/com.cpp b/com.cpp
@@ -502,6 +502,7 @@ void sendFromString(){
             //Serial.print( "wpos Z is saved with value = ") ; Serial.println( wposXYZA[2] ) ; // to debug
             break;
          case 'X' : // Put the G30 X offset
+            //Serial.print("G30SavedX"); Serial.println(G30SavedX);
             Serial2.print(G30SavedX) ;
             break;
          case 'Y' : // Put the G30 Y offset

diff --git a/config.h b/config.h
@@ -141,7 +141,7 @@
 #define _CAL_STRING "G4P0.0\n $G\n M5\n G53 G21 G90 G00 Z-2\n G30\n G21 G91\n G38.2 Z-70 F100\n G00 Z2\n G38.2 Z-3 F10\n G4P0.5\n %z G53 G21 G90 G00 Z-2\n G28\n %M\n"
 
 #define _GO_CHANGE_STRING "G4P0.0\n $G\n $#\n M5\n G53 G21 G90 G00 Z-2\n G28\n"
-#define _GO_PROBE_STRING "G4P0.0\n $#\n $G\n M5\n G53 G21 G90 G00 Z-2\n G30X%X Y%Y Z-2\n G21 G91\n G38.2 Z-70 F100\n G00 Z2\n G38.2 Z-3 F10\n G10 L20 P1 Z%Z\n G53 G21 G90 G00 Z-2\n %M\n"
+#define _GO_PROBE_STRING "G4P0.0\n $#\n $G\n M5\n G53 G21 G90 G00 Z-2\n G90\n G30X%X Y%Y Z-2\n G21 G91\n G38.2 Z-70 F100\n G00 Z2\n G38.2 Z-3 F10\n G10 L20 P1 Z%Z\n G53 G21 G90 G00 Z-2\n %M\n"
 #define _SET_CHANGE_STRING "G28.1\n G4P0.0\n $#\n $G\n" 
 #define _SET_PROBE_STRING "G30.1\n G4P0.0\n $#\n $G\n" 
 

diff --git a/grbl_controller_esp32.ino b/grbl_controller_esp32.ino
@@ -4,7 +4,7 @@
 // pour cela, on peut employer une fonction prévue Serial2.setRxBufferSize(size_t)
 
 // to do
-// retirer les serial.print qui ont servi au debug
+
 // permettre l'accès au contenu du fichier SD seulement si le statut est print from SD en pause. 
 
 // prévoir de pouvoir faire un "continue" quand on a une pause alors que l'on est en train d'envoyer des CMD ou des STRING vers GRBL