Browse Source

Merge pull request #1919 from paclema/M48_mismatch

Fixed M48 mismatch between n and P parameter on documentation
Scott Lahteine 9 years ago
parent
commit
f49a73d69f
1 changed files with 3 additions and 7 deletions
  1. 3
    7
      Marlin/Marlin_main.cpp

+ 3
- 7
Marlin/Marlin_main.cpp View File

122
  *        Call gcode file : "M32 P !filename#" and return to caller file after finishing (similar to #include).
122
  *        Call gcode file : "M32 P !filename#" and return to caller file after finishing (similar to #include).
123
  *        The '#' is necessary when calling from within sd files, as it stops buffer prereading
123
  *        The '#' is necessary when calling from within sd files, as it stops buffer prereading
124
  * M42  - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
124
  * M42  - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
125
- * M48  - Measure Z_Probe repeatability. M48 [n # of points] [X position] [Y position] [V_erboseness #] [E_ngage Probe] [L # of legs of travel]
125
+ * M48  - Measure Z_Probe repeatability. M48 [P # of points] [X position] [Y position] [V_erboseness #] [E_ngage Probe] [L # of legs of travel]
126
  * M80  - Turn on Power Supply
126
  * M80  - Turn on Power Supply
127
  * M81  - Turn off Power Supply
127
  * M81  - Turn off Power Supply
128
  * M82  - Set E codes absolute (default)
128
  * M82  - Set E codes absolute (default)
2893
    * M48: Z-Probe repeatability measurement function.
2893
    * M48: Z-Probe repeatability measurement function.
2894
    *
2894
    *
2895
    * Usage:
2895
    * Usage:
2896
-   *   M48 <n#> <X#> <Y#> <V#> <E> <L#>
2896
+   *   M48 <P#> <X#> <Y#> <V#> <E> <L#>
2897
    *     P = Number of sampled points (4-50, default 10)
2897
    *     P = Number of sampled points (4-50, default 10)
2898
    *     X = Sample X position
2898
    *     X = Sample X position
2899
    *     Y = Sample Y position
2899
    *     Y = Sample Y position
2905
    * as been issued prior to invoking the M48 Z-Probe repeatability measurement function.
2905
    * as been issued prior to invoking the M48 Z-Probe repeatability measurement function.
2906
    * Any information generated by a prior G29 Bed leveling command will be lost and need to be
2906
    * Any information generated by a prior G29 Bed leveling command will be lost and need to be
2907
    * regenerated.
2907
    * regenerated.
2908
-   *
2909
-   * The number of samples will default to 10 if not specified.  You can use upper or lower case
2910
-   * letters for any of the options EXCEPT n.  n must be in lower case because Marlin uses a capital
2911
-   * N for its communication protocol and will get horribly confused if you send it a capital N.
2912
    */
2908
    */
2913
   inline void gcode_M48() {
2909
   inline void gcode_M48() {
2914
 
2910
 
2926
     if (verbose_level > 0)
2922
     if (verbose_level > 0)
2927
       SERIAL_PROTOCOLPGM("M48 Z-Probe Repeatability test\n");
2923
       SERIAL_PROTOCOLPGM("M48 Z-Probe Repeatability test\n");
2928
 
2924
 
2929
-    if (code_seen('P') || code_seen('p') || code_seen('n')) { // `n` for legacy support only - please use `P`!
2925
+    if (code_seen('P') || code_seen('p')) {
2930
       n_samples = code_value_short();
2926
       n_samples = code_value_short();
2931
       if (n_samples < 4 || n_samples > 50) {
2927
       if (n_samples < 4 || n_samples > 50) {
2932
         SERIAL_PROTOCOLPGM("?Sample size not plausible (4-50).\n");
2928
         SERIAL_PROTOCOLPGM("?Sample size not plausible (4-50).\n");

Loading…
Cancel
Save