felix/Marlin
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,291 Commits 1 Branch 0 Tags
7cb3640ea4a53e6152cbb8eb1605564150d38b36
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine dc85b604bb Merge pull request #9591 from teemuatlut/bf1_fix_M914 
[1.1.x] Fix M914 macro
 2018-02-11 08:21:24 -06:00
Scott Lahteine aa3292cc57 Merge pull request #9592 from thinkyhead/bf1_26_days_later 
[1.1.x] Apply buried PR for parity with 2.0.x
 2018-02-11 06:37:35 -06:00
Scott Lahteine 69a5e0c136 Add 'mffp' to quickly push upstream (#9588) 2018-02-11 02:21:52 -06:00
Scott Lahteine 016171d682 Merge pull request #9575 from thinkyhead/bf1_more_tests 
[1.1.x] Fix Power class
 2018-02-10 15:49:51 -06:00
Scott Lahteine 7145731844 Merge pull request #9555 from wizhippo/tronxyx5s 
[1.1.x] Tronxy X5S
 2018-02-10 15:13:12 -06:00
Scott Lahteine d6d01f1f8e Merge pull request #9571 from thinkyhead/bf1_french_update 
Update French language
 2018-02-10 14:15:13 -06:00
Scott Lahteine 8f4c564b04 Merge pull request #9565 from teemuatlut/bf1_init_cs_pins 
[1.1.x] Init CS pins before loading settings
 2018-02-10 14:08:16 -06:00
Scott Lahteine 5a53e4d921 Merge pull request #9548 from thinkyhead/bf1_prevent_comments_resetting 
[1.1.0] Prevent watchdog reset due to many comments
 2018-02-09 07:15:10 -06:00
Scott Lahteine 8979990805 Merge pull request #9543 from thinkyhead/bf1_reliable_probe_heaters_off 
[1.1.x] More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING
 2018-02-09 07:10:33 -06:00
Scott Lahteine ad323d852e Sanity check for SERIAL_PORT 
Addressing #7400
 2018-02-09 00:41:39 -06:00
Scott Lahteine 4300547c66 Size lcd_status_message based on language (#9546) 2018-02-08 23:03:27 -06:00
Scott Lahteine 169515404d Merge pull request #9538 from shaktee/bibo-cyclops-1.1x 
[1.1.x] BIBO Cyclops
 2018-02-08 21:00:59 -06:00
Scott Lahteine cffbb146ea Correct some retract() comments 2018-02-08 17:56:53 -06:00
Scott Lahteine c1a3ec1228 Tweaky followup to I2CPEM update 2018-02-08 03:21:46 -06:00
Scott Lahteine bdbd15e6d9 Merge pull request #9504 from jaysonkelly/patch-1 
[1.1.x] I2C Position Encoders update
 2018-02-08 02:57:45 -06:00
Scott Lahteine 5c2cb60f03 Merge pull request #9518 from melvinisken/bugfix-1.1.x 
[1.1.x] Changed software serial pins to enable R/W access to TMC2208 drivers
 2018-02-08 02:56:58 -06:00
Scott Lahteine b509567567 Merge pull request #9514 from FreeJaus/bugfix-1.1.x-eu 
update eu language
 2018-02-08 02:10:58 -06:00
Scott Lahteine 2c6c9e90df Merge pull request #9508 from tnw513/fix-italian 
Fix italian translation
 2018-02-08 02:10:46 -06:00
Scott Lahteine f089bbbc93 Merge pull request #9531 from thinkyhead/bf1_misc_cleanup_feb7 
[1.1.x] Misc. cleanups
 2018-02-08 01:50:17 -06:00
Scott Lahteine 50582e3b47 Add sublime-project file (#9527) 2018-02-07 15:50:00 -06:00
Scott Lahteine ca76c3df7a Merge pull request #9497 from thinkyhead/bf1_marlin_ino 
[1.1.x] Marlin.ino needs no content
 2018-02-06 02:28:02 -06:00
Scott Lahteine 1e4482df54 Merge pull request #9499 from thinkyhead/bf1_auto_power 
[1.1.x] Enable / disable PSU automatically
 2018-02-06 00:36:31 -06:00
Scott Lahteine 1dc6d50dca Merge pull request #9500 from FreeJaus/bugfix-1.1.x-i3PB-GT2560_REV_A_PLUS 
[1.1.x] Configs for Prusa i3 Pro B
 2018-02-06 00:18:59 -06:00
Scott Lahteine 6dbeca94b3 Merge pull request #6735 from Project-J2/UltiController-v2.1-support 
[1.1.x] UltiController v2.1 support
 2018-02-05 22:32:27 -06:00
Scott Lahteine 123c6c5d34 Num-to-string functions for DEBUG_LEVELING_FEATURE 
Fix #9429
 2018-02-05 19:05:07 -06:00
Scott Lahteine 8da92b6823 Fix default arg in lcd_goto_screen 2018-02-05 16:41:59 -06:00
Scott Lahteine b708bcf8b1 sp 2018-02-05 15:56:58 -06:00
Scott Lahteine 7b3e28fc77 Merge pull request #9489 from GMagician/1.1.x-Simplify-bltouch-configuration 
[1.1.x] Simplify bltouch configuration
 2018-02-05 14:37:34 -06:00
Scott Lahteine 873fb84d27 Fix const mesh_index_pair in G26 
Followup to #9493
 2018-02-05 14:29:47 -06:00
Scott Lahteine 7d8f49f82c Merge pull request #9493 from GMagician/1.1.x-Fix-compile-error 
[1.1.x] Fix compiler error when G26 is enabled
 2018-02-05 14:25:44 -06:00
Scott Lahteine 4d2355cc9e Merge pull request #9485 from thinkyhead/bf1_malyan_clueless_controller 
[1.1.x] Malyan LCD controller
 2018-02-05 05:03:07 -06:00
Scott Lahteine ad70d76faa Merge pull request #9332 from paierh/bugfix-1.1.x-UBL-pattern 
[1.1.x] Change angles for circles in G26-validation-pattern
 2018-02-04 19:05:32 -06:00
Scott Lahteine 8f787cc474 Merge pull request #9281 from floyd871/patch-1 
[1.1.x] Allow override of RAMPS CS Pins
 2018-02-04 16:38:13 -06:00
Scott Lahteine 9c3a562208 Merge pull request #9448 from tcm0116/1.1.x-kinematic 
[1.1.x] Apply feedrate to nozzle movement for kinematic machines
 2018-02-03 23:00:00 -06:00
Scott Lahteine b11e78f5f7 Merge pull request #9462 from GMagician/1.1.x-temperature-out-of-lcd 
[1.1.x] Fix temperature out of LCD
 2018-02-03 19:24:38 -06:00
Scott Lahteine 6445859270 Merge pull request #9373 from nikkoura/fix_fr_strings 
[1.1.x] Fix french language (typos, case homogeneity)
 2018-02-02 01:54:12 -06:00
Scott Lahteine 22e688460f Merge pull request #9381 from thinkyhead/bf1_enhance_boot_status 
[1.1.x] Enhance GLCD Boot/Status screens
 2018-02-02 01:40:08 -06:00
Scott Lahteine 0a10d010b7 Merge pull request #9390 from tcm0116/1.1.x-retract 
[1.1.x] Clear retracted status when homing the Z axis
 2018-02-01 23:36:53 -06:00
Scott Lahteine 65c2f3bb65 Merge pull request #9435 from thinkyhead/cleanup_binary_deleteme 
[1.1.x] Separate 32-bit wide bit macros
 2018-02-01 22:44:18 -06:00
Scott Lahteine ec9a5b7157 Merge pull request #9434 from thinkyhead/bf1_fix_G29_W_I_J_Z 
[1.1.x] Fix broken G29 W I J
 2018-02-01 21:53:10 -06:00
Scott Lahteine d60e5c89d8 Merge pull request #9326 from thinkyhead/bf1_fix_parser_M118 
[1.1.x] Fix parser.has_value, M118 parameters
 2018-01-24 00:23:50 -06:00
Scott Lahteine 57d68e0d01 Merge pull request #9317 from smay4finger/fileattributes 
Fileattributes
 2018-01-24 00:18:30 -06:00
Scott Lahteine e5c6448063 Merge pull request #9323 from thinkyhead/bf1_simple_patches 
[1.1.x] Optimize some strings, arc length calculation
 2018-01-23 19:13:00 -06:00
Scott Lahteine 87c254b238 Patch M114 D logical output 2018-01-23 18:48:53 -06:00
Scott Lahteine cc9165cb99 Merge pull request #9311 from thinkyhead/bf1_fade_info_too 
[1.1.x] Include Z Fade in log_machine_info
 2018-01-23 14:08:59 -06:00
Scott Lahteine 3175266681 Merge pull request #9298 from thinkyhead/bf1_fix_skew_factor 
[1.1.x] Fix Skew Correction pre-calculation overflow error
 2018-01-22 08:33:25 -06:00
Scott Lahteine 6799aa9806 Merge pull request #9278 from oysteinkrog/fix/DualX_Endstops_1.1.x 
[1.1.x] Fix DUAL_X_CARRIAGE endstop tests
 2018-01-22 07:42:28 -06:00
Scott Lahteine a29ca4947e Merge pull request #9263 from thinkyhead/bf1_print_start_fix 
[1.1.x] Minor filament change improvements
 2018-01-22 05:52:58 -06:00
Scott Lahteine 74873f377d Merge pull request #9289 from thinkyhead/bf1_ms_cs_pins_fixup 
[1.1.x] Patch MSn pins, sanity-check TMC CS pins
 2018-01-22 02:27:27 -06:00
Scott Lahteine dff96a8952 Merge pull request #9288 from thinkyhead/bf1_grid_bounds 
[1.1.x] Better probe boundaries for linear/grid
 2018-01-22 01:23:42 -06:00
Scott Lahteine b0bfa65be7 Merge pull request #9282 from thinkyhead/bf1_jgaurora_configs 
[1.1.x] Add JGAurora A5 support
 2018-01-22 00:46:14 -06:00
Scott Lahteine 7b62670987 Merge pull request #9272 from thinkyhead/bf1_creality_tuneup 
[1.1.x] Fix and improve Creality configs
 2018-01-21 02:53:08 -06:00
Scott Lahteine 7b5a4f71be Fix toDigital length with days 
From #9220
 2018-01-21 02:50:54 -06:00
Scott Lahteine 02e2ace199 Merge pull request #9199 from nhchiu/Case-Light-use-NEOPIXEL 
[1.1.x] Use NEOPIXEL as case light
 2018-01-21 01:52:31 -06:00
Scott Lahteine 369f1a64d8 Merge pull request #9262 from tcm0116/1.1.x-delta_softstops 
[1.1.x] Allow DELTA to compile with soft endstops disabled
 2018-01-20 14:16:14 -06:00
Scott Lahteine 6ed2840615 Use delay() in serial temp report 2018-01-20 14:12:30 -06:00
Scott Lahteine eb3a05c437 Allow FIL_RUNOUT_PIN override on RAMPS-based boards 2018-01-20 12:00:03 -06:00
Scott Lahteine d29a0d64d5 Set FIL_RUNOUT_PIN for Creality CR10-S 
Tested with M43 and found to be connected to DIO 2
 2018-01-20 11:58:37 -06:00
Scott Lahteine 09ad00b2d1 Use standard encoder pulses/steps for CR-10S 2018-01-20 11:34:53 -06:00
Scott Lahteine f360b3b849 Date refresh 2018-01-20 09:17:00 -06:00
Scott Lahteine 74c23bf80d Merge pull request #9232 from GMagician/1.1.x-ramps-pins-fixup 
[1.1.x] Expand RAMP case light possibilities
 2018-01-19 22:29:09 -06:00
Scott Lahteine 8d14ff1446 Merge pull request #9248 from GMagician/1.1.x-bed-temp-limit-fix 
[1.1.x] Standardized max temp values
 2018-01-19 22:27:00 -06:00
Scott Lahteine 333bd8f394 Merge pull request #9203 from benlye/m73-bugfix-1.1.x 
[1.1.x] Fix progress bar duration when time is exactly 86400s
 2018-01-16 21:14:31 -06:00
Scott Lahteine d25487dfb9 Merge pull request #9160 from tommie/ender/bugfix-1.1.x 
[1.1.x] Creality Ender support
 2018-01-15 03:48:47 -06:00
Scott Lahteine 90125ab639 Merge pull request #9186 from thinkyhead/bf1_cooler_cr10s 
[1.1.x] More featureful CR-10S configuration
 2018-01-15 02:50:16 -06:00
Scott Lahteine 175207659a Merge pull request #9183 from thinkyhead/bf1_new_flsun_config 
[1.1.x] Add FLSUN Kossel configuration
 2018-01-15 00:49:25 -06:00
Scott Lahteine 1d8b03964f Merge pull request #9164 from GMagician/1.1.x-SD-issues-fix 
[1.1.x] sd issue fix
 2018-01-14 20:47:04 -06:00
Scott Lahteine 59d48b9b1f Merge pull request #9143 from thinkyhead/bf1_Creality_CR-10S 
[1.1.x] Creality CR-10S configurations
 2018-01-11 01:24:44 -06:00
Scott Lahteine 044938bfd0 Merge pull request #9129 from thinkyhead/bf1_tmc_followup 
[1.1.x] TMC followup
 2018-01-10 23:07:15 -06:00
Scott Lahteine 9714c9aebe Merge pull request #9128 from fiveangle/bf1-disable_serial_stats_on_usbcon 
[1.1.x] SERIAL_STATS_* features not supported on USBCON targets
 2018-01-09 18:42:26 -06:00
Scott Lahteine d7651ea0d0 Merge pull request #9122 from thinkyhead/bf1_eeprom_debug 
[1.1.x] More EEPROM field debugging, 2.0.x parity
 2018-01-09 18:33:24 -06:00
Scott Lahteine 97b6eabe0c Merge pull request #9103 from zarthcode/patch-2 
fix fwretract structure reference #9102
 2018-01-08 19:27:18 -06:00
Scott Lahteine f8dee4e726 Merge pull request #9088 from thinkyhead/bf1_mbl_localize 
[1.1.x] MBL cleanup, has_mesh() method
 2018-01-07 20:10:10 -06:00
Scott Lahteine fa3709451b Set mbl.has_mesh on manual point entry 
Based on #9086
 2018-01-06 23:32:00 -06:00
Scott Lahteine eaa6257baf Fix M503 skew output 
Followup to 1761cacaa1
 2018-01-06 20:53:33 -06:00
Scott Lahteine f2fd9ab1b0 Merge pull request #9081 from thinkyhead/bf1_patch_m5 
[1.1.x] Set laser/spindle PWM to lowest speed on M5
 2018-01-06 15:29:51 -06:00
Scott Lahteine b83c49befb Merge pull request #9078 from GMagician/1.1.x-bmp-fix 
[1.1.x] Clockwise bmp fix
 2018-01-06 13:53:27 -06:00
Scott Lahteine 0970dbcdf3 Merge pull request #9017 from thinkyhead/bf1_better_eeprom_init 
[1.1.x] New EEPROM powers
 2018-01-05 18:19:27 -06:00
Scott Lahteine fd4f49512d Merge pull request #9054 from thinkyhead/bf1_fwretract_class 
[1.1.x] FWRetract class for 2.0.x parity
 2018-01-04 19:40:32 -06:00
Scott Lahteine 518d9beb83 Merge pull request #9053 from thinkyhead/bf1_parser_squish 
[1.1.x] Reduce process_parsed_command lines
 2018-01-04 17:06:14 -06:00
Scott Lahteine c5e31b1723 Merge pull request #9032 from tcm0116/1.1.x-ultralcd 
[1.1.x] Fix 'lcd_temp_menu_e0_filament_change' was not declared error
 2018-01-03 21:34:37 -06:00
Scott Lahteine 20d55e5fed Merge pull request #9039 from thinkyhead/bf1_m303_bughunt 
[1.1.x] Cleanup, commentary of M303 pid tuning code
 2018-01-03 21:33:59 -06:00
Scott Lahteine 36541d61ab Merge pull request #9038 from thinkyhead/bf1_fix_resume_pos 
[1.1.x] Fix resume_print positioning
 2018-01-03 20:46:50 -06:00
Scott Lahteine c893a90d64 Merge pull request #8988 from tcm0116/1.1.x_ubl 
[1.1.x] Fix UBL compilation warnings
 2018-01-02 21:37:59 -06:00
Scott Lahteine ba9879f8fa Merge pull request #9008 from karkla/bugfix-1.1.x 
[1.1.x] Update pins_MKS_BASE.h with Microstepping pin definitions
 2018-01-01 18:47:59 -06:00
Scott Lahteine 3cd48db9a9 Merge pull request #8983 from ABH10/bugfix-1.1.x_thermistor-tables 
[1.1.x] Update of comments in thermistor table files. No functional changes.
 2018-01-01 18:40:29 -06:00
Scott Lahteine 8e82dd0b5b Merge pull request #8947 from houseofbugs/bugfix-1.1.x 
[1.1.x] SLIM_LCD_MENUS option
 2017-12-31 00:56:10 -06:00
Scott Lahteine 5f13e2e336 Merge pull request #8977 from thinkyhead/bf1_sync_up_configs 
[1.1.x] Synchronize configs with 2.0.x
 2017-12-31 00:55:39 -06:00
Scott Lahteine 4153d76810 Update Marlin_main.cpp 2017-12-31 00:24:57 -06:00
Scott Lahteine 1e18d716c2 Merge pull request #7107 from tcm0116/load_unload 
[1.1.x] Add M701 and M702 filament load and unload
 2017-12-30 23:34:16 -06:00
Scott Lahteine eaf681675a Merge pull request #8965 from thinkyhead/bf1_better_no_reentry 
[1.1.x] ultralcd.cpp: Improve no_reentry, use when queuing G-code
 2017-12-30 04:24:24 -06:00
Scott Lahteine 025a4558fb Merge pull request #8944 from zarthcode/patch-1 
Fix malformed Capabilities report
 2017-12-28 21:06:23 -06:00
Scott Lahteine f9b7659b56 Merge pull request #8907 from marcio-ao/bugfix-1.1.x 
[1.1.x] Multi extruder support for M600 / LCD
 2017-12-27 01:30:32 -06:00
Scott Lahteine ecba9b6738 Merge pull request #8897 from thinkyhead/bf1_lcd_click_redraw 
[1.1.x] Clear lcd_clicked on use
 2017-12-26 20:54:31 -06:00
Scott Lahteine 93e3b3d5ba Merge pull request #8911 from houseofbugs/patch-1 
[1.1.x] Fix NO_VOLUMETRICS compile error
 2017-12-26 20:25:20 -06:00
Scott Lahteine 99f98890c2 Merge pull request #8892 from thinkyhead/bf1_action_on_action 
[1.1.x] Fixes for G29 / 3POINT
 2017-12-25 09:08:02 -06:00
Scott Lahteine 395235a529 Merge pull request #8891 from thinkyhead/bf1_action_on_action 
[1.1.x] Allow consecutive uses of G29
 2017-12-25 07:30:04 -06:00
Scott Lahteine 19e768d43d Merge pull request #8849 from silentninja1/patch-3 
[1.1.x] //Actions on Pause / Resume (M600, M125, etc.)
 2017-12-25 04:41:37 -06:00
Scott Lahteine 1bb5791e64 Merge pull request #8888 from thinkyhead/bf1_reduce_jerk_default 
[1.1.x] Reduce default jerk
 2017-12-24 21:48:39 -06:00
Scott Lahteine aa9cad0cc6 Merge pull request #8870 from petrzjunior/bugfix-1.1.x 
[1.1.x][Language] Update Czech for Dec 2017
 2017-12-24 18:48:37 -06:00