overworked lcd+eeprom to have only mm/sec and PID including pid_dt

diff --git a/Marlin/EEPROMwrite.h b/Marlin/EEPROMwrite.h
index be3210fc956edfef9608a39828efc5e9134f303e..3d559c0269846847a0c5b0564f7ab43feb427ce8 100644 (file)
--- a/Marlin/EEPROMwrite.h
+++ b/Marlin/EEPROMwrite.h
@@ -136,10 +136,10 @@ inline void RetrieveSettings(bool def=false)
     SERIAL_ECHO_START;
       SERIAL_ECHOLNPGM("Maximum feedrates (mm/s):");
       SERIAL_ECHO_START;
-      SERIAL_ECHOPAIR("  M203 X",max_feedrate[0]/60);
-      SERIAL_ECHOPAIR(" Y",max_feedrate[1]/60 ); 
-      SERIAL_ECHOPAIR(" Z", max_feedrate[2]/60 ); 
-      SERIAL_ECHOPAIR(" E", max_feedrate[3]/60);
+      SERIAL_ECHOPAIR("  M203 X",max_feedrate[0]);
+      SERIAL_ECHOPAIR(" Y",max_feedrate[1] ); 
+      SERIAL_ECHOPAIR(" Z", max_feedrate[2] ); 
+      SERIAL_ECHOPAIR(" E", max_feedrate[3]);
       SERIAL_ECHOLN("");
     SERIAL_ECHO_START;
       SERIAL_ECHOLNPGM("Maximum Acceleration (mm/s2):");
@@ -158,19 +158,19 @@ inline void RetrieveSettings(bool def=false)
     SERIAL_ECHO_START;
       SERIAL_ECHOLNPGM("Advanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum xY jerk (mm/s),  Z=maximum Z jerk (mm/s)");
       SERIAL_ECHO_START;
-      SERIAL_ECHOPAIR("  M205 S",minimumfeedrate/60 ); 
-      SERIAL_ECHOPAIR(" T" ,mintravelfeedrate/60 ); 
+      SERIAL_ECHOPAIR("  M205 S",minimumfeedrate ); 
+      SERIAL_ECHOPAIR(" T" ,mintravelfeedrate ); 
       SERIAL_ECHOPAIR(" B" ,minsegmenttime ); 
-      SERIAL_ECHOPAIR(" X" ,max_xy_jerk/60 ); 
-      SERIAL_ECHOPAIR(" Z" ,max_z_jerk/60);
+      SERIAL_ECHOPAIR(" X" ,max_xy_jerk ); 
+      SERIAL_ECHOPAIR(" Z" ,max_z_jerk);
       SERIAL_ECHOLN(""); 
     #ifdef PIDTEMP
       SERIAL_ECHO_START;
       SERIAL_ECHOLNPGM("PID settings:");
       SERIAL_ECHO_START;
-      SERIAL_ECHOPAIR("   M301 P",Kp ); 
-      SERIAL_ECHOPAIR(" I" ,Ki ); 
-      SERIAL_ECHOPAIR(" D" ,Kd);
+      SERIAL_ECHOPAIR("   M301 P",Kp); 
+      SERIAL_ECHOPAIR(" I" ,Ki/PID_dT); 
+      SERIAL_ECHOPAIR(" D" ,Kd*PID_dT);
       SERIAL_ECHOLN(""); 
     #endif
   #endif

diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index e2a75df10af9bbe9b5307fa6f62867745ccf5d8d..e6a16a408e5eb0a1a23905055478b1921be42ada 100644 (file)
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -758,11 +758,11 @@ void MainMenu::showControlTemp()
             linechanging=!linechanging;\r
             if(linechanging)\r
             {\r
-               encoderpos=(int)Kp/5;\r
+               encoderpos=(int)Kp;\r
             }\r
             else\r
             {\r
-              Kp= encoderpos*5;\r
+              Kp= encoderpos;\r
               encoderpos=activeline*lcdslow;\r
                 \r
             }\r
@@ -772,8 +772,8 @@ void MainMenu::showControlTemp()
           if(linechanging)\r
           {\r
             if(encoderpos<1) encoderpos=1;\r
-            if(encoderpos>9990/5) encoderpos=9990/5;\r
-            lcd.setCursor(13,line);lcd.print(itostr4(encoderpos*5));\r
+            if(encoderpos>9990) encoderpos=9990;\r
+            lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));\r
           }\r
         }\r
       }break;\r
@@ -782,7 +782,7 @@ void MainMenu::showControlTemp()
       if(force_lcd_update)\r
         {\r
           lcd.setCursor(0,line);lcdprintPGM(" PID-I: ");\r
-          lcd.setCursor(13,line);lcd.print(ftostr51(Ki));\r
+          lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT));\r
         }\r
         \r
         if((activeline==line) )\r
@@ -792,11 +792,11 @@ void MainMenu::showControlTemp()
             linechanging=!linechanging;\r
             if(linechanging)\r
             {\r
-               encoderpos=(int)(Ki*10);\r
+               encoderpos=(int)(Ki*10/PID_dT);\r
             }\r
             else\r
             {\r
-              Ki= encoderpos/10.;\r
+              Ki= encoderpos/10.*PID_dT;\r
               encoderpos=activeline*lcdslow;\r
                 \r
             }\r
@@ -816,7 +816,7 @@ void MainMenu::showControlTemp()
       if(force_lcd_update)\r
         {\r
           lcd.setCursor(0,line);lcdprintPGM(" PID-D: ");\r
-          lcd.setCursor(13,line);lcd.print(itostr4(Kd));\r
+          lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT));\r
         }\r
         \r
         if((activeline==line) )\r
@@ -826,11 +826,11 @@ void MainMenu::showControlTemp()
             linechanging=!linechanging;\r
             if(linechanging)\r
             {\r
-               encoderpos=(int)Kd/5;\r
+               encoderpos=(int)(Kd/5./PID_dT);\r
             }\r
             else\r
             {\r
-              Kd= encoderpos*5;\r
+              Kd= encoderpos;\r
               encoderpos=activeline*lcdslow;\r
                 \r
             }\r
@@ -840,8 +840,8 @@ void MainMenu::showControlTemp()
           if(linechanging)\r
           {\r
             if(encoderpos<0) encoderpos=0;\r
-            if(encoderpos>9990/5) encoderpos=9990/5;\r
-            lcd.setCursor(13,line);lcd.print(itostr4(encoderpos*5));\r
+            if(encoderpos>9990) encoderpos=9990;\r
+            lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));\r
           }\r
         }\r
       }break;   \r