  Scott LahteineandGitHub
|
deaad78df9
|
Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
|
2017-04-02 10:32:04 -05:00 |
|
|
Scott LahteineandGitHub
|
b3e9977f97
|
Merge pull request #6212 from thinkyhead/rc_gitattributes
Fix LCD preheat menus
|
2017-04-02 09:54:13 -05:00 |
|
|
Scott LahteineandGitHub
|
9faa8c4704
|
Merge pull request #6210 from thinkyhead/rc_gitattributes
Add .gitattributes to normalize line endings
|
2017-04-02 08:56:51 -05:00 |
|
|
Scott LahteineandGitHub
|
883c6762c4
|
Merge pull request #6208 from thinkyhead/rc_parity_with_32bit
Patch MarlinSerial to match up with 32-bit version
|
2017-04-02 05:13:03 -05:00 |
|
|
Scott LahteineandGitHub
|
34b23ff312
|
Merge pull request #6202 from thinkyhead/rc_fix_broken_ubl
Patching up UBL, vetting recent commits
|
2017-04-02 03:51:38 -05:00 |
|
|
Scott LahteineandGitHub
|
a7aa70e79a
|
Merge pull request #6201 from thinkyhead/rc_fix_broken_ubl
Fix broken auto#.g, some other regressions
|
2017-04-01 22:14:04 -05:00 |
|
|
Scott LahteineandGitHub
|
f75aa4d5be
|
Merge pull request #6050 from thinkyhead/rc_probe_manually
Add PROBE_MANUALLY — ABL without a probe
|
2017-03-31 12:27:33 -05:00 |
|
|
Scott LahteineandGitHub
|
541165e878
|
Merge pull request #6181 from thinkyhead/rc_ubl_further_fixes
Further adjustments to UBL code
|
2017-03-31 11:35:02 -05:00 |
|
|
Scott LahteineandGitHub
|
81136c1e82
|
Merge pull request #6177 from thinkyhead/rc_tinyboy
Support for TinyBoy 2 3D printer (and its OLED display)
|
2017-03-31 04:31:47 -05:00 |
|
|
Scott LahteineandGitHub
|
baadb11536
|
Merge pull request #6174 from thinkyhead/rc_ubl_continued
UBL additional cleanup
|
2017-03-31 03:39:50 -05:00 |
|
|
Scott LahteineandGitHub
|
e746d68a12
|
Merge pull request #6176 from thinkyhead/rc_mbl_abl_optimize
Make MBL a static class, use lookup for index-to-point conversion
|
2017-03-31 02:12:49 -05:00 |
|
|
Scott LahteineandGitHub
|
de9d2cddc3
|
Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
UBL cleanup, optimization
|
2017-03-30 17:40:29 -05:00 |
|
|
Scott LahteineandGitHub
|
9924199802
|
Merge pull request #5908 from thinkyhead/rc_fix_slowdown
General minor cleanup
|
2017-03-29 21:43:33 -05:00 |
|
|
Scott LahteineandGitHub
|
7ddd94dc61
|
Merge pull request #5994 from StefanBruens/fix_Makefile_errors
Fix makefile errors, cleanup
|
2017-03-29 06:32:08 -05:00 |
|
|
Scott LahteineandGitHub
|
af09095f03
|
Merge pull request #6154 from thinkyhead/rc_fil_sensor_vs_sd
Show Filament Width on LCD when SD is disabled
|
2017-03-29 05:24:48 -05:00 |
|
|
Scott LahteineandGitHub
|
e3459ec178
|
Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
Fix delta_angles
|
2017-03-29 03:35:18 -05:00 |
|
|
Scott LahteineandGitHub
|
592300922c
|
Merge pull request #6149 from thinkyhead/rc_scara_feedrate
Convert feedrate on SCARA from mm/s to deg/s
|
2017-03-29 03:31:44 -05:00 |
|
|
Scott LahteineandGitHub
|
8d53298a6d
|
Merge pull request #6139 from thinkyhead/rc_a4jp_scoovo
Board A4JP should be SCOOVO_X9H
|
2017-03-28 14:06:39 -05:00 |
|
|
Scott LahteineandGitHub
|
8c07ac7f7c
|
Merge pull request #6133 from thinkyhead/rc_use_safe_delay
Use safe_delay to ensure watchdog reset
|
2017-03-27 00:18:02 -05:00 |
|
|
Scott LahteineandGitHub
|
b47eaf14ae
|
Merge pull request #6109 from thinkyhead/rc_soft_pwm_dither
PWM dithering followup
|
2017-03-24 18:21:07 -05:00 |
|
|
Scott LahteineandGitHub
|
34d1c41b5f
|
Merge pull request #6111 from benlye/benlye-patch-echo_command
Fix type conversion issue with echo_command
|
2017-03-24 17:57:28 -05:00 |
|
|
Scott LahteineandGitHub
|
7d65911c00
|
Merge pull request #6110 from thinkyhead/rc_bilinear_and_m851
Adjust bilinear grid in M851
|
2017-03-24 17:51:25 -05:00 |
|
|
Scott LahteineandGitHub
|
eab7854a73
|
Merge pull request #6074 from thinkyhead/rc_immediate_shove
Immediate commands take precedence
|
2017-03-24 05:52:27 -05:00 |
|
|
Scott LahteineandGitHub
|
5a2abeca78
|
Merge pull request #6100 from thinkyhead/rc_soft_pwm_dither
Enhancement of PWM, with dithering
|
2017-03-24 04:57:40 -05:00 |
|
|
Scott LahteineandGitHub
|
4433b63d7a
|
Merge pull request #6099 from thinkyhead/rc_cleanup_ubl_1
Patch till UBL is integrated with planner-based leveling
|
2017-03-24 02:07:55 -05:00 |
|
|
Scott LahteineandGitHub
|
8f9face956
|
Merge pull request #6088 from rafaljot/patch-3
Update Marlin_main.cpp
|
2017-03-23 01:51:51 -05:00 |
|
|
Scott LahteineandGitHub
|
782634b6c9
|
Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping
Add MINIMUM_STEPPER_PULSE ability to babystepping
|
2017-03-22 21:57:36 -05:00 |
|
|
Scott LahteineandGitHub
|
d29ab8f2a6
|
Merge pull request #6075 from thinkyhead/rc_cleanup_ubl_1
Additional cleanup of UBL code
|
2017-03-22 21:45:59 -05:00 |
|
|
Scott LahteineandGitHub
|
100c9bc52d
|
Merge pull request #6079 from thinkyhead/rc_audio_feedback
Standard audio feedback. Use for settings store/load/reset
|
2017-03-22 07:35:57 -05:00 |
|
|
Scott LahteineandGitHub
|
2573f4dd05
|
Merge pull request #6052 from thinkyhead/rc_lift_on_pause
Add PARK_HEAD_ON_PAUSE feature / M125
|
2017-03-20 03:36:31 -05:00 |
|
|
Scott LahteineandGitHub
|
56c9dfc83b
|
Merge pull request #6066 from thinkyhead/rc_felix_fix
Update Felix config for UBL
|
2017-03-19 01:11:02 -05:00 |
|
|
Scott LahteineandGitHub
|
9b2b53f63a
|
Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z
Move Z last in tool-change for SWITCHING_EXTRUDER
|
2017-03-19 00:34:41 -05:00 |
|
|
Scott LahteineandGitHub
|
7cabe81373
|
Merge pull request #6057 from thinkyhead/rc_followup_6054
Followup 6054 with some cleanup
|
2017-03-18 13:49:20 -05:00 |
|
|
Scott LahteineandGitHub
|
4bca27ab89
|
Fix Kelvin conversion
Thanks to @ospalh -- #6056
|
2017-03-18 13:23:08 -05:00 |
|
|
Scott LahteineandGitHub
|
2c630a1b5c
|
Merge pull request #6054 from thinkyhead/rc_ubl_renewal
UBL for RCBugFix — cleanup, rebase, patch
|
2017-03-18 12:07:57 -05:00 |
|
|
Scott LahteineandGitHub
|
0492a3a8f1
|
Merge pull request #6027 from Bob-the-Kuhn/add_kill_info
Message for every KILL and STOP
|
2017-03-18 11:49:35 -05:00 |
|
|
Scott LahteineandGitHub
|
03aa424ccb
|
Merge pull request #6053 from thinkyhead/rc_clean
Remove extraneous whitespace
|
2017-03-18 03:26:45 -05:00 |
|
|
Scott LahteineandGitHub
|
af644871bf
|
Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics
Remove delta optimization concepts… for now
|
2017-03-18 03:26:24 -05:00 |
|
|
Scott LahteineandGitHub
|
ed4f9d7e1c
|
Merge pull request #6046 from robbycandra/RCBugFix-ignore_visual_studio_files
Ignore Visual Studio Files
|
2017-03-17 22:25:01 -05:00 |
|
|
Scott LahteineandGitHub
|
d15f25539b
|
Merge pull request #6031 from thinkyhead/rc_mbl_z_unhack
MBL: Disable sw endstops instead of altering Z
|
2017-03-17 17:20:35 -05:00 |
|
|
Scott LahteineandGitHub
|
4e53124681
|
Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
M114 - wait for move completion before reporting position
|
2017-03-17 05:22:46 -05:00 |
|
|
Scott LahteineandGitHub
|
734f9ea133
|
Merge pull request #6040 from thinkyhead/rc_sanity_use_assert
Simplify some sanity checks with static_assert
|
2017-03-17 05:22:17 -05:00 |
|
|
Scott LahteineandGitHub
|
23f1cfb46f
|
Fix stuck CHDK pin as suggested in #6041
|
2017-03-16 21:49:39 -05:00 |
|
|
Scott LahteineandGitHub
|
0b22069e82
|
Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height
Bug Fix: Switching extruder tool change leaves Z in wrong position
|
2017-03-16 21:15:20 -05:00 |
|
|
Scott LahteineandGitHub
|
51353f8fea
|
Merge pull request #6000 from trivalik/NoWorkspaceWarning
prevent warning with define of NO_WORKSPACE_OFFSETS
|
2017-03-12 00:00:51 -06:00 |
|
|
Scott LahteineandGitHub
|
54dada56a7
|
Merge pull request #6010 from MagoKimbra/rc_fix_bug_set_position_mm
Fix BUG set_position_mm
|
2017-03-12 00:00:16 -06:00 |
|
|
Scott LahteineandGitHub
|
6caf0830ae
|
Merge pull request #5985 from thinkyhead/rc_better_endstops_init
Use SET_INPUT_PULLUP where appropriate
|
2017-03-08 00:08:30 -06:00 |
|
|
Scott LahteineandGitHub
|
deb9d0dabd
|
Merge pull request #5984 from thinkyhead/rc_delta_angles
Add delta_tower_angle_trim
|
2017-03-07 19:41:24 -06:00 |
|
|
Scott LahteineandGitHub
|
7c9e2e2a1a
|
Merge pull request #5981 from thinkyhead/rc_tmc2130_redo
TMC2130 Library: @teemuatlut replaces @makertum
|
2017-03-07 16:23:52 -06:00 |
|
|
Scott LahteineandGitHub
|
33f8a8a344
|
Merge pull request #5973 from thinkyhead/rc_circle_pattern
Add circle pattern to nozzle clean
|
2017-03-06 04:47:01 -06:00 |
|
|
Scott LahteineandGitHub
|
94b3e0a483
|
Merge pull request #5959 from benlye/benlye-fixm48
Remove extra carriage return in M48 V1 output
|
2017-03-06 04:24:28 -06:00 |
|
|
Scott LahteineandGitHub
|
a9a1971295
|
Merge pull request #5972 from thinkyhead/rc_cooldown_before
Fix preheat menu formatting
|
2017-03-06 03:21:29 -06:00 |
|
|
Scott LahteineandGitHub
|
3b75518ef6
|
Merge pull request #5911 from aphex3k/flsun_kossel_mini
Configuration.h and Configuration_adv.h for the kossel mini by flsun
|
2017-03-06 02:26:01 -06:00 |
|
|
Scott LahteineandGitHub
|
2f620f86d9
|
Merge pull request #5970 from thinkyhead/rc_cooldown_before
Preheat Hotend Only menu items
|
2017-03-06 01:56:05 -06:00 |
|
|
Scott LahteineandGitHub
|
02de8e6f18
|
Merge pull request #5957 from MagoKimbra/rc_stepper_indirection_fix
Stepper indirection fix tmc driver
|
2017-03-06 01:16:40 -06:00 |
|
|
Scott LahteineandGitHub
|
c15c65f18a
|
Merge pull request #5971 from thinkyhead/rc_fix_e_factors
Patch DISTINCT_E_FACTORS bug
|
2017-03-06 01:11:17 -06:00 |
|
|
Scott LahteineandGitHub
|
be98016674
|
Merge pull request #5963 from thinkyhead/rc_no_offsets_optim
New option: NO_WORKSPACE_OFFSETS
|
2017-03-05 21:46:49 -06:00 |
|
|
Scott LahteineandGitHub
|
20addc6e32
|
Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better
Display a message for EEPROM version mismatch
|
2017-03-04 17:15:07 -06:00 |
|
|
Scott LahteineandGitHub
|
177ad245f6
|
Merge pull request #5953 from thinkyhead/fix_fc_e_index
Fix submenu hotend status display
|
2017-03-04 00:12:29 -06:00 |
|
|
Scott LahteineandGitHub
|
b27f69ba51
|
Merge pull request #5813 from thinkyhead/rc_fix_makrpanel
Fix MAKRPANEL assignments
|
2017-03-03 21:40:49 -06:00 |
|
|
Scott LahteineandGitHub
|
1ef6ccd919
|
Merge pull request #5951 from thinkyhead/rc_print_2d_array
Reduce code size (40b, or 166b with bilinear subdivision)
|
2017-03-03 21:27:44 -06:00 |
|
|
Scott LahteineandGitHub
|
b9b203bfb2
|
Merge pull request #5950 from thinkyhead/rc_cleanup_mar3
General cleanup, const usage, var naming
|
2017-03-03 21:25:34 -06:00 |
|
|
Scott LahteineandGitHub
|
21fb347eee
|
Merge pull request #5948 from thinkyhead/rc_fix_status_printf
Fix "Heating..." message
|
2017-03-03 12:28:27 -06:00 |
|
|
Scott LahteineandGitHub
|
5065636023
|
Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio
LIN_ADVANCE: Fixed E/D ratio option
|
2017-03-03 03:24:41 -06:00 |
|
|
Scott LahteineandGitHub
|
903808bb97
|
Merge pull request #5943 from thinkyhead/catalan_march_2017
Update Catalan language
|
2017-03-03 03:13:51 -06:00 |
|
|
Scott LahteineandGitHub
|
34253497d4
|
Babysteps code tweak
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
|
2017-03-02 20:35:45 -06:00 |
|
|
Scott LahteineandGitHub
|
e309e980ce
|
Merge pull request #5942 from thinkyhead/rc_cleanup_finish_5887
Clean up and finish #5887
|
2017-03-02 20:26:13 -06:00 |
|
|
Scott LahteineandGitHub
|
eeb490221f
|
Remove BEEPER_PIN override in pins_RIGIDBOARD.h
Resolves #5926. This override is no longer needed since the RAMPS LCD controller pins were fixed.
|
2017-03-01 18:26:29 -06:00 |
|
|
Scott LahteineandGitHub
|
cbeff12f8a
|
Merge pull request #5933 from teemuatlut/lcd_days_hours
Fix formatting of SD print time hours above one day
|
2017-03-01 15:44:10 -06:00 |
|
|
Scott LahteineandGitHub
|
8a4e9d08a3
|
Merge pull request #5931 from thinkyhead/rc_core_endstop_fix
Fix CoreYX / YZ / ZX endstop logic
|
2017-03-01 15:32:11 -06:00 |
|
|
Scott LahteineandGitHub
|
05b217c0d0
|
Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config
Make LCD_TIMEOUT_TO_STATUS configurable
|
2017-02-28 19:42:27 -06:00 |
|
|
Scott LahteineandGitHub
|
493e738575
|
Merge pull request #5910 from thinkyhead/rc_more_nozzle_wipe
Bidirectional Zig-Zag Nozzle Wipe
|
2017-02-25 22:03:33 -06:00 |
|
|
Scott LahteineandGitHub
|
f17b81b765
|
Add MAPPER_C2C3 to French language
|
2017-02-25 18:49:00 -06:00 |
|
|
Scott LahteineandGitHub
|
f9e4717f5b
|
Merge pull request #5892 from thinkyhead/rc_msg_heating_pstr
Use PSTR for MSG_HEATING
|
2017-02-22 12:26:08 -06:00 |
|
|
Scott LahteineandGitHub
|
cfdc189796
|
Merge pull request #5856 from thinkyhead/rc_fix_bad_comment
Remove non-applicable comment on MANUAL_Z_HOME_POS
|
2017-02-20 17:54:30 -06:00 |
|
|
Scott LahteineandGitHub
|
2efdc72aa5
|
Merge pull request #5876 from thinkyhead/rc_hotend_status
Add status_printf to print messages to the lcd status line.
|
2017-02-20 17:29:27 -06:00 |
|
|
Scott LahteineandGitHub
|
012aff6823
|
Merge pull request #5862 from thinkyhead/rc_fix_a_thing
Finish reducing of ABL_BILINEAR_SUBDIVISION
|
2017-02-18 21:36:28 -06:00 |
|
|
Scott LahteineandGitHub
|
49d562d23d
|
Merge pull request #5855 from thinkyhead/rc_followup_5840
Apply DISTINCT_E_FACTORS to sync_from_steppers
|
2017-02-18 04:51:01 -06:00 |
|
|
Scott LahteineandGitHub
|
4da8b1494b
|
Merge pull request #5854 from thinkyhead/rc_fixup_m600
M600 cleanup and bugfix
|
2017-02-18 04:27:13 -06:00 |
|
|
Scott LahteineandGitHub
|
dd02dba6e6
|
Merge pull request #5840 from MagoKimbra/rc_fix_lin_advanced_step_to_mm
Fix steps_to_mm for active extruders
|
2017-02-18 04:25:53 -06:00 |
|
|
Scott LahteineandGitHub
|
7fdc620ef7
|
Merge pull request #5850 from thinkyhead/drop_some_comments
Remove some old code comments
|
2017-02-17 16:45:44 -06:00 |
|
|
Scott LahteineandGitHub
|
babe1d211c
|
Merge pull request #5794 from thinkyhead/rc_m600_improve
M600 wait for heatup, prevent stepper timeout, etc.
|
2017-02-15 05:38:06 -06:00 |
|
|
Scott LahteineandGitHub
|
58b8e0cae7
|
Merge pull request #5837 from thinkyhead/rc_fix_mbl_homing
Fix broken homing in MBL
|
2017-02-15 04:48:30 -06:00 |
|
|
Scott LahteineandGitHub
|
4d4745c0eb
|
Parenthesize some menu defines for safety
|
2017-02-14 23:12:27 -06:00 |
|
|
Scott LahteineandGitHub
|
20ef0a6e27
|
Merge pull request #3152 from thinkyhead/sd_alpha_sort
SD files alphabetical sort in LCD menus
|
2017-02-14 21:48:57 -06:00 |
|
|
Scott LahteineandGitHub
|
c04d6b5aa6
|
Merge pull request #5829 from thinkyhead/rc_fix_isr_reentry
Combine fixes for LIN_ADVANCE and temperature ISR
|
2017-02-14 20:36:58 -06:00 |
|
|
Scott LahteineandGitHub
|
467f01435f
|
Merge pull request #5816 from thinkyhead/rc_abl_virt_reduce
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
|
2017-02-14 08:41:44 -06:00 |
|
|
Scott LahteineandGitHub
|
a950c31e2d
|
Merge pull request #5815 from thinkyhead/rc_pulses_per_step
Give encoder pulse/steps conditionals their own block
|
2017-02-12 04:14:00 -06:00 |
|
|
Scott LahteineandGitHub
|
7176de8605
|
Merge pull request #5814 from thinkyhead/hotend_loop_always
Make HOTEND_LOOP more consistent, let compiler optimize it
|
2017-02-12 04:13:14 -06:00 |
|
|
Scott LahteineandGitHub
|
adec219ca5
|
Merge pull request #5811 from thinkyhead/fix_two_strings
No space after X: or A: in M114 output
|
2017-02-12 04:11:51 -06:00 |
|
|
Scott LahteineandGitHub
|
701f4a6d9d
|
Merge pull request #5729 from Bob-the-Kuhn/guaranteed-BLTouch-detection
guaranteed BLTouch detection
|
2017-02-12 01:13:35 -06:00 |
|
|
Scott LahteineandGitHub
|
e1702816f6
|
Fix SD_CHECK_AND_RETRY condition
Addressing #5806
|
2017-02-11 23:55:56 -06:00 |
|
|
Scott LahteineandGitHub
|
c64ecf95e2
|
Merge pull request #5808 from thinkyhead/rc_delta_float_radius
Cast DELTA_PRINTABLE_RADIUS to float in sq()
|
2017-02-11 23:43:46 -06:00 |
|
|
Scott LahteineandGitHub
|
1e4d4e5915
|
Fix typo in language_uk
Thanks to @pavlus for this one
|
2017-02-10 15:34:31 -06:00 |
|
|
Scott LahteineandGitHub
|
7fe7a0c8be
|
Merge pull request #5793 from thinkyhead/rc_adjust_probe_output
Adjust probe_pt() terminal output to respect probe z-offset
|
2017-02-09 23:05:02 -06:00 |
|
|
Scott LahteineandGitHub
|
633c253bc1
|
Merge pull request #5792 from thinkyhead/rc_default_dac_vals
Default DAC values for RigidBoard V2
|
2017-02-09 22:56:03 -06:00 |
|
|
Scott LahteineandGitHub
|
6dac1fe07e
|
Merge pull request #5701 from tohara/RCBugFixCmake
Updated CMakeLists
|
2017-02-09 22:45:05 -06:00 |
|
|
Scott LahteineandGitHub
|
a245656db3
|
Merge pull request #5713 from gege2b/RCBF-French
French translation : Added missing strings as well as missing accents
|
2017-02-09 22:43:56 -06:00 |
|
|
Scott LahteineandGitHub
|
fb11e52cd2
|
Merge pull request #5787 from thinkyhead/rc_bob_pins_added
pinsDebug for 644/1284 & USB646/1286 families
|
2017-02-09 15:07:55 -06:00 |
|
|
Scott LahteineandGitHub
|
9b5515926a
|
Merge pull request #5696 from thinkyhead/rc_volumetric_default
Allow enabling volumetric filament on config load
|
2017-01-14 05:48:51 -08:00 |
|