1.42.18 kurt wobblefix ui change

Nibbels · Sep 22, 2018 · b822a83 · b822a83
1 parent 6ce971d
commit b822a83
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 18 deletions.
diff --git a/Repetier/Constants.h b/Repetier/Constants.h
@@ -20,7 +20,7 @@
 #define CONSTANTS_H
 
 
-#define REPETIER_VERSION                    "RF.01.42.17"
+#define REPETIER_VERSION                    "RF.01.42.18"
 #define UI_PRINTER_COMPANY                  "Conrad Community"
 #define UI_VERSION_STRING                   "V " REPETIER_VERSION
 

diff --git a/Repetier/RF1000.h b/Repetier/RF1000.h
@@ -821,7 +821,8 @@ This is like reducing your 1/16th microstepping to 1/8 or 1/4. It is much cheape
 additional stepper interrupts with all it's overhead. As a result you can go as high as
 40000Hz. STEP_DOUBLER_FREQUENCY should be in range 5000-12000 for RFx000 but 8000 is much for RF2000 (with ADVANCE?).
 
-STEP_DOUBLER_FREQUENCY can be changed in Menu-> Configuration->Stepper->DblFq: */
+STEP_DOUBLER_FREQUENCY can be changed in Menu-> Configuration->Stepper->DblFq: 
+*/
 #define STEP_DOUBLER_FREQUENCY              7000
 
 /** \brief If you reach STEP_DOUBLER_FREQUENCY the firmware will do 2 or 4 steps with nearly no delay. That can be too fast
@@ -837,12 +838,12 @@ many very short moves the cache may go empty. The minimum value is 5. */
 If the cache contains less then MOVE_CACHE_LOW segments, the time per segment is limited to LOW_TICKS_PER_MOVE clock cycles.
 If a move would be shorter, the feedrate will be reduced. This should prevent buffer underflows. Set this to 0 if you
 don't care about empty buffers during print. */
-#define MOVE_CACHE_LOW                      (MOVE_CACHE_SIZE - 5)
+#define MOVE_CACHE_LOW                      10
 
 /** \brief Cycles per move, if move cache is low.
 This value must be high enough, that the buffer has time to fill up. The problem only occurs at the beginning of a print or
 if you are printing many very short segments at high speed.*/
-#define LOW_TICKS_PER_MOVE                  500000
+#define LOW_TICKS_PER_MOVE                  250000
 
 /** \brief Adds a M3993 / or like "M3993 P300000" to set another or default LOW_TICKS_PER_MOVE and gather statistics about the fill level of the MOVE_CACHE while printing */
 #define FEATURE_DEBUG_MOVE_CACHE_TIMING              0

diff --git a/Repetier/RF2000.h b/Repetier/RF2000.h
@@ -834,12 +834,12 @@ many very short moves the cache may go empty. The minimum value is 5. */
 If the cache contains less then MOVE_CACHE_LOW segments, the time per segment is limited to LOW_TICKS_PER_MOVE clock cycles.
 If a move would be shorter, the feedrate will be reduced. This should prevent buffer underflows. Set this to 0 if you
 don't care about empty buffers during print. */
-#define MOVE_CACHE_LOW                      (MOVE_CACHE_SIZE - 5)
+#define MOVE_CACHE_LOW                      10
 
 /** \brief Cycles per move, if move cache is low.
 This value must be high enough, that the buffer has time to fill up. The problem only occurs at the beginning of a print or
 if you are printing many very short segments at high speed.*/
-#define LOW_TICKS_PER_MOVE                  500000
+#define LOW_TICKS_PER_MOVE                  250000
 
 /** \brief Adds a M3993 / or like "M3993 P300000" to set another or default LOW_TICKS_PER_MOVE and gather statistics about the fill level of the MOVE_CACHE while printing */
 #define FEATURE_DEBUG_MOVE_CACHE_TIMING              0

diff --git a/Repetier/RF2000v2.h b/Repetier/RF2000v2.h
@@ -834,12 +834,12 @@ many very short moves the cache may go empty. The minimum value is 5. */
 If the cache contains less then MOVE_CACHE_LOW segments, the time per segment is limited to LOW_TICKS_PER_MOVE clock cycles.
 If a move would be shorter, the feedrate will be reduced. This should prevent buffer underflows. Set this to 0 if you
 don't care about empty buffers during print. */
-#define MOVE_CACHE_LOW                      (MOVE_CACHE_SIZE - 5)
+#define MOVE_CACHE_LOW                      10
 
 /** \brief Cycles per move, if move cache is low.
 This value must be high enough, that the buffer has time to fill up. The problem only occurs at the beginning of a print or
 if you are printing many very short segments at high speed.*/
-#define LOW_TICKS_PER_MOVE                  500000
+#define LOW_TICKS_PER_MOVE                  250000
 
 /** \brief Adds a M3993 / or like "M3993 P300000" to set another or default LOW_TICKS_PER_MOVE and gather statistics about the fill level of the MOVE_CACHE while printing */
 #define FEATURE_DEBUG_MOVE_CACHE_TIMING              0

diff --git a/Repetier/ui.cpp b/Repetier/ui.cpp
@@ -2187,7 +2187,7 @@ void UIDisplay::parse(char *txt,bool ram)
                 }*/
                 else if(c2=='P')                                                                        // %wP : current wobblefix phase for YX-wobble (Bauchtanz)
                 {
-                    addInt(Printer::wobblePhaseXY,4);
+                    addInt( long(float(Printer::wobblePhaseXY)*1.8f) ,4);
                     break;
                 }
 
@@ -4061,7 +4061,13 @@ void UIDisplay::nextPreviousAction(int8_t next)
         //Antibauchtanz:
         case UI_ACTION_WOBBLE_FIX_PHASEXY:
         {
-            INCREMENT_MIN_MAX(Printer::wobblePhaseXY,1,-100,100);
+            INCREMENT_MIN_MAX(Printer::wobblePhaseXY,1,-100,101);
+			if(Printer::wobblePhaseXY == 101){
+				Printer::wobblePhaseXY = -99;
+			}
+			if(Printer::wobblePhaseXY == -100){
+				Printer::wobblePhaseXY = 100;
+			}
 #if FEATURE_AUTOMATIC_EEPROM_UPDATE
             HAL::eprSetByte( EPR_RF_MOD_WOBBLE_FIX_PHASEXY, Printer::wobblePhaseXY );
             EEPROM::updateChecksum();

diff --git a/Repetier/uilang.h b/Repetier/uilang.h
@@ -417,11 +417,11 @@
 #if MOTHERBOARD == DEVICE_TYPE_RF2000 || MOTHERBOARD == DEVICE_TYPE_RF2000v2
     #define UI_TEXT_UNMOUNT_FILAMENT_SOFT   "Max. 210\002C/Soft"
     #define UI_TEXT_UNMOUNT_FILAMENT_HARD   "Oldstyle pull"
-    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "Phase XY: %wP%%%Pi"
+    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "Phase XY: %wP\002"
     #define UI_TEXT_WOBBLE_FIX_AMPX         "Amplit.X: %wa[um]"
     #define UI_TEXT_WOBBLE_FIX_AMPY1        "Amp. Y-l: %wb[um]"
     #define UI_TEXT_WOBBLE_FIX_AMPY2        "Amp. Y-r: %wc[um]"
-    #define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:  %wp%%%Pi"
+    //#define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:  %wp%%%Pi"
     #define UI_TEXT_WOBBLE_FIX_AMPZ         "Amplit.Z: %wd[um]"
     #define UI_TEXT_EMERGENCY_PAUSE_MIN     "Min:%pl digits"
     #define UI_TEXT_EMERGENCY_PAUSE_MAX     "Max:%ph digits"
@@ -480,11 +480,11 @@
 #else
     #define UI_TEXT_UNMOUNT_FILAMENT_SOFT   "Max. 210\002C/Soft"
     #define UI_TEXT_UNMOUNT_FILAMENT_HARD   "Oldstyle pull"
-    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "PhaseXY:%wP%%%Pi"
+    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "PhaseXY:%wP\002"
     #define UI_TEXT_WOBBLE_FIX_AMPX         "Ampli.X:%waum"
     #define UI_TEXT_WOBBLE_FIX_AMPY1        "Amp.Y-l:%wbum"
     #define UI_TEXT_WOBBLE_FIX_AMPY2        "Amp.Y-r:%wcum"
-    #define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:%wp%%%"
+    //#define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:%wp%%%"
     #define UI_TEXT_WOBBLE_FIX_AMPZ         "Ampli.Z:%wdum"
     #define UI_TEXT_EMERGENCY_PAUSE_MIN     "Min:%pl digi"
     #define UI_TEXT_EMERGENCY_PAUSE_MAX     "Max:%ph digi"
@@ -828,11 +828,11 @@
 #define UI_ACTION_TEXT_TYREUS_LYBEN_TIPP    "(empf. f" STR_uuml "r highpower Bett)"
 
 #if MOTHERBOARD == DEVICE_TYPE_RF2000 || MOTHERBOARD == DEVICE_TYPE_RF2000v2
-    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "Phase XY: %wP%%%Pi"
+    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "Phase XY: %wP\002"
     #define UI_TEXT_WOBBLE_FIX_AMPX         "Amplit.X: %wa[um]"
     #define UI_TEXT_WOBBLE_FIX_AMPY1        "Amp. Y-li:%wb[um]"
     #define UI_TEXT_WOBBLE_FIX_AMPY2        "Amp. Y-re:%wc[um]"
-    #define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:  %wp%%%"
+    //#define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:  %wp%%%"
     #define UI_TEXT_WOBBLE_FIX_AMPZ         "Amplit. Z:%wd[um]"
     #define UI_TEXT_EMERGENCY_PAUSE_MIN     "Min:%pl digits"
     #define UI_TEXT_EMERGENCY_PAUSE_MAX     "Max:%ph digits"
@@ -925,11 +925,11 @@
     #define UI_TEXT_INVALID_MATRIX          "Ung" STR_uuml" ltige Matrix"
     #define UI_TEXT_TEMPERATURE_WRONG       "Temperatur falsch"
 #else
-    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "PhaseXY:%wP%%%Pi"
+    #define UI_TEXT_WOBBLE_FIX_PHASEXY      "PhaseXY:%wP\002"
     #define UI_TEXT_WOBBLE_FIX_AMPX         "Ampli.X:%waum"
     #define UI_TEXT_WOBBLE_FIX_AMPY1        "Amp.Y-l:%wbum"
     #define UI_TEXT_WOBBLE_FIX_AMPY2        "Amp.Y-r:%wcum"
-    #define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:%wp%%%"
+    //#define UI_TEXT_WOBBLE_FIX_PHASEZ       "Phase Z:%wp%%%"
     #define UI_TEXT_WOBBLE_FIX_AMPZ         "Ampli.Z:%wdum"
     #define UI_TEXT_EMERGENCY_PAUSE_MIN     "Min:%pl digi"
     #define UI_TEXT_EMERGENCY_PAUSE_MAX     "Max:%ph digi"

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,12 @@ TODO: Testing, testing ..
 TODO: Zaldo said that he experienced a hard reset while starting some Z-Calibration. (Awaiting further information about this bug)
 TODO: zero K and nikibalboa say that they experienced a hard reset while starting "unload filament soft" or "load filament soft"
 
+V RF.01.42.18.Mod (2018-09-23)
+- Kurt Wobble Fix: The phase value will now jump from negative to positive.
+- Kurt Wobble Fix: The phase value within menu will now have +-180° (degree) instead of "+-100% Pi"
+- Movement: I reverted our MOVE_CACHE_LOW settings to the settings that repetier nowadays uses.
+  I think my testfile now produces more smooth movements, because the throttling was too early when it wasnt needed.
+
 V RF.01.42.17.Mod (2018-09-06)
 - Fix for Heater-Decoupled-Error if the printer drops temperature within pause.
 - Removed all places where Temperatures are set by manipulating the targetTemperatureC