melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,221 Commits 2 Branches 0 Tags 2 GiB
65ca6472ba
Commit Graph

7221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
c15b9a6a06 No space after X: or A: in M114 output 2017-02-12 00:10:03 -06:00
Scott Lahteine
e1702816f6 Fix SD_CHECK_AND_RETRY condition 
Addressing #5806
 2017-02-11 23:55:56 -06:00
Scott Lahteine
c64ecf95e2 Merge pull request #5808 from thinkyhead/rc_delta_float_radius 
Cast DELTA_PRINTABLE_RADIUS to float in sq()
 2017-02-11 23:43:46 -06:00
Scott Lahteine
1bc5be3bdf Cast DELTA_PRINTABLE_RADIUS to float in sq() 
Addressing #5625
 2017-02-11 23:28:39 -06:00
Bob-the-Kuhn
0369f97ec1 guaranteed BLTouch detection 
To guarantee that the 5mS pulse from a BLTouch is recognized you need to
have the endstops.update() routine run twice in that 5mS period.

At 200 steps per mm, my system has problems  below a feedrate of 120 mm
per minute.

Two things were done to guarantee the two updates within 5mS:
1) In interrupt mode, a check was added to the temperature ISR.  If the
endstop interrupt flag/counter is active then it'll kick off the endstop
update routine every 1mS until the flag/counter is zero.  This
flag/counter is decremented by the temperature ISR AND by the stepper
ISR.

2) In poling mode, code was added to the stepper ISR that will make sure
the ISR runs about every 1.5mS.  The "extra" ISR runs only check the
endstops.  This was done by grabbing the intended ISR delay and, if it's
over 2.0mS, splitting the intended delay into multiple smaller delays.
The first delay can be up to 2.0mS, the next ones 1.5mS (as needed) and
the last no less than 0.5mS.

=========================================

BLTouch error state recovery

If BLTouch already active when deploying the probe then try to reset it
& clear the probe.

If that doesn't fix it then declare an error.

Also added BLTouch init routine to startup section
 2017-02-11 12:01:34 -06:00
Scott Lahteine
1e4d4e5915 Fix typo in language_uk 
Thanks to @pavlus for this one
 2017-02-10 15:34:31 -06:00
Scott Lahteine
7fe7a0c8be Merge pull request #5793 from thinkyhead/rc_adjust_probe_output 
Adjust probe_pt() terminal output to respect probe z-offset
 2017-02-09 23:05:02 -06:00
Scott Lahteine
633c253bc1 Merge pull request #5792 from thinkyhead/rc_default_dac_vals 
Default DAC values for RigidBoard V2
 2017-02-09 22:56:03 -06:00
Florian Heilmann
7bbc31704c Adjust probe_pt() terminal output to respect probe z-offset 2017-02-09 22:54:22 -06:00
Scott Lahteine
6dac1fe07e Merge pull request #5701 from tohara/RCBugFixCmake 
Updated CMakeLists
 2017-02-09 22:45:05 -06:00
Scott Lahteine
a245656db3 Merge pull request #5713 from gege2b/RCBF-French 
French translation : Added missing strings as well as missing accents
 2017-02-09 22:43:56 -06:00
jaysonkelly
713931338a Default DAC values for RigidBoard V2 2017-02-09 22:39:00 -06:00
Scott Lahteine
fb11e52cd2 Merge pull request #5787 from thinkyhead/rc_bob_pins_added 
pinsDebug for 644/1284 & USB646/1286 families
 2017-02-09 15:07:55 -06:00
Bob-the-Kuhn
ae706233a8 pinsDebug for 644/1284 & USB646/1286 families 
added conditional compilation for PWMs 1C & 3C

add Teensyduino compatibility

==========================================

changes per review - minor formatting changes

1) remove non-printable character at the end of line 687

2) split a really long comment into two lines

3) got rid of some trailing spaces

============================================

Made pinsDebug_Teensyduino.h the same between this PR and PR 5668 which
is for a re-written pinsDebug.h file.

The changes were:
1) added copyright @ GNU license header
2) a blank line crept in.
 2017-02-09 07:24:02 -06:00
Gege2B
22dfcc9a71 French translation : Added missing strings as well as missing accents 2017-01-17 23:29:23 +01:00
Tom Haraldseid
1d65b4b316 Updated CMakeLists 2017-01-15 13:39:26 +08:00
Scott Lahteine
9b5515926a Merge pull request #5696 from thinkyhead/rc_volumetric_default 
Allow enabling volumetric filament on config load
 2017-01-14 05:48:51 -08:00
Robert Kirk
0d147ead66 Allow enabling volumetric filament on config load 2017-01-14 04:37:49 -08:00
Scott Lahteine
d3cb1a86be Merge pull request #5691 from AnHardt/fix5677 
Fix M110 without leading N
 2017-01-14 03:22:26 -08:00
AnHardt
fa26767efe Replace all remaining 'boolean' with 'bool' 2017-01-13 13:03:52 +01:00
AnHardt
f6858d9974 Fix M110 without leading N 
Store N in the right variable.
This is too rarely used.

"mea culpa, mea culpa, mea maxima culpa"
 2017-01-13 12:33:50 +01:00
Scott Lahteine
0c0c840ba8 Merge pull request #5683 from emartinez167/EMartinez-Changes 
Updates to some incorrectly ended strings in the Spanish translation
 2017-01-12 07:49:15 -08:00
Scott Lahteine
738b87091a Merge pull request #5684 from Kaibob2/patch-6 
Update language_de.h
 2017-01-12 07:48:41 -08:00
Kai
25dae3bccc Update language_de.h 
Small corrections
 2017-01-12 16:06:58 +01:00
emartinez167
7292145f4e Fix for some wrong strings 
On last commit, some strings were ended with the incorrect character.
This fixes it.
 2017-01-12 22:35:04 +08:00
emartinez167
3dee35888e Merge remote-tracking branch 'MarlinFirmware/RCBugFix' into EMartinez-Changes 2017-01-12 22:22:52 +08:00
Scott Lahteine
93a9aa6b76 Merge pull request #5682 from thinkyhead/rc_spanish_jan 
Updates to Spanish language
 2017-01-12 06:14:10 -08:00
Scott Lahteine
7a9c1a279b Merge pull request #5681 from thinkyhead/rc_prevent_boot_loop 
Reset watchdog in SD init to prevent reboot
 2017-01-12 06:13:56 -08:00
Scott Lahteine
e409c7f9e8 Merge pull request #5645 from esenapaj/From-microseconds-to-milliseconds 
From "microseconds" to "milliseconds"
 2017-01-12 06:02:55 -08:00
emartinez167
020c6af7b0 Updates to Spanish language 
Add missing Spanish language definitions.
 2017-01-12 05:53:39 -08:00
Hans Raaf
d29cc8f7bc Reset watchdog in SD init to prevent reboot 
If the watchdog is enabled and bootscreen + SD card checks take too long, Marlin may hang at boot time because of the reset loop. We have this happen all the time with the Anet board if no SD card is inserted.
 2017-01-12 05:33:38 -08:00
Scott Lahteine
7743849608 Merge pull request #5680 from thinkyhead/rc_configs_puhlease 
code_value_float tweak
 2017-01-12 05:22:47 -08:00
Scott Lahteine
16357fbfdf Merge pull request #5619 from Ocarthon/RCBugFix 
Disable SD Detect for K8400
 2017-01-12 05:22:03 -08:00
Scott Lahteine
e57c0fce66 Move MOSFET changes above #include for RIGIDBOARD 
Correction to #5629
 2017-01-12 04:46:49 -08:00
Scott Lahteine
c376f6a2cb code_value_float tweak 2017-01-12 04:38:09 -08:00
Scott Lahteine
fb3c30e24c Fix lcd_wait_for_homing causing menu to block 
As a showcase function for how to do waiting in the lcd menu, this function should be preserved.
 2017-01-12 04:37:23 -08:00
Scott Lahteine
f8ae0fd29f Merge pull request #5647 from manianac/RCBugFix-PrepareMenuFix 
Fix empty Prepare menu
 2017-01-12 04:20:18 -08:00
Robert Kirk
aab5118c6a Remove error causing break command 
Use index macro instead of e
 2017-01-01 17:47:01 -05:00
esenapaj
d38e335272 From "microseconds" to "milliseconds" 
delay() is milliseconds
 2017-01-02 01:19:33 +09:00
Scott Lahteine
34d5eb5201 Merge pull request #5589 from thinkyhead/rc_configs_puhlease 
Better sanity check for FILAMENT_CHANGE_FEATURE, FILAMENT_RUNOUT_SCRIPT
 2016-12-30 04:56:30 -08:00
emartinez167
a2fe24f319 Fix some errors and update a message 2016-12-29 23:34:42 +08:00
Philip Standt
8ae2bc7e2e Disable SD Detect for K8400 2016-12-28 23:21:18 +01:00
emartinez167
0844da794d Updates to Spanish language 
Add missing Spanish language definitions.
 2016-12-24 22:11:14 +08:00
Scott Lahteine
4061fca1ad Sanity checks for FILAMENT_CHANGE_FEATURE and FILAMENT_RUNOUT_SCRIPT 2016-12-23 19:55:12 -08:00
Scott Lahteine
5ab7b91615 Comment on filament runout sensor config 2016-12-23 19:50:27 -08:00
Scott Lahteine
922c67f17d Merge pull request #5588 from thinkyhead/rc_remove_biv25 
Drop biv2.5 delta configurations
 2016-12-23 19:14:50 -08:00
Scott Lahteine
78459d5de1 Merge pull request #5587 from thinkyhead/rc_never 
Define ADV_NEVER, ADV_RATE
 2016-12-23 19:00:57 -08:00
Scott Lahteine
8c6c048551 drop biv2.5 delta configurations 2016-12-23 18:56:07 -08:00
Scott Lahteine
92dbeebf40 Define ADV_NEVER, ADV_RATE 2016-12-23 18:43:23 -08:00
Scott Lahteine
71378f72af Merge pull request #5577 from manianac/RCBugFix-M600Dryrun 
Allow M600 when dryrun debugging
 2016-12-22 19:07:05 -08:00