switch pins on Marlin to match Repetier

RickMcConney · Sep 10, 2015 · ed788b6f8eaf3f9ac04158f6a268b161d9c93747 · ed788b6
1 parent 9a6c8d5
commit ed788b6f8eaf3f9ac04158f6a268b161d9c93747
Unified Split

Showing with 22 additions and 12 deletions.

+2 −2 Marlin/Marlin/Configuration.h

+6 −6 Marlin/Marlin/pins.h

+11 −4 Marlin/Marlin/planner.cpp

+3 −0 Marlin/Marlin/temperature.cpp
diff --git a/Marlin/Marlin/Configuration.h b/Marlin/Marlin/Configuration.h
@@ -319,8 +319,8 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 #define DISABLE_E false // For all extruders
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled
 
-#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
-#define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
+#define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
+#define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
diff --git a/Marlin/Marlin/pins.h b/Marlin/Marlin/pins.h
@@ -593,9 +593,9 @@
 
   #else
 
-    #define X_STEP_PIN         54
-    #define X_DIR_PIN          55
-    #define X_ENABLE_PIN       38
+    #define X_STEP_PIN         36 //54
+    #define X_DIR_PIN          34 //55
+    #define X_ENABLE_PIN       30 //38
     #define X_MIN_PIN           -1 //3
     #define X_MAX_PIN           -1 //2
 
@@ -611,9 +611,9 @@
     #define Z_MIN_PIN          18
     #define Z_MAX_PIN          19
 
-    #define Y2_STEP_PIN        36
-    #define Y2_DIR_PIN         34
-    #define Y2_ENABLE_PIN      30
+    #define Y2_STEP_PIN        54 //36
+    #define Y2_DIR_PIN         55 //34
+    #define Y2_ENABLE_PIN      38 //30
 
     #define Z2_STEP_PIN        36
     #define Z2_DIR_PIN         34
diff --git a/Marlin/Marlin/planner.cpp b/Marlin/Marlin/planner.cpp
@@ -579,14 +579,21 @@ void plan_buffer_line(const float &x, const float &y, const float &z, const floa
       SERIAL_PROTOCOL(polarLastA);
       SERIAL_PROTOCOLPGM(" LB:");
       SERIAL_PROTOCOL(polarLastB);
-      SERIAL_PROTOCOL("\n");
-    */  
+*/
+      
     target[X_AXIS] = lround((aPos-polarLastA)*axis_steps_per_unit[X_AXIS]);
     target[Y_AXIS] = lround((bPos-polarLastB)*axis_steps_per_unit[Y_AXIS]);
+    position[X_AXIS] = 0;
+    position[Y_AXIS] = 0;
     polarLastA = aPos;
     polarLastB = bPos;
-    
-
+/*    
+      SERIAL_PROTOCOLPGM(" TX:");
+      SERIAL_PROTOCOL(target[X_AXIS]);
+      SERIAL_PROTOCOLPGM(" TY:");
+      SERIAL_PROTOCOL(target[Y_AXIS]);
+      SERIAL_PROTOCOL("\n"); 
+*/
       
   #endif
 
diff --git a/Marlin/Marlin/temperature.cpp b/Marlin/Marlin/temperature.cpp
@@ -801,6 +801,9 @@ return(filament_width_nominal/temp*100);
 
 void tp_init()
 {
+  #ifdef POLAR
+	return;
+#endif
 #if MB(RUMBA) && ((TEMP_SENSOR_0==-1)||(TEMP_SENSOR_1==-1)||(TEMP_SENSOR_2==-1)||(TEMP_SENSOR_BED==-1))
   //disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector
   MCUCR=(1<<JTD);