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
Scott Lahteine
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-17 23:26:52 -08:00
Scott Lahteine
f21cce0b28
Rebase to Marlin_v1
2014-12-17 23:07:36 -08:00
Scott Lahteine
39b47ef5b0
Merge branch 'fix_constants' of https://github.com/thinkyhead/Marlin into fix_constants
...
Conflicts:
Marlin/cardreader.h
2014-12-17 23:02:23 -08:00
Scott Lahteine
e4b98011cf
And one more...
2014-12-17 23:01:24 -08:00
Scott Lahteine
60598b4cdd
A few constants where they belong
2014-12-17 23:01:24 -08:00
Scott Lahteine
f074706d2e
And one more...
2014-12-17 20:29:34 -08:00
Scott Lahteine
b726511a3b
A few constants where they belong
2014-12-17 20:22:33 -08:00
Bo Herrmannsen
4d61287807
Merge pull request #1186 from boelle/Marlin_v1
...
adding hardware files for OMC
2014-12-17 23:28:30 +01:00
Bo Herrmannsen
b17b8583af
adding hardware files for OMC
...
for ide 1.0.6
2014-12-17 23:01:30 +01:00
Bo Herrmannsen
280504e2e0
Merge pull request #908 from alromh87/Marlin_v1
...
Support for Gen3 Monolithic electronics
2014-12-17 22:28:07 +01:00
Bo Herrmannsen
341c7d080d
Merge pull request #996 from cbane/arduino-1.5
...
Add Arduino add-ons for Arduino 1.5
2014-12-17 21:46:18 +01:00
Bo Herrmannsen
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
2014-12-17 21:42:53 +01:00
Bo Herrmannsen
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
2014-12-17 21:30:19 +01:00
Bo Herrmannsen
3ac8bd8de7
Merge pull request #1013 from mattrobbo10/Marlin_v1
...
Proposing adding gen7-dist from gen7 electronics repo - marlin now compiles for gen7
2014-12-17 21:21:18 +01:00
Bo Herrmannsen
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
2014-12-17 20:58:01 +01:00
Bo Herrmannsen
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
2014-12-17 20:38:30 +01:00
Bo Herrmannsen
00f279376f
Merge pull request #1173 from boelle/Marlin_v1
...
Adding Melzi board
2014-12-17 20:21:05 +01:00
alexborro
ab355a90d3
Revert "SD Sort and Buffer"
2014-12-17 14:50:59 -02:00
alexborro
4297bcc89f
Merge pull request #1154 from thinkyhead/sd_sorting
...
SD Sort and Buffer
2014-12-16 10:17:13 -02:00
Scott Lahteine
d088b5f30f
Remove debug echo
2014-12-13 06:33:12 -08:00
