  Scott LahteineandGitHub
|
6121c9018a
|
Merge pull request #4265 from thinkyhead/rc_buzzer_patchup
Two strategies to address a stuck buzzer
|
2016-07-10 19:46:15 -07:00 |
|
|
Scott LahteineandGitHub
|
4a100c6832
|
Merge pull request #4250 from AnHardt/wait-for-cooling-slope
Adjust wait_for_cooling slope
|
2016-07-10 19:45:23 -07:00 |
|
|
Scott LahteineandGitHub
|
ed018c98d5
|
Merge pull request #4024 from thinkyhead/rc_greek_language
Greek Language by @psavva
|
2016-07-10 19:42:09 -07:00 |
|
|
Scott LahteineandGitHub
|
167f4aa0cc
|
Merge pull request #4259 from clexpert/patch-3
Update language_cz.h
|
2016-07-10 18:26:23 -07:00 |
|
|
Scott LahteineandGitHub
|
8dda05e92a
|
Merge pull request #4258 from clexpert/patch-2
Total print time for LCD correction (hours:minutes format)
|
2016-07-10 18:25:18 -07:00 |
|
|
Scott LahteineandGitHub
|
0ccc5d1dd9
|
Merge pull request #4244 from thinkyhead/rc_dyze_thermistor_diff
Dyze High Temp Thermistor Support
|
2016-07-10 18:08:44 -07:00 |
|
|
Scott LahteineandGitHub
|
5b0e46c986
|
Merge pull request #4256 from thinkyhead/rc_fix_singlenozzle_temp
Additional tweaks for HOTENDS == 1
|
2016-07-10 17:57:00 -07:00 |
|
|
Scott LahteineandGitHub
|
5b87deebb6
|
Merge pull request #4257 from esenapaj/Follow-up-the-PR-#4253-etc
Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104), etc
|
2016-07-10 16:59:24 -07:00 |
|
|
Scott LahteineandGitHub
|
77283f5bf0
|
Merge pull request #4245 from thinkyhead/rc_simpler_therm_check
Simpler/extensible thermistor test in thermistortables.h
|
2016-07-09 21:13:42 -07:00 |
|
|
Scott LahteineandGitHub
|
f9e08b1fcd
|
Merge pull request #4254 from AnHardt/killscreen
Add a kill-screen
|
2016-07-09 20:44:42 -07:00 |
|
|
Scott LahteineandGitHub
|
3b3e52616c
|
Merge pull request #4253 from thinkyhead/rc_clexpert_runout
Runout Sensor without SD Card, Print Timer support in M104
|
2016-07-09 19:10:36 -07:00 |
|
|
Scott LahteineandGitHub
|
aa3ab93971
|
Merge pull request #4240 from AnHardt/sampler-8-7-16
Today's fix and cleanup collection
|
2016-07-09 19:09:45 -07:00 |
|
|
Scott LahteineandGitHub
|
c23dd7eefc
|
Merge pull request #4241 from AnHardt/adTXbuffer3
Add TX-buffer for MarlinSerial
|
2016-07-08 18:34:53 -07:00 |
|
|
Scott LahteineandGitHub
|
98d0167a57
|
Merge pull request #4226 from thinkyhead/rc_emergency_command_parser
MarlinSerial emergency-command parser (with M108)
|
2016-07-07 16:53:55 -07:00 |
|
|
Scott LahteineandGitHub
|
9f42b1a075
|
Merge pull request #4235 from thinkyhead/rc_revert_quickhome_test
Fix quick homing, tweak MIN_Z_HEIGHT_FOR_HOMING
|
2016-07-07 13:37:14 -07:00 |
|
|
Scott LahteineandGitHub
|
ad968f2325
|
Merge pull request #4234 from thinkyhead/rc_better_position_logging
Move XYZ in print_xyz and DEBUG_POS to the front
|
2016-07-07 12:31:15 -07:00 |
|
|
Scott LahteineandGitHub
|
4e84c803a3
|
Merge pull request #4232 from thinkyhead/rc_no_axis_codes_needed
Don't use axis_codes if a literal will do
|
2016-07-06 20:05:16 -07:00 |
|
|
Scott LahteineandGitHub
|
e76aa9d79a
|
Merge pull request #4231 from thinkyhead/rc_fix_homing_raise
Fix comment on Z raise for homing, save a few bytes
|
2016-07-06 16:23:29 -07:00 |
|
|
Scott LahteineandGitHub
|
799c60cadc
|
Merge pull request #4217 from thinkyhead/rc_fix_homing_raise
Don't do_probe_raise with MIN_Z_HEIGHT_FOR_HOMING
|
2016-07-06 14:39:37 -07:00 |
|
|
Scott LahteineandGitHub
|
99a5a5dd65
|
Merge pull request #4228 from petrzjunior/patch-1
[LANGUAGE] Update Czech (filament change and info)
|
2016-07-06 14:00:31 -07:00 |
|
|
Scott LahteineandGitHub
|
7735ec5e7a
|
Merge pull request #4223 from thinkyhead/rc_rename_heatup
Change cancel_heatup to wait_for_heatup
|
2016-07-06 11:25:44 -07:00 |
|
|
Scott LahteineandGitHub
|
cb17871a48
|
Merge pull request #4207 from AnHardt/AllenKey2
Clean up, simplify and generalize the Allen-key-probe code.
|
2016-07-05 19:34:36 -07:00 |
|
|
Scott LahteineandGitHub
|
90d8bb53e8
|
Merge pull request #4214 from thinkyhead/fix_clear_command_queue
Allow the command queue to be cleared by commands, lcd menus
|
2016-07-05 16:35:55 -07:00 |
|
|
Scott LahteineandGitHub
|
c450851401
|
Merge pull request #4209 from AnHardt/too-high-G28
Make raise for probe deploy relative in homeaxis()
|
2016-07-05 11:07:42 -07:00 |
|
|
Scott LahteineandGitHub
|
e48502866b
|
Merge pull request #3611 from alephobjects/M108_cancel_heatup
Introduce M108 cancel wait for heatup/cooldown of the hotend and bed
|
2016-07-04 01:19:31 -07:00 |
|
|
Scott LahteineandGitHub
|
d70197f514
|
Merge pull request #4204 from thinkyhead/rc_fix_gcode_t_position
Additional patches for gcode_T position change
|
2016-07-04 01:16:22 -07:00 |
|
|
Scott LahteineandGitHub
|
869b517589
|
Merge pull request #4205 from thinkyhead/rc_fixup_unit_references
References to millimeters in code comments need an update
|
2016-07-04 01:15:34 -07:00 |
|
|
Scott LahteineandGitHub
|
e604c0955e
|
Merge pull request #4203 from AnHardt/rem_wants_to_cool_warning
Remove wants_to_cool uninitialized warning
|
2016-07-03 18:24:23 -07:00 |
|
|
Scott LahteineandGitHub
|
60865fc45b
|
Merge pull request #4202 from thinkyhead/rc_fix_gcode_t_position
Fix position adjustment with gcode_T and MBL
|
2016-07-03 17:55:43 -07:00 |
|
|
Scott LahteineandGitHub
|
f841038313
|
Merge pull request #4201 from thinkyhead/rc_info_fit
Shorter labels for Print Stats info
|
2016-07-03 17:47:00 -07:00 |
|
|
Scott LahteineandGitHub
|
a8f5c2bf96
|
Merge pull request #4192 from birkett/k8400
Add Velleman K8400 board support.
|
2016-07-03 17:41:13 -07:00 |
|
|
Scott LahteineandGitHub
|
4fff9872b9
|
Merge pull request #4200 from thinkyhead/rc_cleanup_m600
Fix compiler warnings for static screens
|
2016-07-03 15:44:20 -07:00 |
|
|
Scott LahteineandGitHub
|
5a81c132a2
|
Merge pull request #4199 from lrpirlet/G28_X_drills_a_hole_in_printed_part
apply correction when swtiching from MBL to physical in G28 X
|
2016-07-03 13:37:38 -07:00 |
|
|
Scott LahteineandGitHub
|
1236a3b3ab
|
Merge pull request #4189 from esenapaj/Follow-up-the-PR-#3662
Follow-up the PR #3662 (Rewritten FILAMENT_CHANGE_ENABLE feature)
|
2016-07-02 17:16:09 -07:00 |
|
|
Scott LahteineandGitHub
|
b37e727072
|
Merge pull request #3662 from thinkyhead/rc_fixup_auto_filament_change
Rewritten FILAMENT_CHANGE_ENABLE feature
|
2016-07-02 16:20:20 -07:00 |
|
|
Scott LahteineandGitHub
|
4a8e191cec
|
Merge pull request #4188 from thinkyhead/rc_birkett_info_menu_jul2
Printer information menu
|
2016-07-02 15:30:00 -07:00 |
|
|
Scott LahteineandGitHub
|
77a923d8ce
|
Merge pull request #4186 from thinkyhead/rc_array_macros
Simplified variable-size array macros
|
2016-07-01 20:48:12 -07:00 |
|
|
Scott LahteineandGitHub
|
ac4f235912
|
Merge pull request #4167 from thinkyhead/rc_eeprom_checksum
EEPROM Checksum
|
2016-07-01 19:22:49 -07:00 |
|
|
Scott LahteineandGitHub
|
ba00615aa4
|
Merge pull request #4184 from esenapaj/Tab-to-Space
Tab to Space
|
2016-07-01 16:34:12 -07:00 |
|
|
Scott LahteineandGitHub
|
b4fee31a84
|
Merge pull request #4183 from AnHardt/do_probe_raise-asymetry
Unconditional do_probe_raise() in probe_pt()
|
2016-07-01 12:50:47 -07:00 |
|
|
Scott LahteineandGitHub
|
7ef7843fd4
|
Merge pull request #4181 from thinkyhead/rc_rename_a_move_func
Do interpolated moves for Allen Key deploy/stow
|
2016-06-30 16:30:09 -07:00 |
|
|
Scott LahteineandGitHub
|
725fde8b26
|
Merge pull request #4169 from thinkyhead/rc_wait_but_break
Allow wait-for-cooling, break at threshold or if cooling stalls
|
2016-06-30 16:13:51 -07:00 |
|
|
Scott LahteineandGitHub
|
b6b3a4afbf
|
Merge pull request #4168 from thinkyhead/rc_viki2_for_ramps
Support for VIKI2 in RAMPS and derivatives
|
2016-06-30 01:48:50 -07:00 |
|
|
Scott LahteineandGitHub
|
3d9472f305
|
Merge pull request #4173 from thinkyhead/rc_cleanup_runout
Cleanup extruder runout configs
|
2016-06-30 01:47:40 -07:00 |
|
|
Scott LahteineandGitHub
|
bf216bd78f
|
Merge pull request #4165 from thinkyhead/rc_rumba_temp_pins
Always define temp sensor, heater pins for RUMBA
|
2016-06-28 18:20:37 -07:00 |
|
|
Scott LahteineandGitHub
|
db19959735
|
Merge pull request #4161 from thinkyhead/rc_general_cleanup
Reduce storage requirements for strings, make some PGM
|
2016-06-27 20:46:26 -07:00 |
|
|
Scott LahteineandGitHub
|
ee876dcd7a
|
Merge pull request #4159 from thinkyhead/rc_rigidbot_diff
Rigidbot V2 support - has MCP4728 digipot
|
2016-06-27 20:35:22 -07:00 |
|
|
Scott LahteineandGitHub
|
fdb6533730
|
Merge pull request #4162 from thinkyhead/rc_anhardt_sled3
Simplify dock_sled() and some more probe tweaks
|
2016-06-27 20:25:36 -07:00 |
|
|
Scott LahteineandGitHub
|
1df63b7ef4
|
Merge pull request #4158 from thinkyhead/rc_has_lcd_contrast
CARTESIO_UI has lcd contrast
|
2016-06-27 12:24:02 -07:00 |
|
|
Scott LahteineandGitHub
|
71a693b3ec
|
Merge pull request #4154 from thinkyhead/rc_probe_raise_options
Use Z_RAISE_BETWEEN_PROBINGS with MBL
|
2016-06-26 16:03:42 -07:00 |
|
|
Scott LahteineandGitHub
|
eb1755208f
|
Merge pull request #4153 from thinkyhead/rc_probe_raise_options
Combine Z raise before/after options
|
2016-06-26 15:30:08 -07:00 |
|
|
Scott LahteineandGitHub
|
9caa8941e2
|
Merge pull request #4149 from thinkyhead/rc_minimum_raise_in_probe_pt
Ensure a minimum height before XY move in probe_pt
|
2016-06-25 19:35:58 -07:00 |
|
|
Scott LahteineandGitHub
|
815000ff32
|
Merge pull request #4148 from thinkyhead/3drag_delay_anhardt
Fix up delays in ST7920_SWSPI_SND_8BIT
|
2016-06-25 19:16:37 -07:00 |
|
|
Scott LahteineandGitHub
|
ca184d3d72
|
Merge pull request #4147 from thinkyhead/rc_fix_M48_raise
Fix debug output in probe_pt
|
2016-06-25 18:15:33 -07:00 |
|
|
Scott LahteineandGitHub
|
e72bd68eaf
|
Merge pull request #4146 from epatel/epatel/max_z_endstop
MBL: Add support for max z endstop
|
2016-06-25 18:05:02 -07:00 |
|
|
Scott LahteineandGitHub
|
c8a9829387
|
Merge pull request #4140 from thinkyhead/rc_button_reliability
Always do a brief delay in `lcd_quick_feedback`
|
2016-06-24 20:05:56 -07:00 |
|
|
Scott LahteineandGitHub
|
7de7552069
|
Merge pull request #4133 from MagoKimbra/Single_home_axis_delta
Single home Axis Delta need simple sync_plan_position
|
2016-06-23 21:14:22 -07:00 |
|
|
Scott LahteineandGitHub
|
de0e6d5f13
|
Merge pull request #4134 from thinkyhead/rc_followup_4021
Additional cleanup to probing/leveling
|
2016-06-23 20:55:49 -07:00 |
|
|
Scott LahteineandGitHub
|
61f34eec03
|
Merge pull request #4125 from jbrazio/bugfix/planner-warning
Fixes some compiler warnings
|
2016-06-22 19:34:37 -07:00 |
|
|
Scott LahteineandGitHub
|
bdcd628896
|
Merge pull request #4126 from thinkyhead/rc_lin_timing_patch
Patch LIN_ADVANCE timing issue
|
2016-06-22 19:24:44 -07:00 |
|
|
Scott LahteineandGitHub
|
6e5e388861
|
Merge pull request #4021 from thinkyhead/rc_raise_z_for_servos
Make probes independent of leveling
|
2016-06-22 19:10:37 -07:00 |
|
|
Scott LahteineandGitHub
|
f30df89ee1
|
Merge pull request #4122 from thinkyhead/rc_xy_travel_feedrate
Make XY Probe (travel) Speed available in G28
|
2016-06-22 03:18:54 -07:00 |
|
|
Scott LahteineandGitHub
|
937123ab32
|
Merge pull request #4119 from thinkyhead/fix_stepper_compile_error
Fix stepper compile error with motor_current_setting
|
2016-06-21 20:25:27 -07:00 |
|
|
Scott LahteineandGitHub
|
111260f407
|
Merge pull request #4118 from thinkyhead/bq_update_rebase
Update bq Hephestos 2 config
|
2016-06-21 18:18:48 -07:00 |
|
|
Scott LahteineandGitHub
|
b0e47608e6
|
Merge pull request #4108 from esenapaj/Fix-for-PR-#4093
Fix for PR #4093 (Make Z Probe options independent of ABL), etc
|
2016-06-21 18:12:08 -07:00 |
|
|
Scott LahteineandGitHub
|
c84732e605
|
Merge pull request #4111 from esenapaj/Cosmetic-changes-and-small-fix-for-thermistortables.h
Cosmetic changes and small fix for thermistortables.h
|
2016-06-21 18:05:32 -07:00 |
|
|
Scott LahteineandGitHub
|
cdc661ea5e
|
Merge pull request #4110 from esenapaj/Small-cosmetic-changes-for-language-files
Small cosmetic changes for language files
|
2016-06-21 18:04:12 -07:00 |
|
|
Scott LahteineandGitHub
|
c8186e9423
|
Merge pull request #4109 from esenapaj/Enclose-#error-string-by-double-quotes
Enclose #error string by double-quotes
|
2016-06-21 18:03:30 -07:00 |
|
|
Scott LahteineandGitHub
|
d8dcc4ac57
|
Merge pull request #4117 from thinkyhead/rc_i2c_comment_fix
Fix comments on EXPERIMENTAL_I2CBUS
|
2016-06-21 18:00:36 -07:00 |
|
|
Scott LahteineandGitHub
|
67750d73ef
|
Merge pull request #4107 from thinkyhead/rc_fixup_M48_config
Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST
|
2016-06-21 14:56:35 -07:00 |
|
|
Scott LahteineandGitHub
|
71a7408012
|
Merge pull request #4106 from thinkyhead/rc_temp_compile_err
Fix compile error with watch_bed_next_ms
|
2016-06-21 02:48:46 -07:00 |
|
|
Scott LahteineandGitHub
|
5e469622c9
|
Merge pull request #4105 from thinkyhead/rc_combine_probe_blocks
Move raise_z_after_probing into earlier block
|
2016-06-21 02:14:38 -07:00 |
|
|
Scott LahteineandGitHub
|
71534dc11f
|
Merge pull request #4100 from thinkyhead/rc_z_deploy
Use deploy/stow with FIX_MOUNTED_PROBE too
|
2016-06-21 00:40:48 -07:00 |
|
|
Scott LahteineandGitHub
|
524f6d9bd6
|
Merge pull request #4096 from thinkyhead/rc_always_raise_servo
Always raise Z (if needed) for servo deploy/stow
|
2016-06-19 20:40:06 -07:00 |
|
|
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 |
|