Scott Lahteine
79633a74ab
Fix MBL compile error
2015-05-06 14:25:13 -07:00
Scott Lahteine
777f2d3820
Merge pull request #2018 from fmalpartida/bugFixing
...
Bug corrected: persistent HOMING message when HOME button pressed for homing.
2015-05-05 00:12:32 -07:00
Scott Lahteine
ecb46de349
Merge pull request #2013 from bq/Fix_lowercase
...
Fixed lowercase change missing on commit a22a228b
2015-05-04 23:50:56 -07:00
fmalpartida
150a35eff8
Bug corrected:
...
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
2015-05-04 19:48:49 +02:00
Gina Häußge
ab246ab032
Reverting changes to error messages on serial console
...
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera
59529b755d
Fixed lowercase change missing on commit a22a228b.
...
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
2015-05-04 09:44:34 +02:00
Scott Lahteine
df4c104637
Merge pull request #2012 from BrianGilbert/Development
...
Add example configuration for Boots Industries V2.5 Delta Printer
2015-05-03 20:42:32 -07:00
Scott Lahteine
1f039cde61
Merge pull request #1992 from thinkyhead/too_many_probes
...
Stow Z probe on M402 without extra raise
2015-05-03 20:40:26 -07:00
Brian Gilbert
1285784a49
Add Boots Industries V2.5 example configuration
2015-05-04 09:10:42 +10:00
Scott Lahteine
35493e1af9
Tweak to planner.cpp position.debug
2015-05-03 16:03:05 -07:00
Scott Lahteine
2c892fca6a
Cleanup of language.h
2015-05-01 21:38:32 -07:00
Scott Lahteine
2db384a21d
Fix compile error in configuration_store.cpp
2015-05-01 21:15:26 -07:00
Scott Lahteine
ca8cec8e8a
Merge pull request #1998 from paclema/Filament_runout_fix
...
Fixed sintaxis error of filament runout
2015-04-29 19:53:25 -07:00
Scott Lahteine
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
2015-04-29 19:44:50 -07:00
Scott Lahteine
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
2015-04-29 19:05:48 -07:00
Scott Lahteine
d065d37822
Add M428 to set home_offset logically
2015-04-29 18:26:16 -07:00
paclema
4dcc0fd55a
Fixed sintaxis error of filament runout
2015-04-29 21:32:27 +02:00
AnHardt
514d8ac460
Enable TRP for the bed
...
in all Configurations.
2015-04-29 08:47:01 +02:00
Scott Lahteine
ce3caf447b
Tweak how homeaxis deploys and stows
2015-04-28 19:17:48 -07:00
Scott Lahteine
a235dca79c
Stow z on M402 without extra raise
2015-04-28 19:10:07 -07:00
Scott Lahteine
2610b8d047
Enable thermal runaway protection by default
2015-04-28 17:40:29 -07:00
Scott Lahteine
7548a56f64
Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO
...
Add pin configuration for Brainwave Pro
2015-04-27 23:13:26 -07:00
Scott Lahteine
02acf0641a
Merge pull request #1983 from CONSULitAS/Development_Update_language_de.h
...
language_de.h: updated translation and minor typos
2015-04-27 22:45:24 -07:00
Scott Lahteine
a120bf3fe4
Latest upstream commits
2015-04-27 22:40:19 -07:00
Scott Lahteine
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
2015-04-27 22:35:41 -07:00
Scott Lahteine
ae53b3cdc3
Fix the M303 S-1 report text
2015-04-27 22:25:00 -07:00
Scott Lahteine
c1fbef1722
Merge pull request #1988 from thinkyhead/bye_string_url
...
Remove obsolete STRING_URL
2015-04-27 22:12:05 -07:00
Scott Lahteine
31516e2a3b
Merge pull request #1985 from Arengorn/Development
...
Update of servo.h
2015-04-27 22:10:02 -07:00
Scott Lahteine
185f8a0a66
Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config
...
Example Configuration for K8200: comments/URL/readme
2015-04-27 21:59:56 -07:00
Scott Lahteine
0970102950
Remove obsolete STRING_URL
2015-04-27 21:59:14 -07:00
Scott Lahteine
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
2015-04-27 21:47:47 -07:00
Scott Lahteine
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
...
Allow Y to home before X with option in Configuration_adv.h.
2015-04-27 21:41:14 -07:00
Scott Lahteine
c1dd9bda7f
Merge pull request #1987 from thinkyhead/fix_homing_zpos
...
Disable endstops between homing bumps
2015-04-27 21:16:47 -07:00
Scott Lahteine
71a0b1a5bb
Disable endstops between homing bumps
2015-04-27 21:14:30 -07:00
Scott Lahteine
8c28e36e75
Merge pull request #1986 from thinkyhead/fix_homing_zpos
...
Fix homing Z position
2015-04-27 20:58:14 -07:00
Scott Lahteine
c36226c4dc
Fix homing Z position
...
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
2015-04-27 20:55:19 -07:00
Scott Lahteine
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
...
We mark this historic day, when Marlin went to China.
2015-04-27 20:37:00 -07:00
Scott Lahteine
ff178d8cf7
Change M421 to take coordinates
...
This makes `M421` more amenable for irregular matrices
2015-04-27 19:48:34 -07:00
Bernardo
e449659338
Update Servo.cpp
...
Updated "servo.h" to "Servo.h"
2015-04-27 23:30:11 -03:00
Bernardo
ff67ee73fc
Update Marlin_main.cpp
...
Corrected "servo.h" to "Servo.h" because of the updated filename.
2015-04-27 23:29:16 -03:00
Scott Lahteine
5b248757c7
Level Bed in Prepare submenu
...
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-27 19:11:25 -07:00
CONSULitAS
c5dfb35597
language_de.h: updated translation and minor typos
...
language_de.h: updated translation and minor typos
2015-04-28 01:03:54 +02:00
CONSULitAS
6af40e9dc0
K8200 example Configuration.h: STRING_URL removed
...
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
2015-04-27 23:59:10 +02:00
CONSULitAS
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
...
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
2015-04-27 23:54:47 +02:00
Steve Kelly
98ca46006c
Allow Y to home before X with option in Configuration_adv.h.
...
This addresses comments in #1956 and #1079 . In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
2015-04-27 16:17:30 -04:00
AnHardt
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
2015-04-27 13:24:51 +02:00
AnHardt
1d9699be0f
Add some doku
2015-04-27 13:16:20 +02:00
AnHardt
76b12edecf
Give TALL_FONT_CORRECTION a default
2015-04-27 12:47:11 +02:00
AnHardt
6b1b71837c
Intit. commit for Chinese
...
Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
Added Chinese font to make_fonts.bat
Created 'dogm_font_data_ISO10646_CN.h'
Added Chinese to 'language.h'
Added 'language_cn.h' with some minor edits.
Added Chinese font in 'language_en.h' to not fall back to European font.
Added cn to 'Configuration.h'
Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.
In 'dogm_lcd_implementation.h'
Added Chinese Font
Made 1 pixel more room for the larger Chinese font on the status line.
Changed geometry of the 'select bar' by one pixel.
Changed the way the position for values and postcars are set.
2015-04-27 12:15:36 +02:00
Scott Lahteine
fb379384ee
Reduce MBL eeprom read code
2015-04-26 21:06:04 -07:00
