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,776 Commits 20 Branches 80 Tags 1.8 GiB
fd50f452ff
Commit Graph

8776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
87d3a1ae4d
Merge pull request #8228 from tcm0116/1.0.x-dual_stepper 
[1.1.x] Fix automatic stepper assignment for X/Y/Z dual stepper drivers
 2017-11-03 03:08:43 -05:00
Scott Lahteine
5289c4135a
Merge pull request #8230 from AnHardt/1.1_watchdog 
[1.1] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
 2017-11-03 03:06:45 -05:00
AnHardt
dcd7949544 Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR 2017-11-03 04:45:13 +01:00
Thomas Moore
277eb16d67 Fix automatic stepper assignment for X/Y/Z dual stepper drivers 2017-11-02 18:50:25 -05:00
Scott Lahteine
41ba4e507e
Merge pull request #8216 from jmdearras/bugfix-1.1.x 
Restore MKS_GEN_L
 2017-11-02 16:58:27 -05:00
jmdearras
c9980c0a5c Restore MKS_GEN_L 
Removed by accident, I presume, when the file was cleaned up
 2017-11-02 12:14:54 -04:00
jmdearras
3e9504d306 Fix case light "off" function (#8205) 
* Fix case light "off" function

It would only turn the light off if brightness was 255

* Update Marlin_main.cpp
 2017-11-01 21:17:23 -05:00
Scott Lahteine
1b68ee82ce
Merge pull request #8196 from thinkyhead/bf1_asterisk_not_special 
[1.1.x] Allow asterisks in G-Code commands
 2017-10-31 21:53:26 -05:00
Scott Lahteine
4bf0e15653 Allow asterisks in G-Code commands 
Addressing #6655
 2017-10-31 21:14:56 -05:00
Scott Lahteine
b63a55666d
Merge pull request #8193 from thinkyhead/bf1_silver_gate 
[1.1.x] Support for SilverGate Board
 2017-10-31 16:25:46 -05:00
Scott Lahteine
f02ca2a9a3 Organize boards.h by architecture 2017-10-31 16:12:07 -05:00
Scott Lahteine
4fb3ce4739 Support for SilverGate Board 2017-10-31 15:26:27 -05:00
Scott Lahteine
704640bf98 Faster menu navigation for Anet A8 
Addressing #8166
 2017-10-31 14:44:48 -05:00
Scott Lahteine
b48a77c88a
Merge pull request #8182 from thinkyhead/bf1_fix_bootscreen_repeat 
[1.1.x] Only show custom bootscreen once
 2017-10-31 02:37:24 -05:00
Scott Lahteine
db6de76acb Only show custom bootscreen once 2017-10-31 01:52:35 -05:00
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