bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
9,662 Commits 1 Branch 4 Tags
98542623347e042e8289ee2f165881dd82801361
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott LahteineandGitHub b639f1ad4b Correct some retract() comments 2018-02-08 17:57:48 -06:00
Scott LahteineandGitHub b2f8b4ada5 I2C position encoders update (#9533) 
Updating I2C position encoders to enable babystepping and Babystep XY when using the ecm microstep correction method. Also changed default method to ECM microstep.
 2018-02-08 03:57:11 -06:00
Scott LahteineandGitHub e6c32b3a14 Add sublime-project file (#9526) 2018-02-07 15:50:10 -06:00
Scott LahteineandGitHub b3f115fa0a Marlin.ino needs no content (#9506) 2018-02-06 02:28:18 -06:00
Scott LahteineandGitHub 8558264514 Configs for Prusa i3 Pro B GT2560 Rev.A Plus (#9505) 
One without probe and one with BLTOUCH.
 2018-02-06 00:24:21 -06:00
Scott LahteineandGitHub b5e92f4f90 [2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
Scott LahteineandGitHub db1ace5e82 Merge pull request #9501 from thinkyhead/bf2_ulticontroller_v21 
[2.0.x] UltiController v2.1 support
 2018-02-05 23:06:32 -06:00
Scott LahteineandGitHub 766faa05a9 sp 2018-02-05 15:57:29 -06:00
Scott LahteineandGitHub 4ddb6a3a1f Merge pull request #9470 from thinkyhead/bf2_malyan_clueless 
[2.0.x] Malyan M200 LCD
 2018-02-05 05:03:18 -06:00
Scott LahteineandGitHub 03bfc0d7c8 Merge pull request #9439 from thinkyhead/bf2_fix_G26_circle_bumps 
[2.0.x] Change G26 circle angles
 2018-02-04 19:05:18 -06:00
Scott LahteineandGitHub 693843f1fa Allow override of RAMPS CS Pins (#9472) 2018-02-04 16:00:16 -06:00
Scott LahteineandGitHub ca00fed827 Merge pull request #9415 from thinkyhead/bf2_enhance_boot_status 
[2.0.x] Enhance Boot and Status screens
 2018-02-02 01:41:07 -06:00
Scott LahteineandGitHub 434a2dcbf2 Merge pull request #9393 from Bob-the-Kuhn/revert-parser-to-array-2.0.x 
[2.0.x] Fix compile error when FASTER_GCODE_PARSER is disabled
 2018-02-02 00:56:50 -06:00
Scott LahteineandGitHub f8227abf1c Merge pull request #9384 from tcm0116/2.0.x-retract 
[2.0.x] Clear retracted status when homing the Z axis
 2018-02-01 23:36:36 -06:00
Scott LahteineandGitHub ea5f91737f Merge pull request #9392 from studiodyne/studiodyne-pause 
[2.0.x] Pause resuming fix
 2018-02-01 23:32:24 -06:00
Scott LahteineandGitHub 70e4f12d2f Merge pull request #9327 from thinkyhead/bf2_fix_parser_M118 
[2.0.x] Fix parser.has_value, M118 parameters
 2018-01-24 00:57:41 -06:00
Scott LahteineandGitHub 45cfb16424 Merge pull request #8355 from tcm0116/2.0.x-TwoWire 
[2.0.x] Master-only TwoWire (I2C) class for LPC1768
 2018-01-23 20:14:02 -06:00
Scott LahteineandGitHub c19327f1bb Merge pull request #9325 from thinkyhead/bf2_simple_patches 
[2.0.x] Optimize some strings, arc length calculation
 2018-01-23 19:27:52 -06:00
Scott LahteineandGitHub c9bda932fe Patch M114 D logical output 2018-01-23 18:50:37 -06:00
Scott LahteineandGitHub 4eb41031e9 Merge pull request #9312 from thinkyhead/bf2_fade_info_too 
[2.0.x] Include Z Fade in log_machine_info
 2018-01-23 14:32:20 -06:00
Scott LahteineandGitHub 62ecc74e76 Merge pull request #9297 from thinkyhead/bf2_fix_skew_factor 
[2.0.x] Fix Skew Correction pre-calculation overflow error
 2018-01-22 08:45:11 -06:00
Scott LahteineandGitHub 205c5fa078 Merge pull request #9277 from oysteinkrog/fix/DualX_Endstops 
[2.0.x] Fix DUAL_X_CARRIAGE endstop tests
 2018-01-22 07:42:49 -06:00
Scott LahteineandGitHub a19656e7cb Merge pull request #9290 from thinkyhead/bf2_print_start_fix 
[2.0.x] Minor filament change improvements
 2018-01-22 06:10:58 -06:00
Scott LahteineandGitHub 7a52dfad55 Merge pull request #9283 from thinkyhead/bf2_jgaurora_configs 
[2.0.x] Add JGAurora A5 support
 2018-01-22 02:21:56 -06:00
Scott LahteineandGitHub b46932f0c0 Merge pull request #9273 from thinkyhead/bf2_creality_tuneup 
[2.0.x] Fix and improve Creality configs
 2018-01-21 02:53:16 -06:00
Scott LahteineandGitHub 49bcb5ce2d Merge pull request #9220 from benlye/lcd-timer 
[2.0.x] Fix LCD timer string length
 2018-01-21 02:47:59 -06:00
Scott LahteineandGitHub 8190fdb260 [2.0.x] Option to use Neopixel as case light (#9270) 
* Add option to use Neopixel as case light

* Apply CASE_LIGHT_USE_NEOPIXEL to example configs
 2018-01-20 16:58:41 -06:00
Scott LahteineandGitHub 2e2fd8fd79 Merge pull request #9261 from tcm0116/2.0.x-delta_softstops 
[2.0.x] Allow DELTA to compile with soft endstops disabled
 2018-01-20 14:16:30 -06:00
Scott LahteineandGitHub 750cc02b3a Use delay() in serial temp report 2018-01-20 14:13:17 -06:00
Scott LahteineandGitHub 9de8c04945 Allow FIL_RUNOUT_PIN override on RAMPS-based boards 2018-01-20 12:00:59 -06:00
Scott LahteineandGitHub 57b61491d3 Set FIL_RUNOUT_PIN for Creality CR10-S 
Tested with M43 and found to be connected to DIO 2
 2018-01-20 11:56:57 -06:00
Scott LahteineandGitHub 4a4d832344 Use standard encoder pulses/steps for CR-10S 2018-01-20 11:35:52 -06:00
Scott LahteineandGitHub 4bc4351250 Date refresh 2018-01-20 09:17:57 -06:00
Scott LahteineandGitHub 303d792b9f Merge pull request #9253 from tcm0116/2.0.x-mks_sbase 
[2.0.x] Cleanup MKS-SBASE compile warnings
 2018-01-19 22:37:38 -06:00
Scott LahteineandGitHub afec16e644 Merge pull request #9240 from tcm0116/2.0.x-eeprom 
[2.0.x] Follow-on to #9161
 2018-01-19 22:36:24 -06:00
Scott LahteineandGitHub f2ea8a0529 Merge pull request #9197 from p3p/pr_bf2_operation_freemem 
[2.0.x] LPC1768: Free up some RAM
 2018-01-19 22:35:45 -06:00
Scott LahteineandGitHub 5367a1f51f Merge pull request #9216 from benlye/update-gitignore 
[2.0.x] Additional .gitignore entry for VS Code
 2018-01-19 22:33:41 -06:00
Scott LahteineandGitHub 0c176c677e Merge pull request #9231 from GMagician/2.0.x-ramps-pins-fixup 
[2.0.x] Expand RAMP case light possibilities
 2018-01-19 22:29:32 -06:00
Scott LahteineandGitHub f2d09f27bb Merge pull request #9246 from GMagician/2.0.x-bed-temp-limit-fix 
[2.0.x] Standardized max temp values
 2018-01-19 22:27:19 -06:00
Scott LahteineandGitHub c7bad74d8f Merge pull request #9202 from benlye/m73-bugfix 
[2.0.x] Fix progress bar duration when time is exactly 86400s
 2018-01-16 21:14:58 -06:00
Scott LahteineandGitHub 72b7331f5f Merge pull request #8806 from fiveangle/bf-circleci_config 
[2.0.x] Validate example configs with CircleCI
 2018-01-15 05:26:30 -06:00
Scott LahteineandGitHub d5bf9e74c4 Merge pull request #8996 from p3p/pr_bf2_more_adc_filter 
[2.0.x] PID control fix and more LPC1768 ADC filtering
 2018-01-15 05:14:25 -06:00
Scott LahteineandGitHub 4d2f277d43 Merge pull request #9189 from psavva/tmc_debug_compile_fix 
[2.0.x] Fixes TMC_DEBUG compilation error
 2018-01-15 04:52:21 -06:00
Scott LahteineandGitHub 43d3d024ac Update tmc_util.cpp 2018-01-15 04:51:59 -06:00
Scott LahteineandGitHub f4e4c7a7c8 Merge pull request #9188 from thinkyhead/bf2_creality_ender 
[2.0.x] Add Creality Ender config/board
 2018-01-15 04:33:09 -06:00
Scott LahteineandGitHub d743d96886 Merge pull request #9150 from Spawn32/bugfix-2.0.x 
Bugfix 2.0.x New board and MCU for Marlin.
 2018-01-15 03:51:00 -06:00
Scott LahteineandGitHub 1a3d2ad275 Merge pull request #9168 from marvin-sinister/rename-M100-2.0.x 
[2.0.x] Rename M200 pins file to uppercase
 2018-01-15 00:49:06 -06:00
Scott LahteineandGitHub 3ae41e5f7f Merge pull request #9152 from thinkyhead/bf2_anti_stutter 
[2.0.x] Ensure smooth printer movements
 2018-01-14 23:34:01 -06:00
Scott LahteineandGitHub 3b15c88225 Merge pull request #9153 from thinkyhead/bf2_malyan_support 
[2.0.x] Fix support for Malyan M150
 2018-01-14 22:54:00 -06:00
Scott LahteineandGitHub 5578dccaa0 Merge pull request #9161 from tcm0116/2.0.x-eeprom 
[2.0.x] Fix EEPROM SettingsData for 32-bit architectures
 2018-01-14 20:50:37 -06:00
Scott LahteineandGitHub 6ba8cf8405 Merge pull request #9163 from GMagician/2.0.x-SD-issues-fix 
[2.0.x] sd issue fix
 2018-01-14 20:48:52 -06:00
Scott LahteineandGitHub e654ea1e1a Merge pull request #9130 from thinkyhead/bf2_tmc_followup 
[2.0.x] More TMC followup
 2018-01-11 03:40:45 -06:00
Scott LahteineandGitHub 06eb46b1d4 Merge pull request #9144 from thinkyhead/bf2_Creality_CR-10S 
[2.0.x] Creality CR-10S configurations
 2018-01-11 01:33:52 -06:00
Scott LahteineandGitHub d7fd78cb91 Merge pull request #8148 from tcm0116/2.0.x-multi_host 
[2.0.x] Add multi-host support
 2018-01-10 02:38:59 -06:00
Scott LahteineandGitHub cf654b9a1a Merge pull request #9131 from Bob-the-Kuhn/LPC-formatted-prints 
[2.0.x] LPC1768 formatted print statements
 2018-01-09 23:44:10 -06:00
Scott LahteineandGitHub a94104dbb5 Merge pull request #9113 from teemuatlut/TMC_followup 
[2.0.x]TMC followup
 2018-01-09 18:46:35 -06:00
Scott LahteineandGitHub 7e000e6af4 More EEPROM field debugging (#9123) 2018-01-09 18:33:44 -06:00
Scott LahteineandGitHub e180b7a460 Merge pull request #9087 from thinkyhead/bf2_mbl_localize 
[2.0.x] MBL cleanup, has_mesh() method
 2018-01-07 20:10:22 -06:00
Scott LahteineandGitHub 95065791b3 Merge pull request #9086 from fiveangle/bf2-hasmesh_on_g29s3 
[2.0.x] Set has_mesh if user issues G9 S3 with MBL
 2018-01-06 23:27:53 -06:00
Scott LahteineandGitHub 2b5a9be49c Fix M503 skew output 
Followup to 19e75ccf86
 2018-01-06 20:55:57 -06:00
Scott LahteineandGitHub cf3fd21234 Merge pull request #9077 from GMagician/2.0.x-bmp-fix 
[2.0.x] Clockwise bmp fix
 2018-01-06 13:53:48 -06:00
Scott LahteineandGitHub 013c911a82 Merge pull request #9056 from thinkyhead/bf2_new_eeprom_powers 
[2.0.x] New EEPROM powers
 2018-01-05 18:19:35 -06:00
Scott LahteineandGitHub 1746a7352e Merge pull request #9042 from thinkyhead/bf2_M701_M702 
[2.0.x] Improved Pause/Load/Unload, M701-M702
 2018-01-04 19:41:58 -06:00
Scott LahteineandGitHub 41246b45f1 Merge pull request #9040 from thinkyhead/bf2_m303_bughunt 
[2.0.x] M303 pid autotune cleanup, comment
 2018-01-03 23:17:59 -06:00
Scott LahteineandGitHub 724e3f33bc Merge pull request #9001 from Tannoo/(2.0.x)_LCD_EEPROM_init_fix 
[2.0.x] EEPROM init fix
 2018-01-03 05:47:01 -06:00
Scott LahteineandGitHub fc67c64b8f Merge pull request #8989 from tcm0116/2.0.x_ubl 
[2.0.x] Fix UBL compilation warnings
 2018-01-02 21:38:45 -06:00
Scott LahteineandGitHub d190c702de Add MKS_BASE Microstepping pins 
Based on #9008
 2018-01-01 18:49:21 -06:00
Scott LahteineandGitHub 9312ee63b0 Merge pull request #8979 from thinkyhead/bf2_sync_up_configs 
[2.0.x] Synchronize configs with 1.1.x
 2017-12-31 01:15:43 -06:00
Scott LahteineandGitHub 41dfb229ec Merge pull request #8978 from thinkyhead/bf2_slimming_option 
[2.0.x] SLIM_LCD_MENUS option
 2017-12-31 00:56:29 -06:00
Scott LahteineandGitHub 3dd04736c0 Update M17_M18_M84.cpp 2017-12-31 00:26:45 -06:00
Scott LahteineandGitHub 5294fd132f Merge pull request #8924 from ejtagle/bugfix-2.0.x 
[2.0.x] Improve SW SPI for DUE a bit more
 2017-12-30 23:32:46 -06:00
Scott LahteineandGitHub 7cc2193bce Add Tronxy X1 example config (#8972) 2017-12-30 17:25:31 -06:00
Scott LahteineandGitHub 2b1e6829b3 Merge pull request #8966 from thinkyhead/bf2_better_no_reentry 
[2.0.x] ultralcd.cpp: Better no_reentry, use in queuing G-code
 2017-12-30 16:33:24 -06:00
Scott LahteineandGitHub 8274369522 Merge pull request #8945 from thinkyhead/bf2_better_char_lcd 
[2.0.x] Display up to 3 extruders on char LCD
 2017-12-28 20:48:14 -06:00
Scott LahteineandGitHub db32c185ae Merge pull request #8860 from Bob-the-Kuhn/2.0.x-DUE-RRDFGSC 
[2.0.x] DUE - update for Reprap Discount Full Graphic Smart Controller
 2017-12-27 05:06:49 -06:00
Scott LahteineandGitHub f8156d2d2c Merge pull request #8913 from thinkyhead/bf2_multitool_M600 
[2.0.x] Multi extruder support for M600 / LCD
 2017-12-27 04:40:50 -06:00
Scott LahteineandGitHub fb6966f2b5 Merge pull request #8912 from thinkyhead/bf2_no_vol_fix 
[2.0.x] No sub-menu if NO_VOLUMETRICS
 2017-12-26 18:46:39 -06:00
Scott LahteineandGitHub 95b82ae5e3 Merge pull request #8893 from thinkyhead/bf2_action_on_action 
[2.0.x] Fixes for G29, esp. 3POINT
 2017-12-25 08:45:53 -06:00
Scott LahteineandGitHub 68438b0d4e Merge pull request #8889 from thinkyhead/bf2_action_on_action 
[2.0.x] //Actions on Pause / Resume (M600, M125, etc.)
 2017-12-25 07:30:24 -06:00
Scott LahteineandGitHub f218eb0ddf Merge pull request #8887 from thinkyhead/bf2_reduce_jerk_default 
[2.0.x] Reduce default jerk. XY by half. Z by 1/4
 2017-12-24 21:48:35 -06:00
Scott LahteineandGitHub 723da1d7a5 Merge pull request #8872 from Bob-the-Kuhn/2.0.x-deglitch 
[2.0.x] remove SET_OUTPUT glitch - LPC1768 & DUE
 2017-12-24 19:39:00 -06:00
Scott LahteineandGitHub 869c89d83f Merge pull request #8865 from thinkyhead/bf2_more_scara_scaling 
[2.0.x] SCARA Feedrate Scaling for G2/G3 - using HYPOT
 2017-12-24 19:18:13 -06:00
Scott LahteineandGitHub 737561c1b3 Merge pull request #8876 from subdancer/bugfix-2.0.x 
[2.0.x] RADDS LCD Display
 2017-12-24 19:17:14 -06:00
Scott LahteineandGitHub 4a8fd8ae92 Merge pull request #8853 from ejtagle/bugfix-2.0.x 
USB Mass Storage Implementation / CDC with HW flow control and misc fixes and improvements for Arduino DUE/RE-ARM based boards
 2017-12-24 18:50:28 -06:00
Scott LahteineandGitHub 2d75b540e2 Merge pull request #8867 from tcm0116/2.0.x_pio_errors 
[2.0.x][PlatformIO] Stop compiling after first five errors
 2017-12-24 18:49:43 -06:00
Scott LahteineandGitHub aa97cd6e9b Merge pull request #8871 from petrzjunior/bugfix-2.0.x 
[2.0.x][Language] Update Czech for Dec 2017
 2017-12-24 18:48:59 -06:00
Scott LahteineandGitHub 2b0165e90c Merge pull request #8878 from tcm0116/2.0.x_revert 
[2.0.x] Revert "Followup to #8698"
 2017-12-24 18:46:02 -06:00
Scott LahteineandGitHub ca145643bd Merge pull request #8863 from thinkyhead/bf2_restore_position_float 
[2.0.x] Restore position_float to LIN_ADVANCE
 2017-12-21 17:12:28 -06:00
Scott LahteineandGitHub 63cc34f632 Merge pull request #8846 from thinkyhead/bf2_no_volumetrics 
[2.0.x] One setting to validate filament width
 2017-12-19 23:31:23 -06:00
Scott LahteineandGitHub 5a0f9605e3 Merge pull request #8842 from thinkyhead/bf2_no_volumetrics 
[2.0.x] Add option for NO_VOLUMETRICS
 2017-12-19 21:14:35 -06:00
Scott LahteineandGitHub a891d8d738 Merge pull request #8820 from thinkyhead/bf2_mks_sbase_spi 
[2.0.x] Fix SDSUPPORT for MKS SBASE
 2017-12-17 21:15:49 -06:00
Scott LahteineandGitHub 029333a8eb Merge pull request #8819 from thinkyhead/bf2_reverting_XXXX 
[2.0.x] Revert "Initial step correction"
 2017-12-17 20:59:41 -06:00
Scott LahteineandGitHub 1de7c75590 Merge pull request #8799 from thinkyhead/bf2_zonestar_tronxy 
[2.0.x] Support for Tronxy and Zonestar LCD
 2017-12-15 19:55:36 -06:00
Scott LahteineandGitHub 20008b72a8 Merge pull request #8784 from fiveangle/bf2-travis_examples_squashed 
[2.0.x] Fix example configs and add to TravisCI tests - squashed
 2017-12-15 17:34:34 -06:00
Scott LahteineandGitHub f9aa1daa0d Merge pull request #8793 from robpower/NanoDLP_Sync_improvement_2 
[2.0.x] V2 Extended NanoDLP_Z_Move_Sync to G4 & G28,Added all axis option.
 2017-12-15 16:42:29 -06:00
Scott LahteineandGitHub 4782acf60e Merge pull request #8780 from fiveangle/bf2-typo 
[2.0.x] typo in Marlin.cpp
 2017-12-15 15:25:41 -06:00
Scott LahteineandGitHub 09d13f186f Correct unskew, after all 2017-12-15 14:24:20 -06:00
Scott LahteineandGitHub c5632bb91b Merge pull request #8792 from fiveangle/bf2-HAS_HEAT_BED_conditional 
[2.0.x] Missing HAS_HEAT_BED conditional
 2017-12-15 14:18:48 -06:00
Scott LahteineandGitHub 21a7b4f26d Merge pull request #8773 from thinkyhead/bf2_filwidth_refinement 
[2.0.x] Comment, fix filament width sensor
 2017-12-13 16:26:11 -06:00
Scott LahteineandGitHub a641992c1d Merge pull request #8762 from victorpv/patch-2 
[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
 2017-12-12 18:28:18 -06:00