  Scott LahteineandGitHub
|
9beb3f2f5e
|
Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup
FIL_RUNOUT_INVERTING false by default
|
2016-06-19 19:46:14 -07:00 |
|
|
Scott LahteineandGitHub
|
f215b30932
|
Merge pull request #4093 from thinkyhead/rc_probe_without_abl
Make Z Probe options independent of ABL
|
2016-06-19 19:44:25 -07:00 |
|
|
Scott LahteineandGitHub
|
7b5cd314a5
|
Merge pull request #4095 from thinkyhead/rc_fil_runout_cleanup
Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN
|
2016-06-19 18:48:18 -07:00 |
|
|
Scott LahteineandGitHub
|
15a5eeb740
|
Merge pull request #4094 from thinkyhead/rc_cartesio_config
Cartesio UI display option in all configs
|
2016-06-19 17:43:25 -07:00 |
|
|
Scott LahteineandGitHub
|
43ec24158e
|
Merge pull request #4092 from thinkyhead/rc_sd_error
Output a message for SD read errors
|
2016-06-19 17:30:29 -07:00 |
|
|
Scott LahteineandGitHub
|
b714fb644c
|
Merge pull request #4085 from thinkyhead/rc_fix_M851
Fix M851
|
2016-06-18 15:42:52 -07:00 |
|
|
Scott LahteineandGitHub
|
e35583888c
|
Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065
Follow-up the PR #4065 (Remove support for XY servo endstops)
|
2016-06-18 03:31:12 -07:00 |
|
|
Scott LahteineandGitHub
|
6dff52d920
|
Merge pull request #4078 from RicardoGA/Language_Spanish
Update Spanish Language
|
2016-06-18 03:28:46 -07:00 |
|
|
Scott LahteineandGitHub
|
da526f6ba9
|
Merge pull request #4080 from thinkyhead/rc_probe_feedrates
Save / restore feedrate in probing functions
|
2016-06-18 02:44:52 -07:00 |
|
|
Scott LahteineandGitHub
|
f33bd0bb10
|
Merge pull request #4077 from thinkyhead/rc_delete_old_macros
Delete some obsolete Z servo macros
|
2016-06-17 18:59:16 -07:00 |
|
|
Scott LahteineandGitHub
|
599154f9e2
|
Merge pull request #4076 from thinkyhead/rc_stop_print
Add an SD Card stop function, use in ultralcd
|
2016-06-17 18:53:29 -07:00 |
|
|
Scott LahteineandGitHub
|
3a150f07c2
|
Merge pull request #4073 from thinkyhead/rc_temp_mystery
Minor tweaks to M109 / M190
|
2016-06-17 17:49:50 -07:00 |
|
|
Scott LahteineandGitHub
|
c53d6441d1
|
Merge pull request #4074 from thinkyhead/rc_fix_gitignore
.gitignore comments in correct format
|
2016-06-17 17:48:23 -07:00 |
|
|
Scott LahteineandGitHub
|
bd4ec727e7
|
Merge pull request #4066 from thinkyhead/rc_M851_with_probe
Make M851 standard with a bed probe
|
2016-06-17 17:32:55 -07:00 |
|
|
Scott LahteineandGitHub
|
692a6e7c91
|
Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos
Remove support for XY servo endstops
|
2016-06-17 17:32:08 -07:00 |
|
|
Scott LahteineandGitHub
|
f66a194159
|
Merge pull request #4062 from jbrazio/bugfix/compiler-warnings
Fixes misc gcc warnings
|
2016-06-17 14:23:28 -07:00 |
|
|
Scott LahteineandGitHub
|
7641f414cf
|
Merge pull request #4069 from esenapaj/Follow-up-the-PR-#4055
Follow-up the PR #4055 (Croatian language support)
|
2016-06-17 14:13:37 -07:00 |
|
|
Scott LahteineandGitHub
|
dbb6d1ef45
|
Merge pull request #4071 from token47/patch-1
Update README.md
|
2016-06-17 14:11:32 -07:00 |
|
|
Scott LahteineandGitHub
|
cabb71ff38
|
Merge pull request #4064 from jbrazio/feature/update-gitignore
Updates .gitignore
|
2016-06-16 18:24:23 -07:00 |
|
|
Scott LahteineandGitHub
|
d991a4c24a
|
Merge pull request #4063 from thinkyhead/rc_remove_swp_files
Delete mysterious .swp files from #3609
|
2016-06-16 17:22:48 -07:00 |
|
|
Scott LahteineandGitHub
|
8d8cbef1de
|
Merge pull request #4055 from thinkyhead/rc_croatian_language
Croatian language support
|
2016-06-16 17:22:25 -07:00 |
|
|
Scott LahteineandGitHub
|
c42b1364b2
|
Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s
Fix feedrate in gcode_T (max_feedrate is mm/s)
|
2016-06-16 16:23:22 -07:00 |
|
|
Scott LahteineandGitHub
|
9030ceec1d
|
Merge pull request #4056 from thinkyhead/rc_mfinit
Script to init the upstream remote for Marlin
|
2016-06-16 15:44:14 -07:00 |
|
|
Scott LahteineandGitHub
|
4640974e1b
|
Merge pull request #4060 from esenapaj/Follow-up-the-PR-#4053
Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support)
|
2016-06-16 15:44:00 -07:00 |
|
|
Scott LahteineandGitHub
|
55edb37b52
|
Merge pull request #4058 from MagoKimbra/gcode_T
Fix gcode_T
|
2016-06-16 12:54:21 -07:00 |
|
|
Scott LahteineandGitHub
|
cd9ecfdcb1
|
Merge pull request #4057 from thinkyhead/rc_babysteps_mm
Babystepping show millimeters on LCD
|
2016-06-15 23:03:46 -07:00 |
|
|
Scott LahteineandGitHub
|
b410bf933b
|
Merge pull request #4053 from thinkyhead/rc_cartesio_redo
CNControls Cartesio UI Support
|
2016-06-15 22:33:45 -07:00 |
|
|
Scott LahteineandGitHub
|
f639044c24
|
Merge pull request #3609 from jbrazio/feature/config-version
Adds versioning for Configuration.h & Configuration_adv.h
|
2016-06-15 22:09:47 -07:00 |
|
|
Scott LahteineandGitHub
|
da90bbe0eb
|
Merge pull request #4010 from thinkyhead/rc_toolchange_adjust
Fixup position adjustment on toolchange
|
2016-06-15 21:10:33 -07:00 |
|
|
Scott LahteineandGitHub
|
948c467e16
|
Merge pull request #4043 from AnHardt/save_delay
Introduce save_delay()
|
2016-06-15 21:06:43 -07:00 |
|
|
Scott LahteineandGitHub
|
8c7babb70f
|
Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023
Fix for the PR #4023(Add macros to move servos)
|
2016-06-15 20:39:46 -07:00 |
|
|
Scott LahteineandGitHub
|
2d6de3e592
|
Merge pull request #4047 from Alex9779/Fix/ultralcd_move_e
RCBugFix with UltraLCD active does not compile
|
2016-06-15 20:38:41 -07:00 |
|
|
Scott LahteineandGitHub
|
52ac2a62ee
|
Merge pull request #4013 from thinkyhead/rc_toolchange_no_move
Use "Tn S1" to change tools without moving
|
2016-06-14 20:13:01 -07:00 |
|
|
Scott LahteineandGitHub
|
d2a00b74e3
|
Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T
Use linear feedrate in gcode_T, not volumetric
|
2016-06-14 20:10:08 -07:00 |
|
|
Scott LahteineandGitHub
|
0ad26d0de8
|
Merge pull request #4034 from AnHardt/custom-splash-screen
Custom Splash Screen
|
2016-06-14 18:51:39 -07:00 |
|
|
Scott LahteineandGitHub
|
78a48d7e3c
|
Merge pull request #4038 from thinkyhead/rc_fix_heater_off
Fix broken DISABLE_HEATER macro
|
2016-06-13 20:58:34 -07:00 |
|
|
Scott LahteineandGitHub
|
fc4fb9eba1
|
Merge pull request #4036 from thinkyhead/rc_lin_advance_feature
Parse M905 args in Marlin_main.cpp
|
2016-06-13 19:26:29 -07:00 |
|
|
Scott LahteineandGitHub
|
e7e57f0eb4
|
Merge pull request #4035 from thinkyhead/rc_lin_advance_feature
Patch LIN_ADVANCE to use code_value_float
|
2016-06-13 18:55:14 -07:00 |
|
|
Scott LahteineandGitHub
|
b708196770
|
Merge pull request #4032 from AnHardt/bootscreen-delay
Show bootscreen later
|
2016-06-13 18:27:05 -07:00 |
|
|
Scott LahteineandGitHub
|
587de1b6b6
|
Merge pull request #3676 from thinkyhead/rc_lin_advance_feature
Advance extrusion algorithm – LIN_ADVANCE
|
2016-06-13 18:04:58 -07:00 |
|
|
Scott LahteineandGitHub
|
738f414d2b
|
Merge pull request #4029 from tnw513/FixLangIt
Update to language_it.h
|
2016-06-13 18:01:51 -07:00 |
|
|
Scott LahteineandGitHub
|
17c86349c0
|
Merge pull request #4020 from thinkyhead/rc_test_M600
Fix Travis test for FILAMENTCHANGEENABLE
|
2016-06-12 18:50:26 -07:00 |
|
|
Scott LahteineandGitHub
|
b4c37a676f
|
Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e
Fix manual move for multiple extruders
|
2016-06-12 17:27:36 -07:00 |
|
|
Scott LahteineandGitHub
|
0d0b751498
|
Merge pull request #4023 from thinkyhead/rc_servo_macros
Add macros to move servos
|
2016-06-12 15:45:39 -07:00 |
|
|
Scott LahteineandGitHub
|
e51f8df097
|
Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond
No need to check ULTIPANEL with DOGLCD
|
2016-06-11 17:39:42 -07:00 |
|
|
Scott LahteineandGitHub
|
c7eeb09e8f
|
Merge pull request #4012 from Blue-Marlin/watchdoghealing
Heal the watchdog
|
2016-06-11 16:18:22 -07:00 |
|
|
Scott LahteineandGitHub
|
2f1bf8373b
|
Merge pull request #4005 from thinkyhead/rc_prepare_move_destination
Clarify names of prepare_move functions
|
2016-06-11 15:51:58 -07:00 |
|
|
Scott LahteineandGitHub
|
d50ba08246
|
Merge pull request #4011 from thinkyhead/rc_manual_move_cond
Wrap all items depending on ULTIPANEL
|
2016-06-11 15:26:52 -07:00 |
|
|
Scott LahteineandGitHub
|
ddbb05fd8d
|
Merge pull request #3998 from jbrazio/bugfix/better-regex
Improves travis buildroot regexp
|
2016-06-11 13:40:58 -07:00 |
|
|
Scott LahteineandGitHub
|
bf8710d522
|
Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL
manage_manual_move(); -> ULTIPANEL
|
2016-06-10 17:17:57 -07:00 |
|
|
Scott LahteineandGitHub
|
93ffa0288c
|
Merge pull request #4003 from jbrazio/bugfix/3999
Closes #3999: Compilation error with BEEPER_PIN -1
|
2016-06-10 17:15:23 -07:00 |
|
|
Scott LahteineandGitHub
|
e2d4919c01
|
Merge pull request #3991 from thinkyhead/rc_axis_units
Rename some vars to clarify their relationship to acceleration
|
2016-06-09 20:57:01 -07:00 |
|
|
Scott LahteineandGitHub
|
4a212f707b
|
Merge pull request #3993 from jbrazio/feature/update-travis
Update travis to test for ULTRA and DOG LCD options
|
2016-06-09 20:56:07 -07:00 |
|
|
Scott LahteineandGitHub
|
74060f17b7
|
Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer
New feature: Non blocking tone queue
|
2016-06-09 20:55:29 -07:00 |
|
|
Scott LahteineandGitHub
|
27d5794298
|
Merge pull request #3992 from thinkyhead/rc_pid_autotune_e_range
Throw an error in PID_autotune for E < -1
|
2016-06-09 20:07:27 -07:00 |
|
|
Scott Lahteine
|
26f8f54c56
|
Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin
Support inches, fahrenheit, and kelvin
|
2016-06-08 20:10:33 -07:00 |
|
|
Scott Lahteine
|
f0a5b7f0bc
|
Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration
Use memset in mbl.reset to save 58 bytes
|
2016-06-08 17:33:41 -07:00 |
|
|
Scott Lahteine
|
a569e89775
|
Merge pull request #3978 from thinkyhead/rc_planner_local_rename
Rename some auto/locals to avoid name conflict
|
2016-06-08 16:41:57 -07:00 |
|
|
Scott Lahteine
|
9b42658faf
|
Merge pull request #3983 from thinkyhead/rc_fix_ftostr
Cleanup and naming for number-to-string functions
|
2016-06-08 14:21:16 -07:00 |
|
|
Scott Lahteine
|
3d56b9d127
|
Merge pull request #3979 from thinkyhead/mbl_cell
MBL: cel => cell
|
2016-06-07 19:12:46 -07:00 |
|
|
Scott Lahteine
|
08a9bd017b
|
Merge pull request #3976 from petrzjunior/rc_lang_cz_160607
[Language] Update Czech 2016/06/07
|
2016-06-07 18:05:44 -07:00 |
|
|
Scott Lahteine
|
5e6fdbb4cb
|
Merge pull request #3963 from thinkyhead/rc_advance_steppers
Use e_steps[EXTRUDERS] instead of e_steps[4]
|
2016-06-05 02:46:06 -07:00 |
|
|
Scott Lahteine
|
4b3d5aec7a
|
Merge pull request #3110 from thinkyhead/rc_manual_moves
Alternative impl. of LCD-based manual movement
|
2016-06-05 02:45:39 -07:00 |
|
|
Scott Lahteine
|
43947072d5
|
Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2
SINGLENOZZLE: EXTRUDERS versus HOTENDS
|
2016-06-04 15:23:17 -07:00 |
|
|
Scott Lahteine
|
05868de195
|
Merge pull request #3958 from thinkyhead/rc_fix_3955
Fix a typo in #3955
|
2016-06-04 02:10:26 -07:00 |
|
|
Scott Lahteine
|
4bdcf3afe4
|
Merge pull request #3956 from thinkyhead/rc_mbl_single_axis_fix
MBL: Keep active when homing single axes (#3750)
|
2016-06-03 21:56:12 -07:00 |
|
|
Scott Lahteine
|
32f8300cc6
|
Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast
Improved LCD contrast handling
|
2016-06-03 17:08:41 -07:00 |
|
|
Scott Lahteine
|
9c87bf835c
|
Merge pull request #3947 from thinkyhead/rc_statics_stepper
Apply static to remaining Stepper methods
|
2016-06-03 17:08:15 -07:00 |
|
|
Scott Lahteine
|
08871d4d6e
|
Merge pull request #3950 from boelle/patch-3
last of missing defines added
|
2016-06-03 17:07:02 -07:00 |
|
|
Scott Lahteine
|
4e13cd3f35
|
Merge pull request #3955 from MagoKimbra/RCBugFix
Fix M428 width DELTA & SCARA
|
2016-06-03 15:50:37 -07:00 |
|
|
Scott Lahteine
|
2403a1cf9c
|
Merge pull request #3952 from rafacouto/RCBugFix
Galician language update.
|
2016-06-03 15:46:03 -07:00 |
|
|
Scott Lahteine
|
8529122af1
|
Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow
Raise the servo probe before stow outside ABL context
|
2016-06-03 15:45:36 -07:00 |
|
|
Scott Lahteine
|
0d793fb2be
|
Merge pull request #3939 from thinkyhead/rc_resume_get_position
set_current_position_from_planner() after stepper.quick_stop()
|
2016-06-02 17:25:51 -07:00 |
|
|
Scott Lahteine
|
663d2463dc
|
Merge pull request #3922 from thinkyhead/rc_statics_stepper
Apply static to Stepper class
|
2016-06-02 17:14:24 -07:00 |
|
|
Scott Lahteine
|
194185539d
|
Merge pull request #3925 from thinkyhead/rc_statics_planner
Apply static to Planner class
|
2016-06-02 17:14:04 -07:00 |
|
|
Scott Lahteine
|
3fd9b331f0
|
Merge pull request #3924 from thinkyhead/rc_statics_temperature
Apply static to Temperature class
|
2016-06-02 17:13:17 -07:00 |
|
|
Scott Lahteine
|
5b5270ab50
|
Merge pull request #3943 from thinkyhead/rc_contrast_adjust
Combine ST7565 / U8GLIB_NHD_C12864 items in dogm
|
2016-06-02 17:05:04 -07:00 |
|
|
Scott Lahteine
|
f331763eca
|
Merge pull request #3829 from thinkyhead/rc_fix_T_command
Fix bad movement in gcode_T when switching extruders
|
2016-05-31 19:36:18 -07:00 |
|
|
Scott Lahteine
|
67f816ff79
|
Merge pull request #3926 from thinkyhead/rc_statics_endstops
Drop FORCE_INLINE from endstops.h
|
2016-05-31 19:35:41 -07:00 |
|
|
Scott Lahteine
|
2bd4f33369
|
Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup
Remove excess allen key probe examples from configs
|
2016-05-31 19:18:21 -07:00 |
|
|
Scott Lahteine
|
1a01a44a94
|
Merge pull request #3936 from thinkyhead/rc_sav_mk1
Support for SAV_3DGLCD OLED LCD controller
|
2016-05-31 18:46:25 -07:00 |
|
|
Scott Lahteine
|
4770d7c346
|
Merge pull request #3933 from boelle/patch-2
added defines present in en but not in da
|
2016-05-31 18:42:38 -07:00 |
|
|
Scott Lahteine
|
c6c01eaaac
|
Merge pull request #3888 from thinkyhead/rc_slower_max31855
Slower SPI speed for MAX31855
|
2016-05-31 18:40:38 -07:00 |
|
|
Scott Lahteine
|
bc77670673
|
Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
|
2016-05-31 10:29:37 -07:00 |
|
|
Scott Lahteine
|
1582ed43bf
|
Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv
MBL: Move border macros to Configuration_adv.h
|
2016-05-30 18:15:50 -07:00 |
|
|
Scott Lahteine
|
c3df293fc6
|
Merge pull request #3923 from thinkyhead/rc_statics_endstops
Apply static to Endstops class
|
2016-05-30 16:48:23 -07:00 |
|
|
Scott Lahteine
|
02735fd500
|
Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak
Tiny calc_timer speedup
|
2016-05-30 16:47:03 -07:00 |
|
|
Scott Lahteine
|
ffe55c230d
|
Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
|
2016-05-30 11:20:14 -07:00 |
|
|
Scott Lahteine
|
5a8918c9ec
|
Merge pull request #3911 from epatel/marlin/mbl_3903_example_configs
MBL: Apply PR 3903 to example_configurations
|
2016-05-30 01:01:04 -07:00 |
|
|
Scott Lahteine
|
7ba8f2dbc3
|
Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers
Less greedy regex in travis helper scripts
|
2016-05-30 00:27:41 -07:00 |
|
|
Scott Lahteine
|
3861f1e0da
|
Merge pull request #3908 from jbrazio/bugfix/3826
Closes #3826: SD printing will now pause and stop the print counter
|
2016-05-30 00:08:57 -07:00 |
|
|
Scott Lahteine
|
8806c7bbcc
|
Merge pull request #3903 from epatel/marlin/mbl_negative_xy
MBL: Fix for negative x/y positions
|
2016-05-29 22:07:35 -07:00 |
|
|
Scott Lahteine
|
189e60db55
|
Merge pull request #3909 from thinkyhead/fix_array_inits
Fix some array initializations
|
2016-05-29 21:02:20 -07:00 |
|
|
Scott Lahteine
|
fe3122774a
|
Merge pull request #3806 from thinkyhead/rc_coreyz_support
Support for COREYZ. Fixes for COREXY, COREXZ
|
2016-05-26 18:50:43 -07:00 |
|
|
Scott Lahteine
|
30f6b84561
|
Merge pull request #3812 from thinkyhead/rc_mbl_index_finders
Two index finding functions for MBL
|
2016-05-23 15:54:37 -07:00 |
|
|
Scott Lahteine
|
89e630b2fb
|
Merge pull request #3808 from thinkyhead/rc_singlenozzle
SINGLENOZZLE
|
2016-05-23 15:52:19 -07:00 |
|
|
Scott Lahteine
|
678cbad76a
|
Merge pull request #3819 from jbrazio/bugfix/followup-3813
Followup for #3813
|
2016-05-23 13:56:11 -07:00 |
|
|
Scott Lahteine
|
6cdae35261
|
Merge pull request #3822 from jbrazio/cleanup/hires-logo
Cleanup the Marlin logo with a hires svg version
|
2016-05-23 13:55:42 -07:00 |
|
|
Scott Lahteine
|
714d526614
|
Merge pull request #3828 from AnHardt/hw-endstops-default
Correct hardware endstops default
|
2016-05-23 13:55:02 -07:00 |
|
|
Scott Lahteine
|
f9b4b90058
|
Merge pull request #3813 from jbrazio/bugfix/3809
Stopwatch and PrintCounter improvements
|
2016-05-21 18:33:57 -07:00 |
|