Browse Source

Merge pull request #8047 from thinkyhead/bf2_babystepping_M290

[2.0.x] Add M290 Babystepping (extended)
Scott Lahteine 6 years ago
parent
commit
3f827758d7
45 changed files with 183 additions and 61 deletions
  1. 1
    1
      Marlin/Configuration.h
  2. 1
    1
      Marlin/src/config/default/Configuration.h
  3. 1
    1
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 1
    1
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 1
    1
      Marlin/src/config/examples/Anet/A6/Configuration.h
  6. 1
    1
      Marlin/src/config/examples/Anet/A8/Configuration.h
  7. 1
    1
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  8. 1
    1
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  9. 1
    1
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  10. 1
    1
      Marlin/src/config/examples/Cartesio/Configuration.h
  11. 1
    1
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  12. 1
    1
      Marlin/src/config/examples/Felix/Configuration.h
  13. 1
    1
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  14. 1
    1
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  15. 1
    1
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  16. 1
    1
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  17. 1
    1
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  18. 1
    1
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  19. 1
    1
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  20. 1
    1
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  21. 1
    1
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  22. 1
    1
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  23. 1
    1
      Marlin/src/config/examples/RigidBot/Configuration.h
  24. 1
    1
      Marlin/src/config/examples/SCARA/Configuration.h
  25. 1
    1
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  26. 1
    1
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  27. 1
    1
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  28. 1
    1
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  29. 1
    1
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  30. 1
    1
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  31. 1
    1
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  32. 1
    1
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  33. 1
    1
      Marlin/src/config/examples/delta/generic/Configuration.h
  34. 1
    1
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  35. 1
    1
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  36. 1
    1
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  37. 1
    1
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  38. 1
    1
      Marlin/src/config/examples/makibox/Configuration.h
  39. 72
    18
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  40. 1
    1
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  41. 1
    1
      Marlin/src/config/examples/wt150/Configuration.h
  42. 4
    0
      Marlin/src/gcode/gcode.cpp
  43. 5
    0
      Marlin/src/gcode/gcode.h
  44. 61
    0
      Marlin/src/gcode/motion/M290.cpp
  45. 1
    3
      Marlin/src/inc/SanityCheck.h

+ 1
- 1
Marlin/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/default/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

1069
 //
1069
 //
1070
 // M100 Free Memory Watcher
1070
 // M100 Free Memory Watcher
1071
 //
1071
 //
1072
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1072
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1073
 
1073
 
1074
 //
1074
 //
1075
 // G20/G21 Inch mode support
1075
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Anet/A6/Configuration.h View File

1206
 //
1206
 //
1207
 // M100 Free Memory Watcher
1207
 // M100 Free Memory Watcher
1208
 //
1208
 //
1209
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1209
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1210
 
1210
 
1211
 //
1211
 //
1212
 // G20/G21 Inch mode support
1212
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Anet/A8/Configuration.h View File

1055
 //
1055
 //
1056
 // M100 Free Memory Watcher
1056
 // M100 Free Memory Watcher
1057
 //
1057
 //
1058
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1058
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1059
 
1059
 
1060
 //
1060
 //
1061
 // G20/G21 Inch mode support
1061
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

1040
 //
1040
 //
1041
 // M100 Free Memory Watcher
1041
 // M100 Free Memory Watcher
1042
 //
1042
 //
1043
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1043
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1044
 
1044
 
1045
 //
1045
 //
1046
 // G20/G21 Inch mode support
1046
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

1050
 //
1050
 //
1051
 // M100 Free Memory Watcher
1051
 // M100 Free Memory Watcher
1052
 //
1052
 //
1053
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1053
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1054
 
1054
 
1055
 //
1055
 //
1056
 // G20/G21 Inch mode support
1056
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

1040
 //
1040
 //
1041
 // M100 Free Memory Watcher
1041
 // M100 Free Memory Watcher
1042
 //
1042
 //
1043
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1043
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1044
 
1044
 
1045
 //
1045
 //
1046
 // G20/G21 Inch mode support
1046
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Cartesio/Configuration.h View File

1048
 //
1048
 //
1049
 // M100 Free Memory Watcher
1049
 // M100 Free Memory Watcher
1050
 //
1050
 //
1051
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1051
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1052
 
1052
 
1053
 //
1053
 //
1054
 // G20/G21 Inch mode support
1054
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

1059
 //
1059
 //
1060
 // M100 Free Memory Watcher
1060
 // M100 Free Memory Watcher
1061
 //
1061
 //
1062
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1062
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1063
 
1063
 
1064
 //
1064
 //
1065
 // G20/G21 Inch mode support
1065
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Felix/Configuration.h View File

1031
 //
1031
 //
1032
 // M100 Free Memory Watcher
1032
 // M100 Free Memory Watcher
1033
 //
1033
 //
1034
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1034
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1035
 
1035
 
1036
 //
1036
 //
1037
 // G20/G21 Inch mode support
1037
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

1031
 //
1031
 //
1032
 // M100 Free Memory Watcher
1032
 // M100 Free Memory Watcher
1033
 //
1033
 //
1034
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1034
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1035
 
1035
 
1036
 //
1036
 //
1037
 // G20/G21 Inch mode support
1037
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

1046
 //
1046
 //
1047
 // M100 Free Memory Watcher
1047
 // M100 Free Memory Watcher
1048
 //
1048
 //
1049
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1049
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1050
 
1050
 
1051
 //
1051
 //
1052
 // G20/G21 Inch mode support
1052
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

1064
 //
1064
 //
1065
 // M100 Free Memory Watcher
1065
 // M100 Free Memory Watcher
1066
 //
1066
 //
1067
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1067
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1068
 
1068
 
1069
 //
1069
 //
1070
 // G20/G21 Inch mode support
1070
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

1053
 //
1053
 //
1054
 // M100 Free Memory Watcher
1054
 // M100 Free Memory Watcher
1055
 //
1055
 //
1056
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1056
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1057
 
1057
 
1058
 //
1058
 //
1059
 // G20/G21 Inch mode support
1059
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

1077
 //
1077
 //
1078
 // M100 Free Memory Watcher
1078
 // M100 Free Memory Watcher
1079
 //
1079
 //
1080
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1080
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1081
 
1081
 
1082
 //
1082
 //
1083
 // G20/G21 Inch mode support
1083
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

1053
 //
1053
 //
1054
 // M100 Free Memory Watcher
1054
 // M100 Free Memory Watcher
1055
 //
1055
 //
1056
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1056
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1057
 
1057
 
1058
 //
1058
 //
1059
 // G20/G21 Inch mode support
1059
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

1053
 //
1053
 //
1054
 // M100 Free Memory Watcher
1054
 // M100 Free Memory Watcher
1055
 //
1055
 //
1056
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1056
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1057
 
1057
 
1058
 //
1058
 //
1059
 // G20/G21 Inch mode support
1059
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

1051
 //
1051
 //
1052
 // M100 Free Memory Watcher
1052
 // M100 Free Memory Watcher
1053
 //
1053
 //
1054
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1054
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1055
 
1055
 
1056
 //
1056
 //
1057
 // G20/G21 Inch mode support
1057
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/RigidBot/Configuration.h View File

1047
 //
1047
 //
1048
 // M100 Free Memory Watcher
1048
 // M100 Free Memory Watcher
1049
 //
1049
 //
1050
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1050
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1051
 
1051
 
1052
 //
1052
 //
1053
 // G20/G21 Inch mode support
1053
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/SCARA/Configuration.h View File

1061
 //
1061
 //
1062
 // M100 Free Memory Watcher
1062
 // M100 Free Memory Watcher
1063
 //
1063
 //
1064
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1064
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1065
 
1065
 
1066
 //
1066
 //
1067
 // G20/G21 Inch mode support
1067
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

1080
 //
1080
 //
1081
 // M100 Free Memory Watcher
1081
 // M100 Free Memory Watcher
1082
 //
1082
 //
1083
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1083
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1084
 
1084
 
1085
 //
1085
 //
1086
 // G20/G21 Inch mode support
1086
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

1105
 //
1105
 //
1106
 // M100 Free Memory Watcher
1106
 // M100 Free Memory Watcher
1107
 //
1107
 //
1108
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1108
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1109
 
1109
 
1110
 //
1110
 //
1111
 // G20/G21 Inch mode support
1111
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

1079
 //
1079
 //
1080
 // M100 Free Memory Watcher
1080
 // M100 Free Memory Watcher
1081
 //
1081
 //
1082
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1082
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1083
 
1083
 
1084
 //
1084
 //
1085
 // G20/G21 Inch mode support
1085
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

1049
 //
1049
 //
1050
 // M100 Free Memory Watcher
1050
 // M100 Free Memory Watcher
1051
 //
1051
 //
1052
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1052
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1053
 
1053
 
1054
 //
1054
 //
1055
 // G20/G21 Inch mode support
1055
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

1176
 //
1176
 //
1177
 // M100 Free Memory Watcher
1177
 // M100 Free Memory Watcher
1178
 //
1178
 //
1179
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1179
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1180
 
1180
 
1181
 //
1181
 //
1182
 // G20/G21 Inch mode support
1182
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

1170
 //
1170
 //
1171
 // M100 Free Memory Watcher
1171
 // M100 Free Memory Watcher
1172
 //
1172
 //
1173
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1173
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1174
 
1174
 
1175
 //
1175
 //
1176
 // G20/G21 Inch mode support
1176
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/generic/Configuration.h View File

1165
 //
1165
 //
1166
 // M100 Free Memory Watcher
1166
 // M100 Free Memory Watcher
1167
 //
1167
 //
1168
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1168
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1169
 
1169
 
1170
 //
1170
 //
1171
 // G20/G21 Inch mode support
1171
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

1168
 //
1168
 //
1169
 // M100 Free Memory Watcher
1169
 // M100 Free Memory Watcher
1170
 //
1170
 //
1171
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1171
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1172
 
1172
 
1173
 //
1173
 //
1174
 // G20/G21 Inch mode support
1174
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

1168
 //
1168
 //
1169
 // M100 Free Memory Watcher
1169
 // M100 Free Memory Watcher
1170
 //
1170
 //
1171
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1171
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1172
 
1172
 
1173
 //
1173
 //
1174
 // G20/G21 Inch mode support
1174
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

1177
 //
1177
 //
1178
 // M100 Free Memory Watcher
1178
 // M100 Free Memory Watcher
1179
 //
1179
 //
1180
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1180
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1181
 
1181
 
1182
 //
1182
 //
1183
 // G20/G21 Inch mode support
1183
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

1063
 //
1063
 //
1064
 // M100 Free Memory Watcher
1064
 // M100 Free Memory Watcher
1065
 //
1065
 //
1066
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1066
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1067
 
1067
 
1068
 //
1068
 //
1069
 // G20/G21 Inch mode support
1069
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/makibox/Configuration.h View File

1052
 //
1052
 //
1053
 // M100 Free Memory Watcher
1053
 // M100 Free Memory Watcher
1054
 //
1054
 //
1055
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1055
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1056
 
1056
 
1057
 //
1057
 //
1058
 // G20/G21 Inch mode support
1058
 // G20/G21 Inch mode support

+ 72
- 18
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

177
 #endif
177
 #endif
178
 
178
 
179
 /**
179
 /**
180
+ * Two separate X-carriages with extruders that connect to a moving part
181
+ * via a magnetic docking mechanism. Requires SOL1_PIN and SOL2_PIN.
182
+ */
183
+//#define PARKING_EXTRUDER
184
+#if ENABLED(PARKING_EXTRUDER)
185
+  #define PARKING_EXTRUDER_SOLENOIDS_INVERT           // If enabled, the solenoid is NOT magnetized with applied voltage
186
+  #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW  // LOW or HIGH pin signal energizes the coil
187
+  #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250        // Delay (ms) for magnetic field. No delay if 0 or not defined.
188
+  #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
189
+  #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
190
+  #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
191
+  #define HOTEND_OFFSET_Z { 0.0, 1.3 }                // Z-offsets of the two hotends. The first must be 0.
192
+#endif
193
+
194
+/**
180
  * "Mixing Extruder"
195
  * "Mixing Extruder"
181
  *   - Adds a new code, M165, to set the current mix factors.
196
  *   - Adds a new code, M165, to set the current mix factors.
182
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
197
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
186
  */
201
  */
187
 //#define MIXING_EXTRUDER
202
 //#define MIXING_EXTRUDER
188
 #if ENABLED(MIXING_EXTRUDER)
203
 #if ENABLED(MIXING_EXTRUDER)
189
-  #define MIXING_STEPPERS 3        // Number of steppers in your mixing extruder
204
+  #define MIXING_STEPPERS 2        // Number of steppers in your mixing extruder
190
   #define MIXING_VIRTUAL_TOOLS 16  // Use the Virtual Tool method with M163 and M164
205
   #define MIXING_VIRTUAL_TOOLS 16  // Use the Virtual Tool method with M163 and M164
191
   //#define DIRECT_MIXING_IN_G1    // Allow ABCDHI mix factors in G1 movement commands
206
   //#define DIRECT_MIXING_IN_G1    // Allow ABCDHI mix factors in G1 movement commands
192
 #endif
207
 #endif
543
 
558
 
544
 /**
559
 /**
545
  * Default Jerk (mm/s)
560
  * Default Jerk (mm/s)
546
- * Override with M205 X Y Z EM
561
+ * Override with M205 X Y Z E
547
  *
562
  *
548
  * "Jerk" specifies the minimum speed change that requires acceleration.
563
  * "Jerk" specifies the minimum speed change that requires acceleration.
549
  * When changing speed and direction, if the difference is less than the
564
  * When changing speed and direction, if the difference is less than the
596
  * Probe Type
611
  * Probe Type
597
  *
612
  *
598
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
613
  * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
599
- * You must activate one of these to use Auto Bed Leveling below.
614
+ * Activate one of these to use Auto Bed Leveling below.
600
  */
615
  */
601
 
616
 
602
 /**
617
 /**
627
 #endif
642
 #endif
628
 
643
 
629
 /**
644
 /**
630
- * Enable if probing seems unreliable. Heaters and/or fans - consistent with the
631
- * options selected below - will be disabled during probing so as to minimize
632
- * potential EM interference by quieting/silencing the source of the 'noise' (the change
633
- * in current flowing through the wires).  This is likely most useful to users of the
634
- * BLTouch probe, but may also help those with inductive or other probe types.
645
+ * Enable one or more of the following if probing seems unreliable.
646
+ * Heaters and/or fans can be disabled during probing to minimize electrical
647
+ * noise. A delay can also be added to allow noise and vibration to settle.
648
+ * These options are most useful for the BLTouch probe, but may also improve
649
+ * readings with inductive probes and piezo sensors.
635
  */
650
  */
636
 //#define PROBING_HEATERS_OFF       // Turn heaters off when probing
651
 //#define PROBING_HEATERS_OFF       // Turn heaters off when probing
637
 //#define PROBING_FANS_OFF          // Turn fans off when probing
652
 //#define PROBING_FANS_OFF          // Turn fans off when probing
653
+//#define DELAY_BEFORE_PROBING 200  // (ms) To prevent vibrations from triggering piezo sensors
638
 
654
 
639
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
655
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
640
 //#define SOLENOID_PROBE
656
 //#define SOLENOID_PROBE
935
   #define UBL_PROBE_PT_3_X 180
951
   #define UBL_PROBE_PT_3_X 180
936
   #define UBL_PROBE_PT_3_Y 20
952
   #define UBL_PROBE_PT_3_Y 20
937
 
953
 
938
-  #define UBL_G26_MESH_VALIDATION   // Enable G26 mesh validation
954
+  //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
939
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
955
   #define UBL_MESH_EDIT_MOVES_Z     // Sophisticated users prefer no movement of nozzle
940
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
956
   #define UBL_SAVE_ACTIVE_ON_M500   // Save the currently active mesh in the current slot on M500
941
 
957
 
964
   #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
980
   #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
965
 #endif
981
 #endif
966
 
982
 
983
+// Add a menu item to move between bed corners for manual bed adjustment
984
+//#define LEVEL_BED_CORNERS
985
+
967
 /**
986
 /**
968
  * Commands to execute at the end of G29 probing.
987
  * Commands to execute at the end of G29 probing.
969
  * Useful to retract or move the Z probe out of the way.
988
  * Useful to retract or move the Z probe out of the way.
1033
 //
1052
 //
1034
 // M100 Free Memory Watcher
1053
 // M100 Free Memory Watcher
1035
 //
1054
 //
1036
-#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1055
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1037
 
1056
 
1038
 //
1057
 //
1039
 // G20/G21 Inch mode support
1058
 // G20/G21 Inch mode support
1204
  *  - Click the controller to view the LCD menu
1223
  *  - Click the controller to view the LCD menu
1205
  *  - The LCD will display Japanese, Western, or Cyrillic text
1224
  *  - The LCD will display Japanese, Western, or Cyrillic text
1206
  *
1225
  *
1207
- * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language
1226
+ * See http://marlinfw.org/docs/development/lcd_language.html
1208
  *
1227
  *
1209
  * :['JAPANESE', 'WESTERN', 'CYRILLIC']
1228
  * :['JAPANESE', 'WESTERN', 'CYRILLIC']
1210
  */
1229
  */
1331
 //#define ULTIPANEL
1350
 //#define ULTIPANEL
1332
 
1351
 
1333
 //
1352
 //
1334
-// Cartesio UI
1335
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1336
-//
1337
-//#define CARTESIO_UI
1338
-
1339
-//
1340
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1353
 // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
1341
 // http://reprap.org/wiki/PanelOne
1354
 // http://reprap.org/wiki/PanelOne
1342
 //
1355
 //
1419
 //#define BQ_LCD_SMART_CONTROLLER
1432
 //#define BQ_LCD_SMART_CONTROLLER
1420
 
1433
 
1421
 //
1434
 //
1435
+// Cartesio UI
1436
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
1437
+//
1438
+//#define CARTESIO_UI
1439
+
1440
+//
1422
 // ANET_10 Controller supported displays.
1441
 // ANET_10 Controller supported displays.
1423
 //
1442
 //
1424
 //#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1443
 //#define ANET_KEYPAD_LCD         // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
1505
 //#define OLED_PANEL_TINYBOY2
1524
 //#define OLED_PANEL_TINYBOY2
1506
 
1525
 
1507
 //
1526
 //
1527
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
1528
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
1529
+//
1530
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
1531
+
1532
+//
1533
+// MKS MINI12864 with graphic controller and SD support
1534
+// http://reprap.org/wiki/MKS_MINI_12864
1535
+//
1536
+//#define MKS_MINI_12864
1537
+
1538
+//
1539
+// Factory display for Creality CR-10
1540
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
1541
+//
1542
+// This is RAMPS-compatible using a single 10-pin connector.
1543
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
1544
+//
1545
+//#define CR10_STOCKDISPLAY
1546
+
1547
+//
1548
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
1549
+// http://reprap.org/wiki/MKS_12864OLED
1550
+//
1551
+// Tiny, but very sharp OLED display
1552
+//
1553
+//#define MKS_12864OLED
1554
+
1555
+//
1508
 // AZSMZ 12864 LCD with SD
1556
 // AZSMZ 12864 LCD with SD
1509
 // https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
1557
 // https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
1510
 //
1558
 //
1566
  * Adds the M150 command to set the LED (or LED strip) color.
1614
  * Adds the M150 command to set the LED (or LED strip) color.
1567
  * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
1615
  * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
1568
  * luminance values can be set from 0 to 255.
1616
  * luminance values can be set from 0 to 255.
1617
+ * For Neopixel LED an overall brightness parameter is also available.
1569
  *
1618
  *
1570
  * *** CAUTION ***
1619
  * *** CAUTION ***
1571
  *  LED Strips require a MOFSET Chip between PWM lines and LEDs,
1620
  *  LED Strips require a MOFSET Chip between PWM lines and LEDs,
1572
  *  as the Arduino cannot handle the current the LEDs will require.
1621
  *  as the Arduino cannot handle the current the LEDs will require.
1573
  *  Failure to follow this precaution can destroy your Arduino!
1622
  *  Failure to follow this precaution can destroy your Arduino!
1623
+ *  NOTE: A separate 5V power supply is required! The Neopixel LED needs
1624
+ *  more current than the Arduino 5V linear regulator can produce. 
1574
  * *** CAUTION ***
1625
  * *** CAUTION ***
1575
  *
1626
  *
1627
+ * LED Type. Enable only one of the following two options.
1628
+ *
1576
  */
1629
  */
1630
+
1577
 //#define RGB_LED
1631
 //#define RGB_LED
1578
 //#define RGBW_LED
1632
 //#define RGBW_LED
1579
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1633
 #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
1626
 // Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
1680
 // Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
1627
 // 300ms is a good value but you can try less delay.
1681
 // 300ms is a good value but you can try less delay.
1628
 // If the servo can't reach the requested position, increase it.
1682
 // If the servo can't reach the requested position, increase it.
1629
-#define SERVO_DELAY 300
1683
+#define SERVO_DELAY { 300 }
1630
 
1684
 
1631
 // Servo deactivation
1685
 // Servo deactivation
1632
 //
1686
 //

+ 1
- 1
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

1044
 //
1044
 //
1045
 // M100 Free Memory Watcher
1045
 // M100 Free Memory Watcher
1046
 //
1046
 //
1047
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1047
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1048
 
1048
 
1049
 //
1049
 //
1050
 // G20/G21 Inch mode support
1050
 // G20/G21 Inch mode support

+ 1
- 1
Marlin/src/config/examples/wt150/Configuration.h View File

1054
 //
1054
 //
1055
 // M100 Free Memory Watcher
1055
 // M100 Free Memory Watcher
1056
 //
1056
 //
1057
-//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
1057
+//#define M100_FREE_MEMORY_WATCHER    // Add M100 (Free Memory Watcher) to debug memory usage
1058
 
1058
 
1059
 //
1059
 //
1060
 // G20/G21 Inch mode support
1060
 // G20/G21 Inch mode support

+ 4
- 0
Marlin/src/gcode/gcode.cpp View File

525
         case 280: M280(); break;  // M280: Set servo position absolute
525
         case 280: M280(); break;  // M280: Set servo position absolute
526
       #endif
526
       #endif
527
 
527
 
528
+      #if ENABLED(BABYSTEPPING)
529
+        case 290: M290(); break;  // M290: Babystepping
530
+      #endif
531
+
528
       #if HAS_BUZZER
532
       #if HAS_BUZZER
529
         case 300: M300(); break;  // M300: Play beep tone
533
         case 300: M300(); break;  // M300: Play beep tone
530
       #endif
534
       #endif

+ 5
- 0
Marlin/src/gcode/gcode.h View File

169
  * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
169
  * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
170
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
170
  * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
171
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
171
  * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
172
+ * M290 - Babystepping (Requires BABYSTEPPING)
172
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
173
  * M300 - Play beep sound S<frequency Hz> P<duration ms>
173
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
174
  * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
174
  * M302 - Allow cold extrudes, or set the minimum extrude S<temperature>. (Requires PREVENT_COLD_EXTRUSION)
175
  * M302 - Allow cold extrudes, or set the minimum extrude S<temperature>. (Requires PREVENT_COLD_EXTRUSION)
585
     static void M280();
586
     static void M280();
586
   #endif
587
   #endif
587
 
588
 
589
+  #if ENABLED(BABYSTEPPING)
590
+    static void M290();
591
+  #endif
592
+
588
   #if HAS_BUZZER
593
   #if HAS_BUZZER
589
     static void M300();
594
     static void M300();
590
   #endif
595
   #endif

+ 61
- 0
Marlin/src/gcode/motion/M290.cpp View File

1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#include "../../inc/MarlinConfig.h"
24
+
25
+#if ENABLED(BABYSTEPPING)
26
+
27
+#include "../gcode.h"
28
+#include "../../module/probe.h"
29
+#include "../../module/temperature.h"
30
+#include "../../module/planner.h"
31
+
32
+/**
33
+ * M290: Babystepping
34
+ */
35
+void GcodeSuite::M290() {
36
+  #if ENABLED(BABYSTEP_XY)
37
+    for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
38
+      if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
39
+        float offs = constrain(parser.value_axis_units(a), -2, 2);
40
+        #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
41
+          if (a == Z_AXIS) {
42
+            zprobe_zoffset += offs;
43
+            refresh_zprobe_zoffset(true); // 'true' to not babystep
44
+          }
45
+        #endif
46
+        thermalManager.babystep_axis(a, offs * planner.axis_steps_per_mm[a]);
47
+      }
48
+  #else
49
+    if (parser.seenval('Z') || parser.seenval('S')) {
50
+      float offs = constrain(parser.value_axis_units(Z_AXIS), -2, 2);
51
+      #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
52
+        zprobe_zoffset += offs;
53
+        refresh_zprobe_zoffset(); // This will babystep the axis
54
+      #else
55
+        thermalManager.babystep_axis(Z_AXIS, offs * planner.axis_steps_per_mm[Z_AXIS]);
56
+      #endif
57
+    }
58
+  #endif
59
+}
60
+
61
+#endif // BABYSTEPPING

+ 1
- 3
Marlin/src/inc/SanityCheck.h View File

353
  * Babystepping
353
  * Babystepping
354
  */
354
  */
355
 #if ENABLED(BABYSTEPPING)
355
 #if ENABLED(BABYSTEPPING)
356
-  #if DISABLED(ULTRA_LCD) && DISABLED(I2C_POSITION_ENCODERS)
357
-    #error "BABYSTEPPING requires an LCD controller."
358
-  #elif ENABLED(SCARA)
356
+  #if ENABLED(SCARA)
359
     #error "BABYSTEPPING is not implemented for SCARA yet."
357
     #error "BABYSTEPPING is not implemented for SCARA yet."
360
   #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
358
   #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
361
     #error "BABYSTEPPING only implemented for Z axis on deltabots."
359
     #error "BABYSTEPPING only implemented for Z axis on deltabots."

Loading…
Cancel
Save