Commit Graph

8844 Commits

Author SHA1 Message Date
60628864ca Merge pull request #1167 from thinkyhead/sd_freemem
Use SdFatUtil::FreeRam() for freeMemory() if there
2014-12-20 18:31:21 +01:00
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
5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1
Fix syntax errors in #ifdef
2014-12-20 18:29:39 +01:00
b086394178 Fix syntax errors in #ifdef. 2014-12-20 19:33:43 +03:00
39d28a9bbf Update qr_solve.h
Changed level to compensation
2014-12-19 17:53:55 -05:00
6325968a39 Update qr_solve.cpp
Changed leveling to compensation
2014-12-19 17:52:13 -05:00
e99f24ff2f Update planner.h
Changed level and leveling to compensation.
2014-12-19 17:51:14 -05:00
ac204028e7 Update planner.cpp
Changed level and leveling to compensation
2014-12-19 17:49:22 -05:00
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
f21c65918f Update Servo.h
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
2014-12-19 17:20:09 -05:00
58c4473bea Update Servo.cpp
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
2014-12-19 17:18:55 -05:00
825c46024d Update vector_3.cpp
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
2014-12-19 17:16:31 -05:00
cfe80e1def Update vector_3.h 2014-12-19 17:14:35 -05:00
7464d3c96a Update ConfigurationStore.cpp
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
2014-12-19 17:08:43 -05:00
81568c3c6d Update Configuration.h
Changed Auto Bed Level to Auto Bed Compensation
2014-12-19 17:06:56 -05:00
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
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
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
6880e93b75 Happy configs 2014-12-18 14:02:47 -08:00
3b1f186c0c Clean up configs 2014-12-18 13:59:31 -08:00
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
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
174f8d3631 Added example configs for printers from http://tvrrug.org.uk/ 2014-12-18 20:34:24 +01:00
e970461adb Clean up, move unused to the bottom, add headings 2014-12-18 10:33:00 -08:00
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
a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink
Shrink and Optimize
2014-12-18 17:23:11 +01:00
842da54e68 Merge pull request #1187 from thinkyhead/fix_constants
A few constants where they belong
2014-12-18 17:21:46 +01:00
07c6b5ab71 Using axis constants 2014-12-18 08:13:08 -08:00
1857e611d3 Other small tweaks 2014-12-18 07:49:16 -08:00
63e1665fa9 Reduce ultralcd.cpp redundancies 2014-12-18 07:30:05 -08:00
e69313fc2b Reduce dogm lcd code 2014-12-18 07:03:40 -08:00
bd22405412 Merge pull request #1190 from thinkyhead/sd_sorting
Wrap call to flush_presort
2014-12-18 12:50:55 +01:00
49791949af Wrap call to flush_presort 2014-12-18 03:47:12 -08:00
0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there 2014-12-17 23:26:52 -08:00
f21cce0b28 Rebase to Marlin_v1 2014-12-17 23:07:36 -08:00
e4b98011cf And one more... 2014-12-17 23:01:24 -08:00
60598b4cdd A few constants where they belong 2014-12-17 23:01:24 -08:00
280504e2e0 Merge pull request #908 from alromh87/Marlin_v1
Support for Gen3 Monolithic electronics
2014-12-17 22:28:07 +01:00
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
e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message
LCD "Abort" Message
2014-12-17 21:30:19 +01:00
0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu
Negative values in menu
2014-12-17 20:58:01 +01:00
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
ab355a90d3 Revert "SD Sort and Buffer" 2014-12-17 14:50:59 -02:00
d088b5f30f Remove debug echo 2014-12-13 06:33:12 -08:00
1fad8e6a81 Proper long file name var 2014-12-13 06:17:00 -08:00
29e854c535 Disable SDCARD_SORT_ALPHA by default
For legacy boards it’s better if this option is disabled.
2014-12-13 06:12:34 -08:00
6599adc184 Polish up a little... 2014-12-13 06:12:34 -08:00
a12eec33e2 Completed SORT_USES_MORE_RAM implementation
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
2014-12-13 06:12:34 -08:00
c9486ebb85 Improvements, more SORT_USES_MORE_RAM
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
2014-12-13 06:12:33 -08:00
b6ffea612a Expand on More RAM concept, address minor bugs 2014-12-13 06:10:44 -08:00