bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
6,640 Commits 1 Branch 4 Tags
ef97645002ba6060c2ac77526be0b31f694cfcb6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott LahteineandGitHub 2a9b3376a9 Merge pull request #5289 from thinkyhead/rc_which_menu_actions 
Drop "static" keyword in ultralcd.cpp function declarations
 2016-11-23 23:04:05 -06:00
Scott LahteineandGitHub 2e966f8e5b Patch Capabilities Report for "PROGRESS" 2016-11-23 19:31:46 -06:00
Scott LahteineandGitHub f60321d3e3 Merge pull request #5284 from thinkyhead/rc_turkish_update 
Turkish update (squashed)
 2016-11-23 14:57:52 -06:00
Scott LahteineandGitHub d891324830 Merge pull request #5258 from mosh1/mbl_speed_fix 
Fix z feedrate value when doing mesh bed leveling. probe feedrate use…
 2016-11-23 14:15:01 -06:00
Scott LahteineandGitHub 7f8133a51f Merge pull request #5255 from Kaibob2/CaseLightMenu 
Case light menu (3rd attempt)
 2016-11-23 13:46:33 -06:00
Scott LahteineandGitHub 3bc2273ac9 Comment M540 2016-11-21 18:08:00 -06:00
Scott LahteineandGitHub 14b74181f5 Merge pull request #5179 from thinkyhead/rc_TMC2130 
TMC2130 "Silent StepStick" support
 2016-11-21 14:10:52 -06:00
Scott LahteineandGitHub bb2114a060 Merge pull request #5264 from thinkyhead/rc_delta_safe_zone 
Add an option for delta to home to the top
 2016-11-21 13:56:44 -06:00
Scott LahteineandGitHub 38466b1d2f Merge pull request #5271 from esenapaj/Fix-for-the-PR-#5267 
Fix for thePR #5267 (Introduce a +1234.56 format for over 999 steps/mm)
 2016-11-21 13:55:56 -06:00
Scott LahteineandGitHub 9b96a4a53b Merge pull request #5246 from thinkyhead/rc_some_cleanup 
Minor stepper cleanup
 2016-11-21 13:55:25 -06:00
Scott LahteineandGitHub 0f891e848b Merge pull request #5268 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-11-21 03:18:36 -06:00
Scott LahteineandGitHub c91325e904 Merge pull request #5267 from esenapaj/Introduce-a-+1234.56-format 
Introduce a +1234.56 format for over 999 steps/mm
 2016-11-21 03:17:52 -06:00
Scott LahteineandGitHub 8bf07684d2 Merge pull request #5256 from AnHardt/e-interrupts-2 
Endstop interrupt refinement
 2016-11-20 02:27:02 -06:00
Scott LahteineandGitHub 79c8591192 Merge pull request #5253 from thinkyhead/rc_smooth_move_ex-lax 
Ensure smooth print moves even with LCD enabled
 2016-11-19 01:38:41 -06:00
Scott LahteineandGitHub 0215cacb30 Merge pull request #5247 from esenapaj/Re-follow-the-PR-#4634 
Re-follow the PR #4634 (Set language display charset in language.h)
 2016-11-19 01:32:40 -06:00
Scott LahteineandGitHub 7b95918e84 Merge pull request #5251 from thinkyhead/rc_cmake_support 
Added CMake support
 2016-11-18 23:53:09 -06:00
Scott LahteineandGitHub 87b6b19256 Patch CASE_LIGHT typo 2016-11-18 23:49:12 -06:00
Scott LahteineandGitHub 0be6167f14 Merge pull request #5250 from CONSULitAS/RCBugFix_K8200_backinsync_2016-11-18 
K8200: Example configuration back in sync
 2016-11-18 22:49:18 -06:00
Scott LahteineandGitHub de3eea920d Merge pull request #5252 from thinkyhead/rc_endstop_interrupt_followup 
Endstop interrupts followup
 2016-11-18 22:35:25 -06:00
Scott LahteineandGitHub 832fe284b4 Merge pull request #5184 from AnHardt/endstop_interrupts 
Introduce endstop interrupts
 2016-11-18 20:50:24 -06:00
Scott LahteineandGitHub 32247c1b80 Merge pull request #5244 from thinkyhead/rc_danish_nov_2016 
Update to Danish language 10/11-2016
 2016-11-18 01:29:25 -06:00
Scott LahteineandGitHub ee0765e872 Merge pull request #5233 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-11-17 03:38:19 -06:00
Scott LahteineandGitHub 2330619da0 Merge pull request #5191 from petrzjunior/const 
Replace const bool with #define for consistency
 2016-11-17 03:37:32 -06:00
Scott LahteineandGitHub d63230d73e Merge pull request #5192 from Kaibob2/patch-7 
Printer Stats / Completed prints line doesn't fit in display (when german)
 2016-11-16 00:16:36 -06:00
Scott LahteineandGitHub 548b45026d Merge pull request #5214 from Sebastianv650/RCBugFix_planner_opt 
Save some cycle inside the planner
 2016-11-16 00:06:55 -06:00
Scott LahteineandGitHub 5d23e52d75 Merge pull request #5228 from thinkyhead/rc_keep_last_mix 
Fix DIRECT_MIXING_IN_G1 to preserve the previous mix
 2016-11-15 19:12:01 -06:00
Scott LahteineandGitHub db47aa983d Merge pull request #5226 from mtowara/RCBugFix 
bump -std in Makefile to c++11
 2016-11-15 16:13:32 -06:00
Scott LahteineandGitHub a0aad8d686 Merge pull request #5224 from thinkyhead/rc_limit_G30_xy 
Fix G30 with limits, print correct probe XY
 2016-11-15 15:20:12 -06:00
Scott LahteineandGitHub 665b7f3893 Merge pull request #5212 from thinkyhead/rc_mixing_faster 
Store mix factors as reciprocals and multiply
 2016-11-12 18:47:11 -06:00
Scott LahteineandGitHub 60cc9342a4 Merge pull request #5188 from thinkyhead/rc_extended_host_support 
Extended host support: M155 Auto temp report, M115 capabilities
 2016-11-12 15:38:06 -06:00
Scott LahteineandGitHub ea3c08d249 Merge pull request #5186 from esenapaj/Follow-up-the-PR-#5167-etc 
Follow up the PR #5167 (Add Turkish Language) again, etc
 2016-11-12 13:11:54 -06:00
Scott LahteineandGitHub c488378532 Merge pull request #5205 from Sebastianv650/RCBugFix_stepperpatch 
Remove useless line from stepper ISR
 2016-11-12 12:43:07 -06:00
Scott LahteineandGitHub 7972378828 Merge pull request #5209 from floyd871/RCBugFix 
Megatronics 3.0 has no SD-Card detect
 2016-11-12 12:42:02 -06:00
Scott LahteineandGitHub 06f2282f82 Merge pull request #5176 from thinkyhead/rc_filchange_feedback 
Give instant feedback for filament change
 2016-11-07 12:11:54 -06:00
Scott LahteineandGitHub dcfd7c69e8 Merge pull request #5163 from nzinov/RCBugFix 
Improve G30 probing command - add optional arguments
 2016-11-07 11:37:13 -06:00
Scott LahteineandGitHub e765eebfb0 Patch spacing in bilinear grid report 2016-11-07 04:08:25 -06:00
Scott LahteineandGitHub de6f2ef2a3 Merge pull request #5171 from esenapaj/Follow-up-the-PR-#5167-etc 
Follow up the PR #5167 (Add Turkish Language), etc
 2016-11-07 00:05:44 -06:00
Scott LahteineandGitHub 5aee8d892c Merge pull request #5167 from thinkyhead/rc_turkish_squashed 
Add Turkish Language
 2016-11-05 21:31:34 -05:00
Scott LahteineandGitHub 1614c9d207 Merge pull request #5155 from thinkyhead/rc_core_babystepping 
BABYSTEPPING-oriented cleanup
 2016-11-03 23:46:04 -05:00
Scott LahteineandGitHub 0269347682 Merge pull request #5141 from thinkyhead/rc_old_slowdown_what 
OLD_SLOWDOWN does nothing, so remove it
 2016-11-03 23:30:43 -05:00
Scott LahteineandGitHub e92e2b2446 Merge pull request #5144 from Sebastianv650/RCBugFix_LIN_ADV_wipe 
Account for wipe moves
 2016-11-03 23:19:25 -05:00
Scott LahteineandGitHub 28a039c0e1 Merge pull request #5154 from thinkyhead/rc_bilinear_splits 
Don't define bilinear_line_to_destination on kinematic setups
 2016-11-03 15:29:31 -05:00
Scott LahteineandGitHub 2185973e39 Merge pull request #5150 from thinkyhead/rc_bilinear_splits 
Corrections to bilinear_line_to_destination
 2016-11-03 04:54:39 -05:00
Scott LahteineandGitHub 3b6a43f7ad Merge pull request #5148 from thinkyhead/rc_dual_tool_z_limit 
Fix Z raise with DXC_AUTO_PARK_MODE
 2016-11-02 21:52:44 -05:00
Scott LahteineandGitHub 0c79553fc5 Cast int to AxisEnum for some accessors 2016-11-02 17:42:24 -05:00
Scott LahteineandGitHub adbf1f7dca Add M355 to the GCodes list. 2016-11-02 16:43:52 -05:00
Scott LahteineandGitHub 63efc10599 Merge pull request #5134 from thinkyhead/rc_bilinear_split_lines 
Split cartesian moves on grid boundaries with bilinear ABL
 2016-11-02 16:14:55 -05:00
Scott LahteineandGitHub 1ee0fdcad7 Merge pull request #5140 from esenapaj/Follow-up-the-PR-#5089 
Follow-up the PR #5089 (Centralize click-handling in the LCD loop)
 2016-11-02 01:13:56 -05:00
Scott LahteineandGitHub b0be2e41ff Merge pull request #5136 from esenapaj/Follow-up-the-PR-#5133 
Follow-up the PR  #5133 (M355 Case light)
 2016-11-01 11:04:48 -05:00
Scott LahteineandGitHub 66744a6076 Merge pull request #5133 from thinkyhead/rc_M355_case_light 
M355 Case light
 2016-11-01 07:51:27 -05:00
Scott LahteineandGitHub 8b44413498 Merge pull request #5124 from Sebastianv650/RCBugFix_LIN_ADV-Patch 
BugFix for incorrect E-speed calculation
 2016-11-01 05:13:17 -05:00
Scott LahteineandGitHub f418e82b15 Remove redundant definition of EN_C 2016-11-01 05:10:07 -05:00
Scott LahteineandGitHub 9c108aea18 Merge pull request #5132 from thinkyhead/rc_fix_M43 
Followup to #5118 - pins debugging cleanup
 2016-11-01 02:05:21 -05:00
Scott LahteineandGitHub fa6bf12697 Merge pull request #5118 from thinkyhead/rc_expanded_M43 
Enhancements to M43 pins debugging
 2016-10-31 08:29:53 -05:00
Scott LahteineandGitHub 3a107e280d Developer note in pins_MIGHTYBOARD_REVE.h 2016-10-31 08:22:39 -05:00
Scott LahteineandGitHub d567b426d5 Merge pull request #4894 from thinkyhead/rc_mightyboard_rev_e 
Mightyboard Revision E preliminary support
 2016-10-31 08:01:41 -05:00
Scott LahteineandGitHub 43df9ace4e Merge pull request #5110 from thinkyhead/rc_z2_min_allowed 
Support Z2 min in M119 report
 2016-10-31 07:59:45 -05:00
Scott LahteineandGitHub 8a4c51f313 Merge pull request #5115 from thinkyhead/rc_buffer_line_wait_later 
Optimize buffer_line by calculating before wait-for-free-block
 2016-10-30 16:46:18 -05:00
Scott LahteineandGitHub 3c3fe1a1ba Merge pull request #5089 from thinkyhead/rc_break_m1_fix 
Centralize click-handling in the LCD loop
 2016-10-29 16:07:08 -05:00
Scott LahteineandGitHub 47ad97c35e Merge pull request #5109 from thinkyhead/rc_eeprom_M218_tool_offset 
Save hotend_offset array (M218) in EEPROM
 2016-10-28 20:08:29 -05:00
Scott LahteineandGitHub d095c7933b Merge pull request #5108 from MagoKimbra/Fix_M420 
Fix Command M420
 2016-10-28 19:23:40 -05:00
Scott LahteineandGitHub c34dbfb248 Merge pull request #5072 from thinkyhead/rc_preset_auto_fans 
Add predefined AUTO_FAN_PINs to pins files
 2016-10-27 17:12:11 -05:00
Scott LahteineandGitHub 1e00f5a4bd Merge pull request #5097 from thinkyhead/rc_fix_endstop_issue 
Don't trigger endstops that are actually Z2 or probe
 2016-10-27 08:32:48 -05:00
Scott LahteineandGitHub c07cc9e3f1 Revert changes made to z dual endstop test 
#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
 2016-10-27 07:41:39 -05:00
Scott LahteineandGitHub c4c53856a4 Merge pull request #5094 from esenapaj/Fix-for-the-PR-#5088 
Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL)
 2016-10-26 21:51:18 -05:00
Scott LahteineandGitHub 2e3110539b Merge pull request #5095 from thinkyhead/rc_fix_bilinear_math 
Fix bilinear grid constraints
 2016-10-26 21:48:19 -05:00
Scott LahteineandGitHub 4ec7ed554d Merge pull request #5093 from esenapaj/Follow-up-the-PR-#5087-etc 
Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc
 2016-10-26 21:23:34 -05:00
Scott LahteineandGitHub bfd3b3c604 Merge pull request #5087 from Fulg/azteeg-x3-pins 
Fixed SERVO pins on Azteeg X3
 2016-10-26 06:01:16 -05:00
Scott LahteineandGitHub 208d720614 Merge pull request #5082 from Fulg/RCBugFix 
Only issue MAXTEMP when heating
 2016-10-26 05:55:33 -05:00
Scott LahteineandGitHub b5d9639dd0 Merge pull request #5090 from thinkyhead/rc_fix_bilinear_math 
Fix for bilinear grid outside bounds
 2016-10-26 05:45:17 -05:00
Scott LahteineandGitHub 24bcea6c02 Merge pull request #5088 from thinkyhead/rc_break_m1_fix 
Handle M108 in M1 also with ULTIPANEL
 2016-10-26 00:44:01 -05:00
Scott LahteineandGitHub 7ad33422e3 Clear dir_t size, not pointer size 2016-10-25 22:59:40 -05:00
Scott LahteineandGitHub 3fcf915808 Fix uninitialized var in reset_acceleration_rates 2016-10-24 11:55:41 -05:00
Scott LahteineandGitHub 14f824c3de Merge pull request #5071 from esenapaj/Extend-measuring-range-of-thermocouple 
Extend measuring range of thermocouple for MAX31855
 2016-10-24 02:00:12 -05:00
Scott LahteineandGitHub 1097a50694 Merge pull request #5070 from gcormier/rcbugfix 
Fix #4995 - M48/G29 on CoreXY maybe others?
 2016-10-24 00:56:36 -05:00
Scott LahteineandGitHub fed6cfc5f5 Merge pull request #5074 from Sebastianv650/Accel_calc_v2 
Planner acceleration bugfix and speedup v2
 2016-10-23 16:42:57 -05:00
Scott LahteineandGitHub aa99bd8d13 Merge pull request #5068 from esenapaj/Fix-for-PR-#5066 
Fix for the PR #5066 (Updated french translation)
 2016-10-23 02:56:36 -05:00
Scott LahteineandGitHub 483082387c Merge pull request #5022 from esenapaj/Fix-for-the-PR-#4553 
Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD))
 2016-10-22 13:54:09 -05:00
Scott LahteineandGitHub 8b967a9ff0 Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons 
Apply encoder reverse options to keypad arrows
 2016-10-22 13:52:35 -05:00
Scott LahteineandGitHub ca48a49fdb Merge pull request #5065 from petrzjunior/transl 
[LANGUAGE] Update Czech (BLTOUCH and DAC strings)
 2016-10-22 12:46:10 -05:00
Scott LahteineandGitHub f0744fc815 Merge pull request #5066 from thinkyhead/rc_french_update 
Updated french translation
 2016-10-22 12:45:51 -05:00
Scott LahteineandGitHub 3544c3632f Merge pull request #5062 from thinkyhead/rc_warnings_fix 
Warnings fixed redux
 2016-10-22 12:21:36 -05:00
Scott LahteineandGitHub cfb47929ca Merge pull request #5060 from thinkyhead/rc_fix_ugly_code 
Reduce, clean up MINTEMP / MAXTEMP test code
 2016-10-22 11:27:30 -05:00
Scott LahteineandGitHub 0d3fc7dd89 Merge pull request #5059 from gcormier/fixbaby 
Set defer delay back to false when exiting babystepping.
 2016-10-22 10:59:17 -05:00
Scott LahteineandGitHub 627f9d5285 Merge pull request #5056 from thinkyhead/rc_lin_adv_opt 
LIN_ADVANCE optimizations
 2016-10-22 07:06:39 -05:00
Scott LahteineandGitHub 0908329d96 Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical 
Fix manual leveling coordinates
 2016-10-22 06:31:02 -05:00
Scott LahteineandGitHub dbfabb4c0a Merge pull request #5043 from Kaibob2/patch-5 
Correct grammar and translation in language_de.h
 2016-10-22 05:52:54 -05:00
Scott LahteineandGitHub b19bba275f No LCD timeout during babystepping 
As requested in #5031
 2016-10-22 05:26:07 -05:00
Scott LahteineandGitHub be7d245eff Merge pull request #5008 from thinkyhead/test_endstop_hits 
Save some PROGMEM in MBL G28
 2016-10-22 03:35:52 -05:00
Scott LahteineandGitHub 7c0e52256d Merge pull request #5053 from thinkyhead/rc_fix_baud_config 
Patch BAUDRATE line in configs
 2016-10-22 03:27:45 -05:00
Scott LahteineandGitHub 083d41a2c2 Remove redundant estep rate code from LIN_ADVANCE 
As noted by https://github.com/MarlinFirmware/Marlin/pull/4971#issuecomment-252503295
 2016-10-22 02:19:14 -05:00
Scott LahteineandGitHub dc2cb8454c Revert acceleration limiting to avoid overflow 2016-10-17 17:08:41 -05:00
Scott LahteineandGitHub 6ae5cf17a9 Merge pull request #5033 from esenapaj/Fix-freezing-with-MAX31855 
Fix freezing and MINTEMP Error with MAX31855 thermocouple
 2016-10-17 16:22:20 -05:00
Scott LahteineandGitHub f257c4bcae Merge pull request #5036 from thinkyhead/rc_dac_code_deps 
Fix DAC current code
 2016-10-17 16:19:00 -05:00
Scott LahteineandGitHub ca7275a67a Disable EXTRAPOLATE_FROM_EDGE by default 2016-10-14 14:44:28 -05:00
Scott LahteineandGitHub 0921c7da84 Merge pull request #4997 from thinkyhead/rc_jerk_from_mk2 
Adapt Jerk / Speed code from Prusa MK2
 2016-10-12 06:38:50 -05:00
Scott LahteineandGitHub 37643fef63 Merge pull request #4972 from bgort/platformio-improvements 
Move platformio directories out of source tree
 2016-10-12 03:42:33 -05:00
Scott LahteineandGitHub d41f2bdbd8 Merge pull request #4991 from thinkyhead/rc_max31855_fix 
Patches for Stepper DAC and MAX31855
 2016-10-10 20:12:06 -05:00
Scott LahteineandGitHub d2da14459f Merge pull request #4993 from thinkyhead/rc_planner_deps 
Sort out some header dependencies
 2016-10-10 20:11:27 -05:00
Scott LahteineandGitHub 2cb5df8a56 Merge pull request #4984 from esenapaj/Small-fix-for-PR-#4980 
Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)
 2016-10-10 13:30:47 -05:00