b4b19a6cbd
Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
Conflicts:
Marlin/Configuration.h
Marlin/configurator/config/Configuration.h
Marlin/example_configurations/Felix/Configuration.h
Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Conflicts with my Chinese implementation resolved.
10 years ago
7548a56f64
Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO
Add pin configuration for Brainwave Pro
10 years ago
02acf0641a
Merge pull request #1983 from CONSULitAS/Development_Update_language_de.h
language_de.h: updated translation and minor typos
10 years ago
a9a4f0ed3b
Merge pull request #1989 from thinkyhead/pid_tuning_report
Fix the M303 S-1 report text
10 years ago
a120bf3fe4
Latest upstream commits
10 years ago
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
Make EEPROM reproducible in GCode
10 years ago
ae53b3cdc3
Fix the M303 S-1 report text
10 years ago
c1fbef1722
Merge pull request #1988 from thinkyhead/bye_string_url
Remove obsolete STRING_URL
10 years ago
31516e2a3b
Merge pull request #1985 from Arengorn/Development
Update of servo.h
10 years ago
185f8a0a66
Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config
Example Configuration for K8200: comments/URL/readme
10 years ago
0970102950
Remove obsolete STRING_URL
10 years ago
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
Latest upstream commits
10 years ago
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
Allow Y to home before X with option in Configuration_adv.h.
10 years ago
c1dd9bda7f
Merge pull request #1987 from thinkyhead/fix_homing_zpos
Disable endstops between homing bumps
10 years ago
71a0b1a5bb
Disable endstops between homing bumps
10 years ago
8c28e36e75
Merge pull request #1986 from thinkyhead/fix_homing_zpos
Fix homing Z position
10 years ago
c36226c4dc
Fix homing Z position
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
10 years ago
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
We mark this historic day, when Marlin went to China.
10 years ago
ff178d8cf7
Change M421 to take coordinates
This makes `M421` more amenable for irregular matrices
10 years ago
ed988e39a8
Merge pull request #1984 from thinkyhead/leveling_menu_items
Level Bed in Prepare submenu
10 years ago
e449659338
Update Servo.cpp
Updated "servo.h" to "Servo.h"
10 years ago
ff67ee73fc
Update Marlin_main.cpp
Corrected "servo.h" to "Servo.h" because of the updated filename.
10 years ago
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`
10 years ago
c5dfb35597
language_de.h: updated translation and minor typos
language_de.h: updated translation and minor typos
10 years ago
6423fe7601
language.h: update documentation / URL für K8200
language.h: update documentation for LANGUAGE_INCLUDE
language.h: URL für K8200 github repository
10 years ago
8f8824e1d3
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
6af40e9dc0
K8200 example Configuration.h: STRING_URL removed
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
10 years ago
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
10 years ago
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.
10 years ago
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
10 years ago
1d9699be0f
Add some doku
10 years ago
76b12edecf
Give TALL_FONT_CORRECTION a default
10 years ago
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.
10 years ago
fb379384ee
Reduce MBL eeprom read code
10 years ago
0fca084ea6
Make EEPROM reproducible in GCode
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.
- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
01bedd17c9
Merge pull request #1973 from thinkyhead/m111_debug_level
M111 - Debug Level
10 years ago
d43cc2dd5f
M111 - Debug Level
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
10 years ago
1f530beaf1
Merge pull request #1970 from thinkyhead/rename_files
Rename files to move them in the IDE
10 years ago
0ec444720f
Rename blinkm files
10 years ago
a22a228bcc
Rename files to move them in the IDE
10 years ago
ac9ca64c50
Merge pull request #1969 from thinkyhead/buzz_duration
Fix BEEPER duration
10 years ago
a932e7490f
No noTone needed, but delay is
10 years ago
9c5d14ea68
Fix BEEPER duration
10 years ago
b3436c875a
Merge pull request #1968 from thinkyhead/more_disable_warning
Add a warning for DISABLE_[XYZ] options
10 years ago
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
Raise Z for M401 and M402
10 years ago
a640cad139
Merge pull request #1967 from thinkyhead/g4_dwell_message
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
c92b59952a
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
b275946a52
Merge pull request #1966 from thinkyhead/g4_dwell_message
G4 shows status message only if no message is set already
10 years ago
97dfa0365d
Rename expireStatusMillis to expire_status_ms
10 years ago
AnHardt
Scott Lahteine
Scott Lahteine
Bernardo
CONSULitAS
Steve Kelly