  Scott LahteineandGitHub
|
e6e4d4062d
|
Merge pull request #4357 from thinkyhead/rc_fix_keypad_issues
Fix some Reprapworld Keypad issues
|
2016-07-19 17:31:37 -07:00 |
|
|
Scott LahteineandGitHub
|
5d5affdfca
|
Merge pull request #4355 from thinkyhead/rc_rename_ultralcd_files
Rename ultralcd implementation files for consistency
|
2016-07-19 16:14:27 -07:00 |
|
|
Scott LahteineandGitHub
|
bb225dedc6
|
Merge pull request #4354 from thinkyhead/rc_jbrazio_rework_g12
NOZZLE_CLEAN_FEATURE with no dependency on HAS_BED_PROBE
|
2016-07-19 15:26:59 -07:00 |
|
|
Scott LahteineandGitHub
|
f1f1bac0e1
|
Merge pull request #4341 from esenapaj/Update-Japanese-translation
Update Japanese translation
|
2016-07-19 15:04:22 -07:00 |
|
|
Scott LahteineandGitHub
|
6c899bb520
|
Merge pull request #4349 from jbrazio/gcc-bark-bark
Removes some minor GCC warnings
|
2016-07-19 13:42:33 -07:00 |
|
|
Scott LahteineandGitHub
|
ef0a22871e
|
Merge pull request #4350 from jbrazio/followup-a875861
Adds utility.h
|
2016-07-19 13:40:52 -07:00 |
|
|
Scott LahteineandGitHub
|
9eba58a031
|
Merge pull request #4351 from jbrazio/u8glib-converter
Updates u8glib's bmp2hex converter
|
2016-07-19 13:39:33 -07:00 |
|
|
Scott LahteineandGitHub
|
c502018eab
|
Merge pull request #4353 from jbrazio/global-enum-file
General cleanup: enum
|
2016-07-19 13:37:56 -07:00 |
|
|
Scott LahteineandGitHub
|
0f9953b031
|
Merge pull request #4342 from AnHardt/rep-cons-g28
Introduce line_to_axis_pos() for use in homeaxis()
|
2016-07-19 12:56:58 -07:00 |
|
|
Scott LahteineandGitHub
|
d76389b4d1
|
Merge pull request #4340 from esenapaj/Follow-up-the-PR-#4335
Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)
|
2016-07-19 12:43:50 -07:00 |
|
|
Scott LahteineandGitHub
|
46117593b9
|
Merge pull request #4185 from esenapaj/Update-Japanese-translation
Update Japanese translation (work in progress)
|
2016-07-17 18:36:34 -07:00 |
|
|
Scott LahteineandGitHub
|
3422103863
|
Merge pull request #4310 from thinkyhead/rc_mbl_position_shift
Fix position shift with MBL
|
2016-07-17 18:31:25 -07:00 |
|
|
Scott LahteineandGitHub
|
92757bd7b3
|
Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163
Follow-up the PR #4163 (Mixing and Switching Extruders)
|
2016-07-17 18:15:23 -07:00 |
|
|
Scott LahteineandGitHub
|
cbf9fa7995
|
Merge pull request #4338 from thinkyhead/rc_anhardt_58
Use blocking_move, current_position in G28 homing
|
2016-07-17 18:12:40 -07:00 |
|
|
Scott LahteineandGitHub
|
f242aea032
|
Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you
Wrangle feed rate variables
|
2016-07-17 14:07:52 -07:00 |
|
|
Scott LahteineandGitHub
|
0342661b3f
|
Merge pull request #4335 from thinkyhead/rc_status_pad_jp
Debug char, fix compile errors for lcd pins
|
2016-07-17 14:07:08 -07:00 |
|
|
Scott LahteineandGitHub
|
81e01152bb
|
Merge pull request #4336 from thinkyhead/rc_bltouch_sensor
BLTouch probe sensor
|
2016-07-17 14:06:32 -07:00 |
|
|
Scott LahteineandGitHub
|
d8c8d0a6a2
|
Merge pull request #4337 from thinkyhead/rc_inverts_as_macros
Endstop invert flags as macros instead of const bool
|
2016-07-17 14:06:10 -07:00 |
|
|
Scott LahteineandGitHub
|
253f843da5
|
Merge pull request #4306 from thinkyhead/rc_stupid_name_okbai
ENDSTOPS_ONLY_FOR_HOMING is confusing
|
2016-07-17 13:50:19 -07:00 |
|
|
Scott LahteineandGitHub
|
889570029a
|
Merge pull request #4332 from esenapaj/Update-URL
Update URL in createTemperatureLookupMarlin.py
|
2016-07-17 12:29:55 -07:00 |
|
|
Scott LahteineandGitHub
|
c3cc24242c
|
Merge pull request #4330 from thinkyhead/rc_debug_g28_more
Debugging of MBL in G28
|
2016-07-17 11:36:19 -07:00 |
|
|
Scott LahteineandGitHub
|
f8973a7cec
|
Merge pull request #4163 from thinkyhead/rc_new_extruders_diff
Mixing and Switching Extruders
|
2016-07-17 11:05:03 -07:00 |
|
|
Scott LahteineandGitHub
|
9766e24504
|
Merge pull request #4277 from thinkyhead/rc_mks_13_viki2
Support for VIKI2 with MKS 1.3 / 1.4
|
2016-07-16 23:49:33 -07:00 |
|
|
Scott LahteineandGitHub
|
02285662f5
|
Merge pull request #4298 from jbrazio/feature/filament-counter
Adds filamentUsed and longestPrint stats to PrintCounter
|
2016-07-16 23:48:46 -07:00 |
|
|
Scott LahteineandGitHub
|
bf16ae5a70
|
Merge pull request #4299 from jbrazio/feature/g27-park-nozzle
Implements park nozzle feature
|
2016-07-16 23:47:12 -07:00 |
|
|
Scott LahteineandGitHub
|
aaa0d298b9
|
Merge pull request #4326 from thinkyhead/rc_no_static_items_fix
Suppress compiler warnings in ultralcd.cpp
|
2016-07-16 23:38:08 -07:00 |
|
|
Scott LahteineandGitHub
|
cc3ef73583
|
Merge pull request #4327 from thinkyhead/rc_petrzjr_long_print
LCD Longer print
|
2016-07-16 23:37:34 -07:00 |
|
|
Scott LahteineandGitHub
|
77c8fb627f
|
Merge pull request #4329 from thinkyhead/rc_italian_fix
Added missing Italian translations
|
2016-07-16 23:37:15 -07:00 |
|
|
Scott LahteineandGitHub
|
b14888501b
|
Merge pull request #4301 from Ingramz/RCBugFix
Add Cartesio CN Controls V11
|
2016-07-16 22:35:07 -07:00 |
|
|
Scott LahteineandGitHub
|
0f3232065e
|
Merge pull request #4305 from jbrazio/feature/splash-improvement
Custom boot screen feature improvement
|
2016-07-16 21:59:39 -07:00 |
|
|
Scott LahteineandGitHub
|
ed468e848f
|
Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287
Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
|
2016-07-16 17:14:21 -07:00 |
|
|
Scott LahteineandGitHub
|
e563634a25
|
Merge pull request #4314 from AnHardt/use-d_b_m_t-in-g28
Use do_blicking_move_to*() in G28
|
2016-07-15 20:22:02 -07:00 |
|
|
Scott LahteineandGitHub
|
59ae1811c2
|
Merge pull request #4303 from AnHardt/delta-g28
DELTA: Move out of the clip-zone after G28
|
2016-07-15 20:20:22 -07:00 |
|
|
Scott LahteineandGitHub
|
ead155399f
|
Merge pull request #4311 from jbrazio/bugfix/print_xyz-overflow
Fixes an PSTR overflow with print_xyz()
|
2016-07-15 20:08:09 -07:00 |
|
|
Scott LahteineandGitHub
|
cec7110409
|
Merge pull request #4308 from thinkyhead/rc_debug_gcode_t
Added logging related to gcode_T
|
2016-07-14 19:46:33 -07:00 |
|
|
Scott LahteineandGitHub
|
6446d3939a
|
Merge pull request #4309 from thinkyhead/rc_static_item_fix_77
Fix skipping of static items
|
2016-07-14 19:28:49 -07:00 |
|
|
Scott LahteineandGitHub
|
84bf58db72
|
Merge pull request #4307 from jbrazio/feature/movement-unleash
Remove do_blocking_move_*() dependency on HAS_BED_PROBE
|
2016-07-14 19:23:30 -07:00 |
|
|
Scott LahteineandGitHub
|
8bf6861af8
|
Merge pull request #4054 from jbrazio/feature/g12-clean-tool
Implements clean nozzle feature (Lulzbot's REWIPE)
|
2016-07-14 14:38:38 -07:00 |
|
|
Scott LahteineandGitHub
|
75901b616c
|
Merge pull request #4287 from thinkyhead/rc_long_print_times
Allow stopwatch and printcounter to go over 18:12:15
|
2016-07-14 12:14:15 -07:00 |
|
|
Scott LahteineandGitHub
|
6080924589
|
Merge pull request #4296 from jbrazio/feature/bqh2-update
Update the bq Hephestos 2 configuration
|
2016-07-13 13:18:09 -07:00 |
|
|
Scott LahteineandGitHub
|
ed89c71e53
|
Merge pull request #4291 from esenapaj/Follow-up-the-PR-#4278
Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1)
|
2016-07-13 13:17:03 -07:00 |
|
|
Scott LahteineandGitHub
|
f23689d9f1
|
Merge pull request #4292 from esenapaj/Follow-up-the-PR-#4252
Follow-up the PR #4252 (Replace PLA/ABS preheating with generic)
|
2016-07-13 13:16:30 -07:00 |
|
|
Scott LahteineandGitHub
|
4f77adddbe
|
Merge pull request #4286 from thinkyhead/rc_debug_clean
Prefix and suffix in debug output
|
2016-07-12 20:49:15 -07:00 |
|
|
Scott LahteineandGitHub
|
e5c7af5ddc
|
Merge pull request #4222 from thinkyhead/rc_allow_cold_extrude
M302: Add "P" parameter, status output
|
2016-07-12 20:40:14 -07:00 |
|
|
Scott LahteineandGitHub
|
2224032568
|
Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine
No delay for the smallest LCD moves
|
2016-07-12 20:16:38 -07:00 |
|
|
Scott LahteineandGitHub
|
a5bae3c7d5
|
Merge pull request #4229 from blubbfish/patch-1
Update language_de.h for German translation
|
2016-07-12 20:01:46 -07:00 |
|
|
Scott LahteineandGitHub
|
a8b6b6a128
|
Merge pull request #4252 from thinkyhead/rc_rename_hpb
Replace PLA/ABS preheating with generic
|
2016-07-12 20:00:33 -07:00 |
|
|
Scott LahteineandGitHub
|
2b9515d60f
|
Merge pull request #4281 from AnHardt/lang-system
Don't use UTF-strlen() if the text is not UTF
|
2016-07-12 17:21:28 -07:00 |
|
|
Scott LahteineandGitHub
|
973a669aa3
|
Merge pull request #4264 from thinkyhead/rc_ultralcd_encoder_pos
Remove extraneous conditions for encoder position
|
2016-07-12 16:54:13 -07:00 |
|
|
Scott LahteineandGitHub
|
7c81398f95
|
Merge pull request #4279 from esenapaj/Follow-up-the-PR-#4271
Follow-up the PR #4271 (X_DUAL_STEPPER_DRIVERS)
|
2016-07-12 16:39:37 -07:00 |
|
|
Scott LahteineandGitHub
|
0554b65d22
|
Merge pull request #4284 from thinkyhead/rc_serial_ln_macros
Sled-probe sanity fix, conditionals for remaining types of leveling
|
2016-07-12 16:36:33 -07:00 |
|
|
Scott LahteineandGitHub
|
47d55513ec
|
Merge pull request #4280 from AnHardt/msg-file-upload
Finalalize MSG_SD_WRITE_TO_FILE message with a \n
|
2016-07-12 13:02:52 -07:00 |
|
|
Scott LahteineandGitHub
|
a1de96d152
|
Merge pull request #4278 from thinkyhead/rc_more_hotends_1
Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1
|
2016-07-12 10:36:13 -07:00 |
|
|
Scott LahteineandGitHub
|
4865447830
|
Merge pull request #4276 from esenapaj/Suppress-warnings
Suppress warnings
|
2016-07-11 19:08:59 -07:00 |
|
|
Scott LahteineandGitHub
|
815df28b0b
|
Merge pull request #4274 from esenapaj/Follow-up-the-PR-#4024
Follow-up the PR #4024 (Greek Language by @psavva)
|
2016-07-11 19:04:44 -07:00 |
|
|
Scott LahteineandGitHub
|
44f739a5eb
|
Merge pull request #4273 from esenapaj/Fix-for-the-PR-#4256
Fix for the PR #4256 (Additional tweaks for HOTENDS == 1)
|
2016-07-11 19:02:45 -07:00 |
|
|
Scott LahteineandGitHub
|
02f711fe00
|
Merge pull request #4275 from AnHardt/dont-deploy
Don't deploy/stow the probe if z-min-endstop is used for homing
|
2016-07-11 18:46:23 -07:00 |
|
|
Scott LahteineandGitHub
|
6a45aad893
|
Merge pull request #4272 from AnHardt/m100-rep
Repair M100
|
2016-07-11 18:45:13 -07:00 |
|
|
Scott LahteineandGitHub
|
243ad4312a
|
Merge pull request #4271 from thinkyhead/rc_X_DUAL_STEPPER_DRIVERS
X_DUAL_STEPPER_DRIVERS
|
2016-07-11 18:38:45 -07:00 |
|
|
Scott LahteineandGitHub
|
6e68dd292b
|
Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling
Improve STATIC_ITEM implementation
|
2016-07-11 18:25:00 -07:00 |
|
|
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 |
|