1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Commit Graph

1871 Commits

Author SHA1 Message Date
Bernhard Kubicek
f24c5d82e3 Update Marlin_main.cpp
fixed minor typo
2014-12-29 17:17:30 +01:00
Bernhard Kubicek
053b541de8 Merge pull request #1265 from Wurstnase/Development
Expand manage_inactivity #1264
2014-12-29 17:14:35 +01:00
Wurstnase
8a6f098cc6 Expand manage_inactivity #1264
void manage_inactivity(bool ignore_stepper_queue=false)

standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
2014-12-29 17:07:22 +01:00
Bernhard Kubicek
78167ce439 Merge pull request #1264 from Wurstnase/Development
change filament issue
2014-12-29 16:48:18 +01:00
Wurstnase
d1995aec7a Rename ignore_blocks_queued
more speaking name
2014-12-29 16:47:08 +01:00
Wurstnase
4122de9d17 change filament issue
make a more general solution
2014-12-29 16:31:00 +01:00
wgm4321
d60efc3b5d Fix syntax error caused by previous changes. 2014-12-28 20:47:59 -05:00
wgm4321
cb12161191 Add Filament menu and add Filament/Retract settings to config store. 2014-12-28 20:43:14 -05:00
Bo Herrmannsen
c1df713e4d Merge pull request #1258 from fmalpartida/Development
Merge branch 'SAV-MkI_merge' into Development
2014-12-28 19:56:32 +01:00
fmalpartida
ec33df0554 Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
2014-12-28 19:54:06 +01:00
Bo Herrmannsen
a5ed3e96f2 Update README.md 2014-12-28 18:26:16 +01:00
Bo Herrmannsen
60959f196f Delete .gitignore 2014-12-28 18:25:33 +01:00
Bo Herrmannsen
95429a4108 Delete .travis.yml 2014-12-28 18:25:27 +01:00
Bo Herrmannsen
a0959366af Update README.md 2014-12-28 17:59:18 +01:00
Bo Herrmannsen
b2000b7055 Merge pull request #1255 from mattsch/503_fwretract_dev_branch
503 fwretract dev branch
2014-12-28 17:52:18 +01:00
Matthew Schick
0468f81950 Update for pull request #837 2014-12-28 11:22:44 -05:00
Matthew Schick
6e42c9e305 Add fwretract settings to M503 output 2014-12-28 11:22:44 -05:00
Bo Herrmannsen
0504c02153 Update README.md 2014-12-28 16:34:38 +01:00
alexborro
3afe66bb0c Fix issues #1248, #1240
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
2014-12-28 13:27:39 -02:00
Bo Herrmannsen
73b7b08f2c Merge pull request #1253 from lobermann/Development_AutoLevelOffset
Consider negative Z Offsets when auto bed leveling is active
2014-12-28 12:52:16 +01:00
Lukas Obermann
9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active 2014-12-28 12:46:35 +01:00
Bo Herrmannsen
c9f60183a9 Merge pull request #1233 from NarimaanV/Development
Fixed BABYSTEPPING feature
2014-12-28 10:13:21 +01:00
Bo Herrmannsen
0d957872a0 Merge pull request #1234 from gregrebholz/issue_1069
Fixes #1069.  Added "auto fan" checks to PID_autotune.
2014-12-28 10:12:08 +01:00
Bo Herrmannsen
9c07d28bd6 Merge pull request #1249 from drf5n/PID_CI_v2
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
2014-12-28 10:09:25 +01:00
Bo Herrmannsen
23e768dffa Merge pull request #1250 from chertykov/Development
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
2014-12-28 10:09:08 +01:00
Bo Herrmannsen
f7ffd53bac Merge pull request #1251 from thinkyhead/progress_bar
LCD Progress Bar
2014-12-28 10:08:49 +01:00
Scott Lahteine
2f467e2797 LCD Progress Bar 2014-12-27 22:26:14 -08:00
Denis Chertykov
050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp 2014-12-28 09:09:42 +03:00
David Forrest
cf52c48d19 Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX.
Current defaults are all 255.  If it makes sense to reduce them, they should come down together, and
be in a  PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
2014-12-27 15:26:09 -05:00
David Forrest
984177c40c temperature.cpp:Add PID Conditional integration on heated bed. 2014-12-27 15:26:09 -05:00
David Forrest
c9b8435749 heater.c: Limit PID I term with conditional integration. 2014-12-27 15:26:09 -05:00
Bo Herrmannsen
f00a202246 Update README.md 2014-12-27 11:33:25 +01:00
Bo Herrmannsen
6efc4f3abf Merge pull request #1239 from ErikZalm/Marlin_v1
getting even with v1
2014-12-26 14:32:15 +01:00
Bo Herrmannsen
45336bb6c0 Update README.md 2014-12-26 11:29:29 +01:00
Bo Herrmannsen
5f555140be Update README.md 2014-12-24 13:18:29 +01:00
Greg Rebholz
7ecb7cbd46 Added "auto fan" checks to PID_autotune 2014-12-23 23:50:00 -05:00
NarimaanV
7667949aca Fixed BABYSTEPPING feature
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
2014-12-23 12:49:54 -05:00
Bo Herrmannsen
529c937943 Merge pull request #1230 from thinkyhead/readme_tweak
Clarification and markdown for boelle notes
2014-12-23 13:18:32 +01:00
Scott Lahteine
7250ec4337 Some clarification and markdown for boelle notes 2014-12-23 04:05:47 -08:00
Bo Herrmannsen
f05225a271 Update README.md 2014-12-23 11:37:08 +01:00
Scott Lahteine
d080027ff4 ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
2014-12-22 17:11:35 -08:00
Scott Lahteine
bdf2c94bff Least stack-usage self-contained ftostr32np()
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
2014-12-22 17:07:37 -08:00
Scott Lahteine
e83ecec809 As it should be 2014-12-22 17:04:22 -08:00
Scott Lahteine
f80a602783 Least stack-usage self-contained ftostr32np()
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
2014-12-22 17:04:00 -08:00
Scott Lahteine
f390b3f314 Patch to make Z look more like X and Y on UltraLCD 2014-12-22 17:03:59 -08:00
Caleb Anderson
d254651146 Fix spacing 2014-12-21 19:57:41 -07:00
Caleb Anderson
7db943b147 Language change implementation revamped. Didn't work as intended with Arduino IDE. 2014-12-21 14:45:34 -07:00
Bo Herrmannsen
fe8d8beb7a Merge pull request #1216 from ErikZalm/Marlin-v1-stable
Merge pull request #1213 from ErikZalm/Marlin_v1
2014-12-21 15:11:40 +01:00
Bo Herrmannsen
5f36ed2c4c Merge pull request #1215 from ErikZalm/Marlin-v1-bug-fixing
Merge pull request #1214 from ErikZalm/Marlin_v1
2014-12-21 15:11:21 +01:00
Bo Herrmannsen
af7fbcc026 Merge pull request #1213 from ErikZalm/Marlin_v1
added note about stale branches
2014-12-21 15:10:03 +01:00