zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1694 commits 1 branch 0 tags 156 MiB
Commit graph

1694 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Bo Herrmannsen 203df3533d Merge pull request #1214 from ErikZalm/Marlin_v1 
added note about stale branches
 2014-12-21 15:09:51 +01:00
Bo Herrmannsen b792b74036 added note about stale branches 2014-12-21 15:05:41 +01:00
Bo Herrmannsen dc64175d77 Update README.md 2014-12-21 13:42:11 +01:00
alexborro a8d8ef7534 Merge pull request #1208 from ErikZalm/revert-1199-Marlin_v1 
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
 2014-12-21 10:08:26 -02:00
alexborro d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" 2014-12-21 10:06:05 -02:00
Bo Herrmannsen 60628864ca Merge pull request #1167 from thinkyhead/sd_freemem 
Use SdFatUtil::FreeRam() for freeMemory() if there
 2014-12-20 18:31:21 +01:00
Bo Herrmannsen 889d7ba218 Merge pull request #1177 from martin-pr/probing_z_speed 
Split do_blocking_move() to XY and Z sections
 2014-12-20 18:30:35 +01:00
Bo Herrmannsen 5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1 
Fix syntax errors in #ifdef
 2014-12-20 18:29:39 +01:00
Bo Herrmannsen 1e865e5df7 Merge pull request #1199 from ei8htohms/Marlin_v1 
Change Auto_Bed_Leveling to Auto_Bed_Compensation
 2014-12-20 18:29:28 +01:00
Denis Chertykov b086394178 Fix syntax errors in #ifdef. 2014-12-20 19:33:43 +03:00
John Davis 39d28a9bbf Update qr_solve.h 
Changed level to compensation
 2014-12-19 17:53:55 -05:00
John Davis 6325968a39 Update qr_solve.cpp 
Changed leveling to compensation
 2014-12-19 17:52:13 -05:00
John Davis e99f24ff2f Update planner.h 
Changed level and leveling to compensation.
 2014-12-19 17:51:14 -05:00
John Davis ac204028e7 Update planner.cpp 
Changed level and leveling to compensation
 2014-12-19 17:49:22 -05:00
John Davis 4315c2547a Update Marlin_main.cpp 
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
 2014-12-19 17:41:29 -05:00
John Davis f21c65918f Update Servo.h 
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
 2014-12-19 17:20:09 -05:00
John Davis 58c4473bea Update Servo.cpp 
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
 2014-12-19 17:18:55 -05:00
John Davis 825c46024d Update vector_3.cpp 
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
 2014-12-19 17:16:31 -05:00
John Davis cfe80e1def Update vector_3.h 2014-12-19 17:14:35 -05:00
John Davis 7464d3c96a Update ConfigurationStore.cpp 
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
 2014-12-19 17:08:43 -05:00
John Davis 81568c3c6d Update Configuration.h 
Changed Auto Bed Level to Auto Bed Compensation
 2014-12-19 17:06:56 -05:00
John Davis 4ebeb14026 Update README.md 
Changed "Bed Auto Level" (and variants) to "Auto Bed Compensation".
 2014-12-19 17:01:49 -05:00
Bo Herrmannsen 03e489aaad Merge pull request #1197 from foosel/fix/issue_1147 
Fixes commands not being acknowledged in the same order they are received in
 2014-12-19 14:39:05 +01:00
Gina Häußge acc0e75279 Fixes commands not being acknowledged in the same order they are received 
in

G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.

This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.

Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.

Fixes ErikZalm/Marlin#1147
 2014-12-19 14:20:36 +01:00
daid a5c059dcf5 Merge branch 'revert-1154-sd_sorting' into Marlin_v1 2014-12-18 23:14:15 +01:00
daid 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting 
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
 2014-12-18 23:13:50 +01:00
Bo Herrmannsen 7458bfe297 Merge pull request #1195 from thinkyhead/board_defines 
Defines for electronics boards
 2014-12-18 23:06:47 +01:00