  Scott LahteineandGitHub
|
bfbd01e29a
|
Merge pull request #4470 from thinkyhead/rc_fix_manual_move
Followup to #4468
|
2016-07-30 04:17:05 -07:00 |
|
|
Scott LahteineandGitHub
|
802d873fc1
|
Merge pull request #4469 from esenapaj/Fix-for-PR-#4453
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
|
2016-07-30 04:08:54 -07:00 |
|
|
Scott LahteineandGitHub
|
8e2f095dde
|
Merge pull request #4456 from jbrazio/speaker-type3
Improvement to non-blocking speaker
|
2016-07-30 04:07:08 -07:00 |
|
|
Scott LahteineandGitHub
|
2f76138645
|
Merge pull request #4468 from thinkyhead/rc_fix_manual_move
Specify manual-movable E axes by extruder type
|
2016-07-30 03:21:43 -07:00 |
|
|
Scott LahteineandGitHub
|
46c33f1cfa
|
Merge pull request #4467 from jbrazio/safe_delay-millis_t
Makes safe_delay() to be fully compatible with delay()
|
2016-07-29 20:23:44 -07:00 |
|
|
Scott LahteineandGitHub
|
9e21b2e51d
|
Merge pull request #4455 from AnHardt/double-bump-feature
double bump probing as a feature
|
2016-07-29 20:00:10 -07:00 |
|
|
Scott LahteineandGitHub
|
db4d03bc81
|
Merge pull request #4452 from thinkyhead/rc_fix_heaterstates_part_2
Additional heater-state output changes
|
2016-07-29 19:58:00 -07:00 |
|
|
Scott LahteineandGitHub
|
c68ca95345
|
Merge pull request #4464 from thinkyhead/rc_fix_steps_per_mm_handling
Account for DELTA in Planner::refresh_positioning
|
2016-07-29 19:34:59 -07:00 |
|
|
Scott LahteineandGitHub
|
c677d2ac56
|
Merge pull request #4453 from thinkyhead/rc_better_manual_home
Improved MANUAL_[XYZ]_HOME_POS
|
2016-07-28 20:09:33 -07:00 |
|
|
Scott LahteineandGitHub
|
1734de4d4e
|
Merge pull request #4447 from thinkyhead/rc_fix_heaterstates
Fix output of heater states
|
2016-07-28 17:51:11 -07:00 |
|
|
Scott LahteineandGitHub
|
9083e5420a
|
Merge pull request #4419 from AnHardt/sd2pinmap
Switch Sd2CardLib to fastio
|
2016-07-28 17:38:46 -07:00 |
|
|
Scott LahteineandGitHub
|
6f59560526
|
Merge pull request #4448 from jbrazio/speaker-followup
A little cleanup at speaker.h
|
2016-07-28 17:37:36 -07:00 |
|
|
Scott LahteineandGitHub
|
5d8d18d03d
|
Merge pull request #4451 from thinkyhead/rc_arduino_160_minimum
Prevent compiling with old Arduino sooner
|
2016-07-28 17:37:10 -07:00 |
|
|
Scott LahteineandGitHub
|
256b03598d
|
Merge pull request #4450 from thinkyhead/rc_fix_delta_optimization
Fix DELTA speed calculation
|
2016-07-28 16:50:04 -07:00 |
|
|
Scott LahteineandGitHub
|
ae1c7bca1b
|
Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
|
2016-07-28 15:55:30 -07:00 |
|
|
Scott LahteineandGitHub
|
5367d56f87
|
Merge pull request #4434 from thinkyhead/rc_delta_safe_homing
DELTA should ignore Z_SAFE_HOMING
|
2016-07-27 23:41:52 -07:00 |
|
|
Scott LahteineandGitHub
|
dc3d2b50cd
|
Merge pull request #4426 from thinkyhead/rc_probeless_safe_homing
Allow Z_SAFE_HOMING without a probe
|
2016-07-27 05:12:33 -07:00 |
|
|
Scott LahteineandGitHub
|
9f1dd6d431
|
Merge pull request #4420 from thinkyhead/rc_allow_no_deploy_raise
Allow zero raise for deploy/stow
|
2016-07-26 17:21:51 -07:00 |
|
|
Scott LahteineandGitHub
|
54084612fd
|
Merge pull request #4415 from petrzjunior/transl
[LANGUAGE] Update Czech (Info screen strings)
|
2016-07-26 13:20:20 -07:00 |
|
|
Scott LahteineandGitHub
|
5597400cda
|
Merge pull request #4414 from thinkyhead/rc_split_conditionals
Split up Conditionals.h into two files
|
2016-07-26 13:16:52 -07:00 |
|
|
Scott LahteineandGitHub
|
24ee50f4d9
|
Merge pull request #4417 from thinkyhead/rc_remove_old_lang
Remove MSG_PRINT_TIME from languages
|
2016-07-26 13:01:35 -07:00 |
|
|
Scott LahteineandGitHub
|
8684570f68
|
Merge pull request #4412 from thinkyhead/rc_followup_4402
Followup #4402 fixing 3-point leveling
|
2016-07-25 16:10:50 -07:00 |
|
|
Scott LahteineandGitHub
|
c55b7d0750
|
Merge pull request #4405 from thinkyhead/rc_theres_always_something
Move HAS_DIGIPOTSS to Conditionals.h
|
2016-07-25 15:58:42 -07:00 |
|
|
Scott LahteineandGitHub
|
42eebcd518
|
Merge pull request #4409 from thinkyhead/rc_cleanup_comment
Clean up Transfer Buffer Size comment
|
2016-07-25 15:58:34 -07:00 |
|
|
Scott LahteineandGitHub
|
7e37c20839
|
Merge pull request #4408 from thinkyhead/rc_reprapworld_lcd
Add support for reprapworld LCD
|
2016-07-25 12:37:58 -07:00 |
|
|
Scott LahteineandGitHub
|
54f4f80077
|
Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection
Arrange stepper_indirection by axis
|
2016-07-24 19:26:39 -07:00 |
|
|
Scott LahteineandGitHub
|
169c21b477
|
Merge pull request #4402 from thinkyhead/rc_consistent_positioning
Account for coordinate space offsets
|
2016-07-24 19:23:20 -07:00 |
|
|
Scott LahteineandGitHub
|
7c27f34996
|
Merge pull request #4397 from thinkyhead/rc_tweak_eeprom
Neaten up EEPROM read/write functions
|
2016-07-24 18:45:54 -07:00 |
|
|
Scott LahteineandGitHub
|
b7b7c90477
|
Merge pull request #4389 from thinkyhead/rc_optimize_planner
Optimize planner with precalculation, etc.
|
2016-07-24 17:48:23 -07:00 |
|
|
Scott LahteineandGitHub
|
6900bb2286
|
Merge pull request #4395 from tnw513/italian_fix
Update Italian translations. Remove trailing spaces.
|
2016-07-24 17:47:48 -07:00 |
|
|
Scott LahteineandGitHub
|
1fe60b723f
|
Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor
Sanity check for too many temp sensors
|
2016-07-24 15:38:41 -07:00 |
|
|
Scott LahteineandGitHub
|
2839c56f5a
|
Merge pull request #4390 from jbrazio/duration_t
Renamed timestamp_t to duration_t
|
2016-07-24 13:24:05 -07:00 |
|
|
Scott LahteineandGitHub
|
450fe8134d
|
Merge pull request #4398 from thinkyhead/rc_z_safe_sanity
Sanity checks for Z_SAFE_HOMING
|
2016-07-24 12:21:10 -07:00 |
|
|
Scott LahteineandGitHub
|
c287846f46
|
Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370
Update Z in a unified way in run_z_probe
|
2016-07-23 16:47:10 -07:00 |
|
|
Scott LahteineandGitHub
|
22d0654fe6
|
Merge pull request #4382 from esenapaj/Update-Japanese-translation
Update Japanese translation
|
2016-07-23 16:31:38 -07:00 |
|
|
Scott LahteineandGitHub
|
a3b5d5eb65
|
Merge pull request #4383 from esenapaj/Follow-up-the-PR-#4353
Follow-up the PR #4353 (General cleanup: enum)
|
2016-07-23 12:17:45 -07:00 |
|
|
Scott LahteineandGitHub
|
5167cb424a
|
Merge pull request #4381 from thinkyhead/rc_blocking_move_logging
Banish do_blocking_move_to_axis_pos
|
2016-07-23 01:33:17 -07:00 |
|
|
Scott LahteineandGitHub
|
13387ac302
|
Merge pull request #4380 from esenapaj/Fix-the-PR-#4379
Fix for the PR #4379 (Additional logging of do_blocking_move_to)
|
2016-07-23 00:43:01 -07:00 |
|
|
Scott LahteineandGitHub
|
8099ee51a5
|
Merge pull request #4379 from thinkyhead/rc_blocking_move_logging
Additional logging of do_blocking_move_to
|
2016-07-23 00:10:55 -07:00 |
|
|
Scott LahteineandGitHub
|
8633b644cf
|
Merge pull request #4378 from thinkyhead/rc_debug_leveling_docs
Document DEBUG_LEVELING_FEATURE
|
2016-07-22 23:57:01 -07:00 |
|
|
Scott LahteineandGitHub
|
652fd8a826
|
Merge pull request #4362 from thinkyhead/rc_duplication_mode
DUAL_NOZZLE_DUPLICATION_MODE
|
2016-07-22 21:17:59 -07:00 |
|
|
Scott LahteineandGitHub
|
1766b990b8
|
Merge pull request #4376 from jbrazio/timestamp_t-short
Adds short format to timestamp_t
|
2016-07-22 21:17:17 -07:00 |
|
|
Scott LahteineandGitHub
|
6da3729531
|
Merge pull request #4370 from thinkyhead/rc_delta_fwd_kinematics
Delta Forward Kinematics (and LOGICAL_POSITION)
|
2016-07-22 21:16:00 -07:00 |
|
|
Scott LahteineandGitHub
|
179e091473
|
Merge pull request #4374 from thinkyhead/rc_jbrazio_timestamp_t
Implements timestamp_t structure
|
2016-07-22 16:08:10 -07:00 |
|
|
Scott LahteineandGitHub
|
0b2c608d2f
|
Merge pull request #4372 from jbrazio/gcc-bark
Fix minor gcc warning
|
2016-07-22 15:18:53 -07:00 |
|
|
Scott LahteineandGitHub
|
5655f8b331
|
Merge pull request #4373 from thinkyhead/rc_homing_leveling_wtf
Fix, cleanup DELTA G28 / G29 support functions
|
2016-07-22 14:34:23 -07:00 |
|
|
Scott LahteineandGitHub
|
39caef4279
|
Merge pull request #4361 from AnHardt/imp-dbmt-for-delta
DELTA do_blocking_move_to() more like the Chartesian one
|
2016-07-21 20:05:04 -07:00 |
|
|
Scott LahteineandGitHub
|
7d869ad98b
|
Merge pull request #4365 from thinkyhead/rc_shrink_planner_accel
Adjustments to planner acceleration limit
|
2016-07-21 18:18:15 -07:00 |
|
|
Scott LahteineandGitHub
|
824c6859e2
|
Merge pull request #4369 from thinkyhead/rc_no_static_moves
inline to fix warnings, smaller build size (sometimes)
|
2016-07-21 14:46:09 -07:00 |
|
|
Scott LahteineandGitHub
|
2c239b1bd3
|
Merge pull request #4368 from AnHardt/run-z-probe-delta
Revert to position-difference method in run_z_probe()
|
2016-07-21 14:03:28 -07:00 |
|
|
Scott LahteineandGitHub
|
16e5348659
|
Merge pull request #4360 from thinkyhead/rc_toolchange_for_G28
Always switch to tool 0 for G28
|
2016-07-20 19:07:35 -07:00 |
|
|
Scott LahteineandGitHub
|
194d9521c3
|
Merge pull request #4356 from thinkyhead/rc_simpler_run_z_probe
Unify run_z_probe
|
2016-07-19 19:02:39 -07:00 |
|
|
Scott LahteineandGitHub
|
6137a1d934
|
Merge pull request #4359 from thinkyhead/rc_wrangle_movement_etc
Use ENABLED(MAPPER_NON)
|
2016-07-19 18:22:55 -07:00 |
|
|
Scott LahteineandGitHub
|
792fff5771
|
Merge pull request #4358 from thinkyhead/rc_individual_homing_rates
Set homing feedrates individually
|
2016-07-19 18:20:30 -07:00 |
|
|
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 |
|