melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,273 Commits 2 Branches 0 Tags 2 GiB
3b9e0c3dde
Commit Graph

15273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Lahteine
6880e93b75 Happy configs 2014-12-18 14:02:47 -08:00
Scott Lahteine
61d8e40712 Merge branch 'board_defines' of https://github.com/thinkyhead/Marlin into board_defines 2014-12-18 13:59:39 -08:00
Scott Lahteine
3b1f186c0c Clean up configs 2014-12-18 13:59:31 -08:00
Scott Lahteine
f83d0f2a68 Defines for electronics boards 
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
 2014-12-18 13:59:31 -08:00
Bo Herrmannsen
bd25e7393b Merge pull request #1192 from thinkyhead/split_language 
Split up languages.h. Use ISO language codes.
 2014-12-18 22:26:55 +01:00
Scott Lahteine
d201fe74c6 Clean up configs 2014-12-18 12:07:26 -08:00
Scott Lahteine
0e23105e1e Defines for electronics boards 
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
 2014-12-18 12:02:36 -08:00
Bo Herrmannsen
72da53c613 Merge pull request #1194 from boelle/Marlin_v1 
Added example configs for printers from http://tvrrug.org.uk/
 2014-12-18 20:41:48 +01:00
Bo Herrmannsen
174f8d3631 Added example configs for printers from http://tvrrug.org.uk/ 2014-12-18 20:34:24 +01:00
Scott Lahteine
e970461adb Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
Scott Lahteine
0c06e97e98 Split up languages.h, use ISO codes 
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
 2014-12-18 09:31:19 -08:00
Bo Herrmannsen
a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink 
Shrink and Optimize
 2014-12-18 17:23:11 +01:00
Bo Herrmannsen
842da54e68 Merge pull request #1187 from thinkyhead/fix_constants 
A few constants where they belong
 2014-12-18 17:21:46 +01:00
Scott Lahteine
07c6b5ab71 Using axis constants 2014-12-18 08:13:08 -08:00
Scott Lahteine
1857e611d3 Other small tweaks 2014-12-18 07:49:16 -08:00
Scott Lahteine
63e1665fa9 Reduce ultralcd.cpp redundancies 2014-12-18 07:30:05 -08:00
Scott Lahteine
e69313fc2b Reduce dogm lcd code 2014-12-18 07:03:40 -08:00
Bo Herrmannsen
bd22405412 Merge pull request #1190 from thinkyhead/sd_sorting 
Wrap call to flush_presort
 2014-12-18 12:50:55 +01:00
Scott Lahteine
49791949af Wrap call to flush_presort 2014-12-18 03:47:12 -08:00
Bo Herrmannsen
140ce06692 Merge pull request #1188 from thinkyhead/lcd_longname 
LCD Long Filename
 2014-12-18 09:59:18 +01:00
Scott Lahteine
28c3ad291a Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem 2014-12-17 23:27:21 -08:00