Modified felix event system

mandolincreek · Jan 12, 2018 · e822897 · e822897
1 parent 4866d07
commit e822897
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/src/ArduinoAVR/Repetier/Printer.cpp b/src/ArduinoAVR/Repetier/Printer.cpp
@@ -623,6 +623,8 @@ uint8_t Printer::moveTo(float x, float y, float z, float e, float f) {
         destinationSteps[Z_AXIS] = (z + Printer::offsetZ) * axisStepsPerMM[Z_AXIS];
     if(e != IGNORE_COORDINATE)
         destinationSteps[E_AXIS] = e * axisStepsPerMM[E_AXIS];
+	else
+		destinationSteps[E_AXIS] = currentPositionSteps[E_AXIS];
     if(f != IGNORE_COORDINATE)
         feedrate = f;
 #if NONLINEAR_SYSTEM

diff --git a/src/ArduinoAVR/Repetier/Repetier.h b/src/ArduinoAVR/Repetier/Repetier.h
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <stdint.h>
 //#define REPETIER_VERSION "0.92.10"
-#define REPETIER_VERSION "1.0.0"
+#define REPETIER_VERSION "1.0.1"
 
 // Use new communication model for multiple channels - only until stable, then old version gets deleted
 #define NEW_COMMUNICATION 1

diff --git a/src/ArduinoDUE/Repetier/Printer.cpp b/src/ArduinoDUE/Repetier/Printer.cpp
@@ -623,6 +623,8 @@ uint8_t Printer::moveTo(float x, float y, float z, float e, float f) {
         destinationSteps[Z_AXIS] = (z + Printer::offsetZ) * axisStepsPerMM[Z_AXIS];
     if(e != IGNORE_COORDINATE)
         destinationSteps[E_AXIS] = e * axisStepsPerMM[E_AXIS];
+	else
+		destinationSteps[E_AXIS] = currentPositionSteps[E_AXIS];
     if(f != IGNORE_COORDINATE)
         feedrate = f;
 #if NONLINEAR_SYSTEM

diff --git a/src/ArduinoDUE/Repetier/Repetier.h b/src/ArduinoDUE/Repetier/Repetier.h
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <stdint.h>
 //#define REPETIER_VERSION "0.92.10"
-#define REPETIER_VERSION "1.0.0"
+#define REPETIER_VERSION "1.0.1"
 
 // Use new communication model for multiple channels - only until stable, then old version gets deleted
 #define NEW_COMMUNICATION 1

diff --git a/src/SampleEventSystems/FELIX Pro 1/CustomEvents.h b/src/SampleEventSystems/FELIX Pro 1/CustomEvents.h
@@ -89,20 +89,29 @@ extern bool cCustomParser(char c1, char c2);
 #define UI_ACTION_CZREFH_SUCC   1550
 
 #ifndef HALF_P1_X
+#ifdef TEC4
+#define HALF_P1_X 25.5
+#define HALF_P1_Y 40
+#define HALF_P2_X 25.5
+#define HALF_P2_Y 170
+#define HALF_FIX_X 132
+#define HALF_FIX_Y 98
+#define HALF_Z 3
+// Wheel position
+#define HALF_WHEEL_P1 -38
+#define HALF_WHEEL_P2 232
+#else // Pro 2 case
 #define HALF_P1_X 25
 #define HALF_P1_Y 40
 #define HALF_P2_X 25
 #define HALF_P2_Y 170
 #define HALF_FIX_X 132
 #define HALF_FIX_Y 110
-#ifdef TEC4
 #define HALF_Z 2.8
-#else
-#define HALF_Z 3
-#endif 
 // Wheel position
 #define HALF_WHEEL_P1 -71
 #define HALF_WHEEL_P2 199
+#endif 
 #endif
 #ifndef HALF_PITCH
 #define HALF_PITCH 0.7

diff --git a/src/SampleEventSystems/FELIX Pro 1/CustomEventsImpl.h b/src/SampleEventSystems/FELIX Pro 1/CustomEventsImpl.h
@@ -159,8 +159,13 @@ void halfautomaticLevel2() {
   planeBuilder.createPlane(plane);
   // float z1 = p1 + (p2 - p1) / (HALF_P2_Y - HALF_P1_Y) * (HALF_WHEEL_P1 - HALF_P1_Y) - halfRefHeight; 
   // float z2 = p1 + (p2 - p1) / (HALF_P2_Y - HALF_P1_Y) * (HALF_WHEEL_P2 - HALF_P1_Y) - halfRefHeight;
+#ifdef TEC4  
+  float z1 =(plane.z(HALF_P1_X, HALF_WHEEL_P1) - halfRefHeight - .15) * 360 / HALF_PITCH;  //added by FELIX extra offset of 0.1
+  float z2 = (plane.z(HALF_P1_X, HALF_WHEEL_P2) - halfRefHeight - .15) * 360 / HALF_PITCH; //added by FELIX extra offset of 0.1
+#else
   float z1 =(plane.z(HALF_P1_X, HALF_WHEEL_P1) - halfRefHeight) * 360 / HALF_PITCH;
   float z2 = (plane.z(HALF_P1_X, HALF_WHEEL_P2) - halfRefHeight) * 360 / HALF_PITCH;
+#endif    
   Printer::wizardStack[0].f = z2; 
   Printer::wizardStack[1].f = z1; 
   uid.popMenu(false);

diff --git a/src/SampleEventSystems/FELIX Pro 1/CustomMenu.h b/src/SampleEventSystems/FELIX Pro 1/CustomMenu.h
@@ -75,7 +75,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_calex_z,UI_CTEXT_CALIBRATE_Z_ID,UI_ACTION_CALEX_Z)
 #define UI_CALEXTR_SUBITEMS {&ui_menu_back, &ui_calex_xy}
 UI_MENU(ui_calextr_sub,UI_CALEXTR_SUBITEMS,2)
 #else
-#define UI_CALEXTR_SUBITEMS {&ui_menu_back, &ui_calex_xy,&ui_calex_z}
+#define UI_CALEXTR_SUBITEMS {&ui_menu_back, &ui_calex_z, &ui_calex_xy}
 UI_MENU(ui_calextr_sub,UI_CALEXTR_SUBITEMS,3)
 #endif
 //====================
@@ -1020,12 +1020,12 @@ UI_MENU_SUBMENU_FILTER_T(ui_menu_quick_changefil_printing,UI_TEXT_CHANGE_FILAMEN
 UI_MENU_SUBMENU_FILTER_T(ui_menu_move, UI_TEXT_POSITION_ID, ui_menu_positions,0,MENU_MODE_PRINTING)
 #if NUM_EXTRUDER > 1
 #define UI_MENU_QUICK {UI_MENU_ADDCONDBACK &ui_preheatcool2,&ui_removebed UI_CHANGE_FIL_ENT ,&ui_menu_autolevelbed UI_CALIB_PROBE_ENTRY, &ui_calex ,&ui_menu_move \
-      , &ui_menu_quick_stopstepper, &ui_menu_ext_temp0,&ui_menu_ext_temp1,&ui_menu_bed_temp}
+      , &ui_menu_quick_stopstepper UI_FANSPEED, &ui_menu_ext_temp0,&ui_menu_ext_temp1,&ui_menu_bed_temp}
 #else
 #define UI_MENU_QUICK {UI_MENU_ADDCONDBACK &ui_preheatcool1,&ui_removebed UI_CHANGE_FIL_ENT ,&ui_menu_autolevelbed UI_CALIB_PROBE_ENTRY, &ui_calex ,&ui_menu_move \
-      , &ui_menu_quick_stopstepper, &ui_menu_ext_temp0,&ui_menu_ext_temp1,&ui_menu_bed_temp}
+      , &ui_menu_quick_stopstepper UI_FANSPEED, &ui_menu_ext_temp0,&ui_menu_ext_temp1,&ui_menu_bed_temp}
 #endif      
-UI_MENU(ui_menu_quick, UI_MENU_QUICK, 9 + UI_MENU_BACKCNT + UI_CHANGE_FIL_CNT+ UI_CALIB_PROBE_COUNT)
+UI_MENU(ui_menu_quick, UI_MENU_QUICK, 10 + UI_MENU_BACKCNT + UI_CHANGE_FIL_CNT+ UI_CALIB_PROBE_COUNT)
 
 UI_MENU_HEADLINE_T(ui_menu_askstop_head, UI_TEXT_STOP_PRINT_ID)
 UI_MENU_ACTIONCOMMAND_T(ui_menu_sd_askstop_no, UI_TEXT_NO_ID, UI_ACTION_BACK)