6e5572228d
Merge pull request #2064 from thinkyhead/wait_before_g28
...
Split up prepare_move by type
10 years ago
27ad381e25
Allow fractional seconds in G4 and M0
10 years ago
5146694452
Merge pull request #1884 from shaggythesheep/feature_new_board_ramps_cnc_controller
...
Feature: Add RAMPS CNC Controller Board
10 years ago
b2bd9aae7c
SCARA_SEGMENTS_PER_SECOND
10 years ago
bd20bd5444
Merge pull request #2063 from chris-bo/autobed_sled
...
improve sled handling
10 years ago
9e95ceb3fc
Split up prepare_move by type
...
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
10 years ago
9ba8cf5fe3
Merge pull request #2061 from thinkyhead/wait_before_g28
...
Always do st_synchronize() before G28
10 years ago
873f7d6f2a
Check that configs are up-to-date
10 years ago
f48599f172
add pin definition to some motherboards
10 years ago
b5200e184c
Remove extra setup_for_endstop_move
10 years ago
8d814de558
Return void in prevent_dangerous_extrude
10 years ago
367e2eb9f4
Global setup_for_endstop_move
10 years ago
1d5677cc3b
add missing Z-bits
10 years ago
df12e68e7d
add missing Z_PROBE-bit
10 years ago
fa951f8a0b
Always do st_synchronize() before G28
10 years ago
27a3b1d895
disable sled pin by default
10 years ago
fb44b53ae3
sled improvements
...
- create sled pin definition
- G28 Works with sled
10 years ago
46d1932380
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
429c6ccad2
Neaten config formatting
10 years ago
8a0dc4d54a
Merge pull request #1922 from Wurstnase/serial_wait
...
Serial wait
10 years ago
8332a15899
Fix testing of runaway options in temperature.cpp
10 years ago
526ad82d20
activate advanced_ok and no_timeout
10 years ago
2b92b01afc
Fix typo in SanityCheck.h
10 years ago
2445ae3d3a
Combine thermal runaway and watch-period
...
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
4097207c75
Merge pull request #2041 from thinkyhead/watch_temp
...
More thermal protection
10 years ago
45d64040fe
Merge pull request #2048 from Wurstnase/hit_bits
...
replace some bools
10 years ago
9b3d4380d3
Only watch the heater that was set
10 years ago
52c0696e44
Merge pull request #2044 from thinkyhead/fix_servos_too
...
Make some z probe and servo code tweaks
10 years ago
b55f32f8a1
replace some bools
...
this PR replaces some bools with one char. this will safe 3 bytes and should also be sometimes a little bit faster.
10 years ago
e70e6e2b48
Correction traductions
10 years ago
f73f4ce555
Make some z probe and servo code tweaks
10 years ago
28c87ec81b
Disable all heaters on temp error
10 years ago
79106638a8
Fix documentation of heating sanity check
10 years ago
6110494a56
Change default to 4°C in 16s
10 years ago
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
10 years ago
deedb00c18
Document WATCH_TEMP_PERIOD
10 years ago
be77cfd895
Merge pull request #2032 from Wurstnase/toshiba_for_all_stepper
...
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER …
10 years ago
cb4ea75fab
Support for MKS BASE 1.0 board
10 years ago
0e70511381
Merge pull request #2036 from brupje/mainline
...
Fixes for reprapworld's keypad
10 years ago
0cb87795a3
advanced 'ok'
...
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.
Some pseudo code:
If (bufferremaining > 0) send command
## as long there is free buffer send command
Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
10 years ago
182e0d99c9
Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait
10 years ago
d1148a0198
Rename Configuration_megatronics.h to Configuration.h
10 years ago
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
10 years ago
181ccc884c
Edit thermal runaway description
10 years ago
073e4af7e2
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver.
10 years ago
b7fcb11580
Added example configuration for Megatronics
10 years ago
8f8174dc93
Revert "Default configuration for megatronics."
...
This reverts commit 22e0d2afcb
10 years ago
79633a74ab
Fix MBL compile error
10 years ago
ba9741139e
Clean up pins file for megatronics
10 years ago
22e0d2afcb
Default configuration for megatronics.
10 years ago
816aa19861
Up/down buttons were reversed, swapped the assignments
10 years ago
df4d50579a
This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway.
10 years ago
8f8bf3a897
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
10 years ago
777f2d3820
Merge pull request #2018 from fmalpartida/bugFixing
...
Bug corrected: persistent HOMING message when HOME button pressed for homing.
10 years ago
ecb46de349
Merge pull request #2013 from bq/Fix_lowercase
...
Fixed lowercase change missing on commit a22a228b
10 years ago
150a35eff8
Bug corrected:
...
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
10 years ago
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
10 years ago
59529b755d
Fixed lowercase change missing on commit a22a228b.
...
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
10 years ago
df4c104637
Merge pull request #2012 from BrianGilbert/Development
...
Add example configuration for Boots Industries V2.5 Delta Printer
10 years ago
1f039cde61
Merge pull request #1992 from thinkyhead/too_many_probes
...
Stow Z probe on M402 without extra raise
10 years ago
1285784a49
Add Boots Industries V2.5 example configuration
10 years ago
35493e1af9
Tweak to planner.cpp position.debug
10 years ago
26015b02d8
Fixed typo and updated Configuration.h of configurator
10 years ago
aedd580911
Updated all configuration.h examples
10 years ago
2c892fca6a
Cleanup of language.h
10 years ago
2db384a21d
Fix compile error in configuration_store.cpp
10 years ago
ca8cec8e8a
Merge pull request #1998 from paclema/Filament_runout_fix
...
Fixed sintaxis error of filament runout
10 years ago
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
10 years ago
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
d065d37822
Add M428 to set home_offset logically
10 years ago
013a09dbe6
Added configurable script for filrunout form configuration.h
10 years ago
4dcc0fd55a
Fixed sintaxis error of filament runout
10 years ago
514d8ac460
Enable TRP for the bed
...
in all Configurations.
10 years ago
ce3caf447b
Tweak how homeaxis deploys and stows
10 years ago
a235dca79c
Stow z on M402 without extra raise
10 years ago
2610b8d047
Enable thermal runaway protection by default
10 years ago
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
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
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
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
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
0ec444720f
Rename blinkm files
10 years ago
a22a228bcc
Rename files to move them in the IDE
10 years ago
a932e7490f
No noTone needed, but delay is
10 years ago
9c5d14ea68
Fix BEEPER duration
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
7295640f44
Remove extraneous ;
10 years ago
0d8c00d3f6
Define lcd_hasstatus for no lcd also
10 years ago
182f2cda35
Minor cleanup of M48
10 years ago
3a6fd912cd
Latest upstream commits, merged
10 years ago
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
...
Add variant for MAX6675 in M104
10 years ago
56ff46eb8b
Improve code_has_value test
10 years ago
ce142afdda
G4 shows status message only if no message is set already
...
- Address issue raised in #1961
10 years ago
35e79d56a5
Remove set-coordinate extension of G28
10 years ago
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
...
Max endstopp
10 years ago
0fed46360c
Add variant for MAX6675 in M104
...
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature
when no bed is defined
10 years ago
79a44a9de3
stepper.cpp macros rework
...
delete some tabs
10 years ago
588ed70d4a
Latest upstream commits, merged
10 years ago
0165560333
Apply zprobe_zoffset in axis_is_at_home
...
Ensure the probe offset will always be included when homing Z.
10 years ago
075386e7fe
Merge pull request #1959 from thinkyhead/lcd_move_rate
...
Include axis parameter to ultralcd's line_to_current
10 years ago
2558c10c6c
Use the slower feedrate for XY axes
10 years ago
31932912dd
Use AxisEnum instead of int for _lcd_move
10 years ago
c2e11daf66
Merge pull request #1958 from thinkyhead/redo_1937
...
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
c3560e0288
Include axis parameter to ultralcd's line_to_current
10 years ago
a0a5ff61c4
Merge pull request #1951 from AnHardt/Azteeg_x3
...
Fix for #1946
10 years ago
0094481e55
Merge pull request #1955 from AnHardt/langlang
...
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
10 years ago
64268f3312
Fixup axis_is_at_home a little
10 years ago
996d0a9185
Squish the code down a little
10 years ago
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 years ago
be9e4ceddc
fix typo
...
c'n'p ftw :/
10 years ago
c26d816839
filter any 0
10 years ago
f2c94b3298
tone will end automaticly
10 years ago
c5e0e29d23
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
...
and add some documentation - how to integrate a new font.
10 years ago
b59e92ab99
Fix for #1946
...
Syntax error.
10 years ago
61ae43f35e
v <-> code_value
10 years ago
da0d91a79b
max endstopp
...
no user will home to 0 with a max endstopp
10 years ago
Scott Lahteine