3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 20:43:32 +00:00
Code Issues Releases Wiki Activity
8,661 Commits 20 Branches 80 Tags 1.8 GiB
355dfed437
Commit Graph

8661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GMagician
15be1cb9a9 [1.1.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (#8177) 
* [1.1.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour

NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed

* Update Marlin_main.cpp

* Update Marlin_main.cpp

* Update Marlin_main.cpp
 2017-10-30 22:50:50 -05:00
Scott Lahteine
4817c0d055
Merge pull request #8167 from thinkyhead/bf1_config_tweak 
[1.1.x] Kinematic clamp_to_software_endstops
 2017-10-30 19:20:45 -05:00
Scott Lahteine
893092ff7f Kinematic clamp_to_software_endstops 2017-10-30 16:24:45 -05:00
Scott Lahteine
8b7c1e9cec Fix for MAX_VFAT_ENTRIES sanity check 2017-10-30 16:24:45 -05:00
Scott Lahteine
393ceb28fc The plural of 'axis' is 'axes' 2017-10-30 14:49:51 -05:00
Scott Lahteine
d9cb7be444
Merge pull request #8160 from thinkyhead/bf1_fixup_sd_reprint 
[1.1.x] Simplify SD_REPRINT_LAST_SELECTED_FILE
 2017-10-29 23:57:44 -05:00
Scott Lahteine
5837f067cf Tweak to QUICK_HOME comment 2017-10-29 23:50:02 -05:00
Scott Lahteine
5e5a177934 No hacks needed for SD_REPRINT_LAST_SELECTED_FILE 2017-10-29 22:44:03 -05:00
Scott Lahteine
0b5b03d9dc Tweak for soft endstops 2017-10-29 20:16:22 -05:00
Scott Lahteine
9288d80613
Merge pull request #8156 from thinkyhead/bf1_anet_10_servo 
[1.1.x] Define a default SERVO0_PIN for Anet 1.0
 2017-10-29 19:53:49 -05:00
Scott Lahteine
6698db29de
Update LCD draw condition 2017-10-29 19:17:32 -05:00
Scott Lahteine
25e86a520d
Merge pull request #8114 from thinkyhead/bf1_print_sd_file_again 
[1.1.x] Cleanup for SD Print Again
 2017-10-29 19:09:34 -05:00
Scott Lahteine
a6f7cda23e
Merge pull request #8143 from thinkyhead/bf1_dual_xyz_endstops 
Followup to #8123 - to match 2.0.x changes
 2017-10-29 19:04:33 -05:00
Scott Lahteine
b0e282a74b Cleanups for SD_REPRINT_LAST_SELECTED_FILE 2017-10-29 19:02:17 -05:00
Scott Lahteine
46ed54cd8e Include time scale in some planner vars 2017-10-29 18:48:14 -05:00
Scott Lahteine
9c870baf84 Add a hidden 8s watchdog option for easier debugging 2017-10-29 18:34:57 -05:00
Scott Lahteine
21249f7c3d Add mfup to mfpub for safety 2017-10-29 18:34:57 -05:00
Scott Lahteine
471c2b5d5c Provide a default SERVO0_PIN for Anet 1.0 2017-10-29 18:34:57 -05:00
Scott Lahteine
e792c2b234 Followup to #8123 - to match 2.0.x changes 2017-10-29 05:39:44 -05:00
Scott Lahteine
daa85f71e1
Merge pull request #8123 from thinkyhead/bf1_dual_xyz_endstops 
[1.1.x] Dual endstops XYZ
 2017-10-29 04:36:09 -05:00
Rowan Meara
9850ba0cbd [1.1.x] Fix M303 thermal protection #8103 (#8126) 
* Fixed M303 thermal protection

The temperature sanity checking logic was not being applied during M303
(pid autotuning) because instead of setting a target temperature, it
directly manipulated the pwm values.  When PIDTEMP/PIDTEMPBED is
enabled, PWM values rather than the target temperature determine whether
the heater is on.  I changed this to look directly at the PWM amount
when pid is enabled.

* Turn off heaters on M303 error

Currently, PID autotuning stops if it overshoots the temperature by 20C
or if if the temperature does not change for 20 minutes and it times
out.  I added calls to disable the heaters in these scenarios.

* Removed unnecessary if statement.

Added changes suggested by GMagician.

* Update temperature.cpp

* Update temperature.cpp

* Update temperature.cpp
 2017-10-29 04:34:47 -05:00
Scott Lahteine
c0a8275cb0
Merge pull request #8137 from LVD-AC/(1.1.x)bug_G33 
(1.1.x) serious bug G33
 2017-10-29 04:11:54 -05:00
Scott Lahteine
318c419f77 Implement support for Dual X and Y endstops 2017-10-29 03:49:45 -05:00
Scott Lahteine
7e1232269a Add Dual Steppers / Endstops to configs 2017-10-29 03:49:45 -05:00
Scott Lahteine
62d52d62dc Cleanup for DIGIPOTS settings 2017-10-29 03:49:32 -05:00
LVD-AC
77cf42588f (1.1.x) serious bug G33 2017-10-29 00:22:55 +02:00
Scott Lahteine
50f6c645de Add scripts for .travis.yml to append config options 2017-10-27 19:59:01 -05:00
Scott Lahteine
7ade65d44b
Merge pull request #8128 from thinkyhead/bf1_revert_babystep_mult 
[1.1.x] Revert default BABYSTEP_MULTIPLICATOR to 1
 2017-10-27 19:55:11 -05:00
Scott Lahteine
a979c428ee Revert default BABYSTEP_MULTIPLICATOR to 1 2017-10-27 19:42:51 -05:00
jmdearras
6920769a9a Added MKS GEN L board (#8088) 
[1.1.x] Add MKS GEN L board
 2017-10-27 02:13:41 -05:00
Scott Lahteine
410aa0716d Concise SD_REPRINT_LAST_SELECTED_FILE description 2017-10-27 00:10:04 -05:00
Scott Lahteine
445a7f65cd Clean up trailing whitespace 2017-10-27 00:02:35 -05:00
Luc Van Daele
e64cfb13b8 (1.1.x) auto tune calibration parameters (#8031) 
* auto tune calibration parameters

* solve warnings

* Tweaks to formatting

* review Thinkyhead

* Error
 2017-10-26 23:49:20 -05:00
Scott Lahteine
e374d87ac4 Merge pull request #8112 from thinkyhead/bf1_fwretract_fix_oct26 
[1.1.x] Improved Firmware Retraction logic
 2017-10-26 23:06:27 -05:00
Scott Lahteine
2296d98845 Tweak neopixel self-test 2017-10-26 22:46:11 -05:00
Scott Lahteine
9aac3d8773 Add some Polish translations 
Thanks @SCiunczyk
 2017-10-26 22:44:23 -05:00
Scott Lahteine
6569b9ba56 Fix FWRETRACT logic, apply common sense 2017-10-26 22:36:41 -05:00
Bob-the-Kuhn
7ab9abe4ef Merge pull request #8107 from Bob-the-Kuhn/1.1.x-reduced-font-fix 
(bug fix) 1.1.x - save 1400 bytes of FLASH by using reduced font for some languages
 2017-10-26 16:09:52 -05:00
Bob-the-Kuhn
3357170b18 give this language an unique name 2017-10-26 15:48:00 -05:00
Roxy-3D
2e746f2b8b Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104) 
* Initial conflict resolution

All previous items resolved:
- Use of ELAPSED() on timer code
- Switch to use of defer_return_to_status=true as much as possible
- Update & Clean Up of Max7219 routines

* Resolve non-SD case in ultralcd.cpp
 2017-10-26 11:44:55 -05:00
Bob-the-Kuhn
594c075377 1.1.x - save 1400 bytes of FLASH by using reduced font for some languages (#8095) 
* use reduced sized font for some languages

* Fit Portuguese language files to existing scheme

* Rename language_pl-DOGM.h to language_pl_utf8.h

* Rename language_pl_utf8.h to language_pl-DOGM.h

* Update dogm_font_data_ISO10646_1.h

* Update dogm_font_data_ISO10646_1.h
 2017-10-25 18:32:38 -05:00
Scott Lahteine
8bb1e91afd More specific M100 description 2017-10-25 16:11:09 -05:00
Scott Lahteine
a12d1b21b5 Merge pull request #8048 from madmo/mks-mini-gt2560 
[1.1.x] Add MKS MINI 12864 support to GT2560
 2017-10-25 01:13:07 -05:00
Scott Lahteine
5bed2f351a Fix spacing, use single instances of similar pins 2017-10-24 19:12:40 -05:00
Scott Lahteine
209560fcd2 Merge pull request #8043 from thinkyhead/bf1_mesh_consolidate 
[1.1.x] Simplify mesh bounds config
 2017-10-24 18:56:54 -05:00
Scott Lahteine
ec9d7b639d Encourage users to re-examine their configs 2017-10-24 18:33:31 -05:00
Scott Lahteine
1c97c1582c Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h 2017-10-24 18:25:50 -05:00
Scott Lahteine
f06f4b40b8 Apply physical limits to mesh bounds 2017-10-24 16:49:00 -05:00
Scott Lahteine
3235beef6d Merge pull request #8073 from thinkyhead/bf1_fix_M600 
[1.1.x] Fix position sync in M600 pause/resume
 2017-10-24 14:56:01 -05:00
Scott Lahteine
e5ab783b08 Merge pull request #8061 from thinkyhead/bf1_general_cleanup 
[1.1.x] Patch up some verbiage in configs
 2017-10-24 14:44:31 -05:00