 Scott Lahteine
|
4097207c75
|
Merge pull request #2041 from thinkyhead/watch_temp
More thermal protection
|
2015-05-10 21:39:05 -07:00 |
|
|
Scott Lahteine
|
45d64040fe
|
Merge pull request #2048 from Wurstnase/hit_bits
replace some bools
|
2015-05-10 20:37:17 -07:00 |
|
|
Scott Lahteine
|
52c0696e44
|
Merge pull request #2044 from thinkyhead/fix_servos_too
Make some z probe and servo code tweaks
|
2015-05-10 20:10:42 -07:00 |
|
|
Scott Lahteine
|
58781cb88c
|
Merge pull request #2045 from delagela/upstream
Correction traductions
|
2015-05-10 17:58:00 -07:00 |
|
|
Scott Lahteine
|
9a6423ea17
|
Merge pull request #2021 from brupje/Development
Fixes for reprapworld's keypad
|
2015-05-08 20:35:37 -07:00 |
|
|
Scott Lahteine
|
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 …
|
2015-05-08 20:32:30 -07:00 |
|
|
Scott Lahteine
|
8b59e620bb
|
Merge pull request #2039 from thinkyhead/mks_base
Support for MKS BASE 1.0 board
|
2015-05-08 20:29:57 -07:00 |
|
|
Scott Lahteine
|
0e70511381
|
Merge pull request #2036 from brupje/mainline
Fixes for reprapworld's keypad
|
2015-05-08 18:19:31 -07:00 |
|
|
Scott Lahteine
|
7f3252eea9
|
Merge pull request #1999 from paclema/Filrunout_configurable_script
Added configurable script for filrunout from configuration.h
|
2015-05-08 04:39:59 -07:00 |
|
|
Scott Lahteine
|
0511ccda23
|
Merge pull request #2034 from thinkyhead/fixup_configs
Edit thermal runaway description
|
2015-05-07 21:46:05 -07:00 |
|
|
Scott Lahteine
|
91fa1dea82
|
Merge pull request #2029 from thinkyhead/hardware_md
Initial Hardware.md to fix 404 error
|
2015-05-06 19:16:30 -07:00 |
|
|
Scott Lahteine
|
26c53634e1
|
Add a TOC
|
2015-05-06 18:24:10 -07:00 |
|
|
Scott Lahteine
|
72bf6acb5b
|
Merge pull request #2027 from thinkyhead/fix_mbl_compile_err
Fix MBL compile error
|
2015-05-06 14:26:48 -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 |
|
|
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 |
|
|
Scott Lahteine
|
65487b75e2
|
Merge pull request #2011 from thinkyhead/fix_2004
Tweak to planner.cpp position.debug
|
2015-05-03 16:03:30 -07:00 |
|
|
Scott Lahteine
|
555128d9e6
|
Merge pull request #2008 from thinkyhead/fix_2004
Cleanup language.h
|
2015-05-01 21:39:28 -07:00 |
|
|
Scott Lahteine
|
4b156a612a
|
Merge pull request #2007 from thinkyhead/fix_2004
Fix compile error in configuration_store.cpp
|
2015-05-01 21:17:12 -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
|
b12bcd0f92
|
Merge pull request #2001 from thinkyhead/thermal_protection_on
Add M428 to set home_offset logically
|
2015-04-29 19:15:31 -07:00 |
|
|
Scott Lahteine
|
e47e888a08
|
Merge pull request #1991 from thinkyhead/thermal_protection_on
Enable thermal runaway protection by default
|
2015-04-29 15:43:18 -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
|
a9a4f0ed3b
|
Merge pull request #1989 from thinkyhead/pid_tuning_report
Fix the M303 S-1 report text
|
2015-04-27 22:41:59 -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
|
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
|
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
|
8c28e36e75
|
Merge pull request #1986 from thinkyhead/fix_homing_zpos
Fix homing Z position
|
2015-04-27 20:58:14 -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
|
ed988e39a8
|
Merge pull request #1984 from thinkyhead/leveling_menu_items
Level Bed in Prepare submenu
|
2015-04-27 19:32:59 -07:00 |
|
|
Scott Lahteine
|
01bedd17c9
|
Merge pull request #1973 from thinkyhead/m111_debug_level
M111 - Debug Level
|
2015-04-26 20:39:56 -07:00 |
|
|
Scott Lahteine
|
1f530beaf1
|
Merge pull request #1970 from thinkyhead/rename_files
Rename files to move them in the IDE
|
2015-04-26 15:15:51 -07:00 |
|
|
Scott Lahteine
|
ac9ca64c50
|
Merge pull request #1969 from thinkyhead/buzz_duration
Fix BEEPER duration
|
2015-04-25 03:26:28 -07:00 |
|
|
Scott Lahteine
|
b3436c875a
|
Merge pull request #1968 from thinkyhead/more_disable_warning
Add a warning for DISABLE_[XYZ] options
|
2015-04-25 00:47:42 -07:00 |
|
|
Scott Lahteine
|
0438f0d835
|
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
Raise Z for M401 and M402
|
2015-04-24 22:41:12 -07:00 |
|
|
Scott Lahteine
|
a640cad139
|
Merge pull request #1967 from thinkyhead/g4_dwell_message
Use millis_t for progress_bar_ms and expire_status_ms
|
2015-04-24 22:17:28 -07:00 |
|
|
Scott Lahteine
|
b275946a52
|
Merge pull request #1966 from thinkyhead/g4_dwell_message
G4 shows status message only if no message is set already
|
2015-04-24 22:02:37 -07:00 |
|
|
Scott Lahteine
|
777ca11760
|
Merge pull request #1925 from thinkyhead/move_zoffset
Apply zprobe_zoffset in axis_is_at_home
|
2015-04-24 21:29:07 -07:00 |
|
|
Scott Lahteine
|
3c9e94e035
|
Merge pull request #1964 from AnHardt/Max6675again
Add variant for MAX6675 in M104
|
2015-04-24 20:44:45 -07:00 |
|
|
Scott Lahteine
|
c5a1b227a4
|
Merge pull request #1965 from thinkyhead/g28_xyz_are_flags
Remove set-coordinate extension of G28
|
2015-04-24 19:34:38 -07:00 |
|
|
Scott Lahteine
|
3a74bb5039
|
Merge pull request #1945 from Wurstnase/max_endstopp
Max endstopp
|
2015-04-24 19:17:38 -07:00 |
|
|
Scott Lahteine
|
2606d1d892
|
Merge pull request #1960 from Wurstnase/macro_steppercpp
Macro steppercpp
|
2015-04-24 18:45:19 -07:00 |
|
|
Scott Lahteine
|
075386e7fe
|
Merge pull request #1959 from thinkyhead/lcd_move_rate
Include axis parameter to ultralcd's line_to_current
|
2015-04-23 21:06:57 -07:00 |
|
|
Scott Lahteine
|
c2e11daf66
|
Merge pull request #1958 from thinkyhead/redo_1937
Fix homing of YZ with DUAL_X_CARRIAGE
|
2015-04-23 19:12:51 -07:00 |
|
|
Scott Lahteine
|
a0a5ff61c4
|
Merge pull request #1951 from AnHardt/Azteeg_x3
Fix for #1946
|
2015-04-23 18:40:00 -07:00 |
|
|
Scott Lahteine
|
0094481e55
|
Merge pull request #1955 from AnHardt/langlang
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
|
2015-04-23 18:36:06 -07:00 |
|
|
Scott Lahteine
|
3b97a7d446
|
Merge pull request #1944 from AnHardt/beep2
More Beeper clean up
|
2015-04-23 17:50:02 -07:00 |
|
|
Scott Lahteine
|
461aaf2126
|
Merge pull request #1941 from thinkyhead/gcode_M410
Add M410 QuickStop command
|
2015-04-23 17:30:58 -07:00 |
|
|
Scott Lahteine
|
a4ca87ba99
|
Merge pull request #1933 from bq/Fix_stray_in_configuration
Fixed compilation error "error: stray ‘\357’ in program"
|
2015-04-18 03:56:31 -07:00 |
|
|
Scott Lahteine
|
5e3bb4bdf3
|
Merge pull request #1931 from paclema/M303_echo
Added new PID autotune info, to make easy copy & paste results to marlin
|
2015-04-18 03:49:31 -07:00 |
|
|
Scott Lahteine
|
67a4471324
|
Merge pull request #1926 from nophead/acceleration_fix
Fixed jump in speed at high accelerations on axes with lots of steps
|
2015-04-18 03:09:54 -07:00 |
|
|
Scott Lahteine
|
d0b65ff642
|
Merge pull request #1923 from thinkyhead/babystep_delay_2us
Babystep delay 2us
|
2015-04-16 07:51:37 -07:00 |
|
|
Scott Lahteine
|
f49a73d69f
|
Merge pull request #1919 from paclema/M48_mismatch
Fixed M48 mismatch between n and P parameter on documentation
|
2015-04-16 03:25:23 -07:00 |
|
|
Scott Lahteine
|
637babb99b
|
Merge pull request #1915 from elgambitero/Development
Some minor translations to spanish
|
2015-04-14 19:59:39 -07:00 |
|
|
Scott Lahteine
|
71f183a3a2
|
Merge pull request #1913 from CONSULitAS/Development_Update_K8200_Config
Example Configuration for K8200 back in sync
|
2015-04-14 19:52:47 -07:00 |
|
|
Scott Lahteine
|
d57b23b1e3
|
Merge pull request #1912 from thinkyhead/some_fixes
Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS
|
2015-04-14 05:12:49 -07:00 |
|
|
Scott Lahteine
|
639ffc341e
|
Merge pull request #1910 from thinkyhead/some_fixes
Rename servos[] array in Marlin to servo[]
|
2015-04-14 03:44:20 -07:00 |
|
|
Scott Lahteine
|
dee6840c50
|
Merge pull request #1907 from thinkyhead/some_fixes
Fix type of code_has_value
|
2015-04-13 18:04:53 -07:00 |
|
|
Scott Lahteine
|
6b51305c4b
|
Merge pull request #1906 from thinkyhead/some_fixes
Naming and code comments
|
2015-04-13 17:59:48 -07:00 |
|
|
Scott Lahteine
|
c05b347617
|
Merge pull request #1902 from msutas/Development
Fix Syntax Error Filament Runout Statement
|
2015-04-13 14:31:57 -07:00 |
|
|
Scott Lahteine
|
0908c41156
|
Merge pull request #1899 from thinkyhead/squash_fixups
Several fixups
|
2015-04-12 23:31:31 -07:00 |
|
|
Scott Lahteine
|
666f9cd7b4
|
Merge pull request #1897 from epatel/Development
Manual bed leveling menu fixes.
|
2015-04-12 21:26:36 -07:00 |
|
|
Scott Lahteine
|
e7aae314de
|
Merge pull request #1896 from thinkyhead/cold_extrude
Homing fixes
|
2015-04-12 17:50:19 -07:00 |
|
|
Scott Lahteine
|
b089eb42eb
|
Merge pull request #1893 from thinkyhead/cold_extrude
Fix doubled lcd_quick_feedback
|
2015-04-11 04:57:00 -07:00 |
|
|
Scott Lahteine
|
f8b4ee079b
|
Merge pull request #1891 from thinkyhead/cold_extrude
machine name for hephestos too
|
2015-04-11 01:37:07 -07:00 |
|
|
Scott Lahteine
|
79a5b14eb7
|
Merge pull request #1890 from thinkyhead/cold_extrude
Apply CUSTOM_MACHINE_NAME to configs
|
2015-04-11 00:04:46 -07:00 |
|
|
Scott Lahteine
|
f1a03c5447
|
Merge pull request #1887 from thinkyhead/cold_extrude
Break out prevent_dangerous_extrude feature
|
2015-04-10 16:16:52 -07:00 |
|
|
Scott Lahteine
|
8f164f4c83
|
Clean up M85 in GCodes.md
|
2015-04-10 16:04:32 -07:00 |
|
|
Scott Lahteine
|
a327d876fe
|
Document G92 arguments in GCodes.md
|
2015-04-10 16:02:00 -07:00 |
|
|
Scott Lahteine
|
652d59cd80
|
Spacing of g-codes in GCodes.md
|
2015-04-10 15:59:55 -07:00 |
|
|
Scott Lahteine
|
fe912f44dc
|
Smaller headings
|
2015-04-10 15:58:32 -07:00 |
|
|
Scott Lahteine
|
93eb63238f
|
Move G Codes into categories with M Codes
|
2015-04-10 15:57:54 -07:00 |
|
|
Scott Lahteine
|
a3b13eb5ac
|
Organize M Codes by Category
- In GCodes.md
|
2015-04-10 15:54:36 -07:00 |
|
|
Scott Lahteine
|
3105ebc562
|
Restore M928, M999
|
2015-04-10 15:05:00 -07:00 |
|
|
Scott Lahteine
|
01654bdec1
|
Cleanup formatting of some M codes
|
2015-04-10 15:03:41 -07:00 |
|
|
Scott Lahteine
|
907e8e98e5
|
Add GCodes from Marlin 1.0.3 dev, format as pre
|
2015-04-10 14:55:21 -07:00 |
|
|
Scott Lahteine
|
67c0e8323e
|
Merge pull request #1879 from thinkyhead/cold_extrude
Fix moves for DELTA for MANUAL_BED_LEVELING
|
2015-04-09 22:06:06 -07:00 |
|
|
Scott Lahteine
|
7a1aef1450
|
Merge pull request #1877 from AnHardt/display-only
Made encoderPosition and quick_feedback dependant on NEWPANEL
|
2015-04-09 03:54:05 -07:00 |
|
|
Scott Lahteine
|
6096164d79
|
Merge pull request #1878 from thinkyhead/cold_extrude
Cold extrude
|
2015-04-09 03:41:54 -07:00 |
|
|
Scott Lahteine
|
b1950a7f25
|
Merge pull request #1875 from Natealus/Development
Z Probe inverting not present in example configs, causes error
|
2015-04-09 03:37:24 -07:00 |
|
|
Scott Lahteine
|
2ca099d1e7
|
Merge pull request #1876 from thinkyhead/cold_extrude
Catch dangerous extrude before trying several
|
2015-04-09 03:21:19 -07:00 |
|
|
Scott Lahteine
|
837ceb9abb
|
Merge pull request #1867 from epatel/Development
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
|
2015-04-09 02:29:47 -07:00 |
|
|
Scott Lahteine
|
a00ebf03d4
|
Merge pull request #1868 from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
|
2015-04-09 01:56:23 -07:00 |
|
|
Scott Lahteine
|
4abd23ae9e
|
Merge pull request #1866 from AnHardt/contrast
Remove Contrast Menu for device U8GLIB_ST7920
|
2015-04-09 00:34:25 -07:00 |
|
|
Scott Lahteine
|
98f3130a5c
|
Merge pull request #1865 from thinkyhead/configurator_values
Thermistor values for configurator
|
2015-04-08 03:13:27 -07:00 |
|
|
Scott Lahteine
|
bb917ecda8
|
Merge pull request #1853 from thinkyhead/dev_version
Set version to "1.0.3 dev"
|
2015-04-08 01:57:51 -07:00 |
|
|
Scott Lahteine
|
caa7734402
|
Merge pull request #1864 from thinkyhead/is_running
IsStopped / IsRunning inline
|
2015-04-08 01:10:36 -07:00 |
|
|
Scott Lahteine
|
c82da64d10
|
Merge pull request #1863 from lcfm1/patch-3
Update language_ru.h
|
2015-04-08 01:07:12 -07:00 |
|
|
Scott Lahteine
|
cf9b58452c
|
Minimum delay in menu click feedback
Squished #1849
|
2015-04-07 20:20:30 -07:00 |
|
|
Scott Lahteine
|
419f3ebc03
|
Merge pull request #1850 from OpCode1300/docs
Fix typo in readme
|
2015-04-07 20:14:53 -07:00 |
|
|
Scott Lahteine
|
1d291be2ba
|
Fix de after PREVENT_DANGEROUS_EXTRUDE
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
|
2015-04-07 20:01:08 -07:00 |
|
|
Scott Lahteine
|
e03da4805b
|
Merge pull request #1774 from epatel/Development
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
|
2015-04-07 19:24:46 -07:00 |
|
|
Scott Lahteine
|
5b2c67f4c3
|
Merge pull request #1847 from thinkyhead/more_configurator
Fix G29 not deploying probe in some instances
|
2015-04-07 15:41:02 -07:00 |
|
|
Scott Lahteine
|
3db4e0fb5d
|
Merge pull request #1842 from thinkyhead/more_configurator
Configurator updates
|
2015-04-06 23:38:20 -07:00 |
|