thomas
/
marlin
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Merge pull request #5762 from Bob-the-Kuhn/Z_DUAL_ENDSTOP-make-offset-a-configuration-item 

Z_DUAL_ENDSTOPS -  make offset a configuration item
Bob-the-Kuhn 8 лет назад
Родитель
3b6333c613 62cbaa302e
Сommit
f87012a063
19 измененных файлов: 23 добавлений и 1 удалений
Единый вид Показать статистику Diff
  1. 1
    0
      Marlin/Configuration_adv.h
  2. 5
    1
      Marlin/configuration_store.cpp
  3. 1
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  4. 1
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  5. 1
    0
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  6. 1
    0
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  7. 1
    0
      Marlin/example_configurations/K8200/Configuration_adv.h
  8. 1
    0
      Marlin/example_configurations/K8400/Configuration_adv.h
  9. 1
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  10. 1
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  11. 1
    0
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  12. 1
    0
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  13. 1
    0
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h
  14. 1
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  15. 1
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  16. 1
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  17. 1
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  18. 1
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  19. 1
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h

+ 1
- 0
Marlin/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine/test this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 5
- 1
Marlin/configuration_store.cpp Просмотреть файл

963 
     COPY(delta_diagonal_rod_trim, drt);
 963 
     COPY(delta_diagonal_rod_trim, drt);
964 
     COPY(delta_tower_angle_trim, dta);
 964 
     COPY(delta_tower_angle_trim, dta);
965 
   #elif ENABLED(Z_DUAL_ENDSTOPS)
 965 
   #elif ENABLED(Z_DUAL_ENDSTOPS)
966 
-    z_endstop_adj = 0;
966 
+    #if defined(Z_DUAL_ENDSTOPS_ADJUSTMENT)
967 
+      float z_endstop_adj = Z_DUAL_ENDSTOPS_ADJUSTMENT;
968 
+    #else
969 
+      float z_endstop_adj = 0;
970 
+    #endif
967 
   #endif
 971 
   #endif
968
972
969 
   #if ENABLED(ULTIPANEL)
 973 
   #if ENABLED(ULTIPANEL)

+ 1
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/Felix/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/K8200/Configuration_adv.h Просмотреть файл

298
298
299 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 299 
   #if ENABLED(Z_DUAL_ENDSTOPS)
300 
     #define Z2_USE_ENDSTOP _XMAX_
 300 
     #define Z2_USE_ENDSTOP _XMAX_
301 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
301 
   #endif
 302 
   #endif
302
303
303 
 #endif // Z_DUAL_STEPPER_DRIVERS
 304 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/K8400/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h Просмотреть файл

293
293
294 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 294 
   #if ENABLED(Z_DUAL_ENDSTOPS)
295 
     #define Z2_USE_ENDSTOP _XMAX_
 295 
     #define Z2_USE_ENDSTOP _XMAX_
296 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
296 
   #endif
 297 
   #endif
297
298
298 
 #endif // Z_DUAL_STEPPER_DRIVERS
 299 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Просмотреть файл

290
290
291 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 291 
   #if ENABLED(Z_DUAL_ENDSTOPS)
292 
     #define Z2_USE_ENDSTOP _XMAX_
 292 
     #define Z2_USE_ENDSTOP _XMAX_
293 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
293 
   #endif
 294 
   #endif
294
295
295 
 #endif // Z_DUAL_STEPPER_DRIVERS
 296 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/makibox/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

+ 1
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Просмотреть файл

285
285
286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
 286 
   #if ENABLED(Z_DUAL_ENDSTOPS)
287 
     #define Z2_USE_ENDSTOP _XMAX_
 287 
     #define Z2_USE_ENDSTOP _XMAX_
288 
+    #define Z_DUAL_ENDSTOPS_ADJUSTMENT  0  // use M666 command to determine this value
288 
   #endif
 289 
   #endif
289
290
290 
 #endif // Z_DUAL_STEPPER_DRIVERS
 291 
 #endif // Z_DUAL_STEPPER_DRIVERS

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить