felix/Marlin
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,576 Commits 1 Branch 0 Tags
39cc36d3f1f3b245b229ebf91d814bf8f13d97e4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine 87d3a1ae4d Merge pull request #8228 from tcm0116/1.0.x-dual_stepper 
[1.1.x] Fix automatic stepper assignment for X/Y/Z dual stepper drivers
 2017-11-03 03:08:43 -05:00
Scott Lahteine 5289c4135a Merge pull request #8230 from AnHardt/1.1_watchdog 
[1.1] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
 2017-11-03 03:06:45 -05:00
Scott Lahteine 41ba4e507e Merge pull request #8216 from jmdearras/bugfix-1.1.x 
Restore MKS_GEN_L
 2017-11-02 16:58:27 -05:00
Scott Lahteine 1b68ee82ce Merge pull request #8196 from thinkyhead/bf1_asterisk_not_special 
[1.1.x] Allow asterisks in G-Code commands
 2017-10-31 21:53:26 -05:00
Scott Lahteine b63a55666d Merge pull request #8193 from thinkyhead/bf1_silver_gate 
[1.1.x] Support for SilverGate Board
 2017-10-31 16:25:46 -05:00
Scott Lahteine b48a77c88a Merge pull request #8182 from thinkyhead/bf1_fix_bootscreen_repeat 
[1.1.x] Only show custom bootscreen once
 2017-10-31 02:37:24 -05:00
Scott Lahteine 4817c0d055 Merge pull request #8167 from thinkyhead/bf1_config_tweak 
[1.1.x] Kinematic clamp_to_software_endstops
 2017-10-30 19:20:45 -05:00
Scott Lahteine d9cb7be444 Merge pull request #8160 from thinkyhead/bf1_fixup_sd_reprint 
[1.1.x] Simplify SD_REPRINT_LAST_SELECTED_FILE
 2017-10-29 23:57:44 -05:00
Scott Lahteine 9288d80613 Merge pull request #8156 from thinkyhead/bf1_anet_10_servo 
[1.1.x] Define a default SERVO0_PIN for Anet 1.0
 2017-10-29 19:53:49 -05:00
Scott Lahteine 6698db29de Update LCD draw condition 2017-10-29 19:17:32 -05:00
Scott Lahteine 25e86a520d Merge pull request #8114 from thinkyhead/bf1_print_sd_file_again 
[1.1.x] Cleanup for SD Print Again
 2017-10-29 19:09:34 -05:00
Scott Lahteine a6f7cda23e Merge pull request #8143 from thinkyhead/bf1_dual_xyz_endstops 
Followup to #8123 - to match 2.0.x changes
 2017-10-29 19:04:33 -05:00
Scott Lahteine daa85f71e1 Merge pull request #8123 from thinkyhead/bf1_dual_xyz_endstops 
[1.1.x] Dual endstops XYZ
 2017-10-29 04:36:09 -05:00
Scott Lahteine c0a8275cb0 Merge pull request #8137 from LVD-AC/(1.1.x)bug_G33 
(1.1.x) serious bug G33
 2017-10-29 04:11:54 -05:00
Scott Lahteine 7ade65d44b Merge pull request #8128 from thinkyhead/bf1_revert_babystep_mult 
[1.1.x] Revert default BABYSTEP_MULTIPLICATOR to 1
 2017-10-27 19:55:11 -05:00
Scott Lahteine e374d87ac4 Merge pull request #8112 from thinkyhead/bf1_fwretract_fix_oct26 
[1.1.x] Improved Firmware Retraction logic
 2017-10-26 23:06:27 -05:00
Scott Lahteine a12d1b21b5 Merge pull request #8048 from madmo/mks-mini-gt2560 
[1.1.x] Add MKS MINI 12864 support to GT2560
 2017-10-25 01:13:07 -05:00
Scott Lahteine 5bed2f351a Fix spacing, use single instances of similar pins 2017-10-24 19:12:40 -05:00
Scott Lahteine 209560fcd2 Merge pull request #8043 from thinkyhead/bf1_mesh_consolidate 
[1.1.x] Simplify mesh bounds config
 2017-10-24 18:56:54 -05:00
Scott Lahteine 3235beef6d Merge pull request #8073 from thinkyhead/bf1_fix_M600 
[1.1.x] Fix position sync in M600 pause/resume
 2017-10-24 14:56:01 -05:00
Scott Lahteine e5ab783b08 Merge pull request #8061 from thinkyhead/bf1_general_cleanup 
[1.1.x] Patch up some verbiage in configs
 2017-10-24 14:44:31 -05:00
Scott Lahteine 1d5fb360cc Merge pull request #8020 from thinkyhead/bf1_scroll_longnames 
[1.1.x] Add SCROLL_LONG_FILENAMES to reveal longer filenames
 2017-10-20 21:34:11 -05:00
Scott Lahteine 2338632270 Simplify Cartesian probing bounds 
Followup to #8011
 2017-10-18 17:16:14 -05:00
Scott Lahteine 10d72f31c2 Merge pull request #7991 from thinkyhead/bf1_M106_memorize 
[1.1.x] Add EXTRA_FAN_SPEED feature
 2017-10-16 05:19:32 -05:00
Scott Lahteine 31d0b77df7 Fix usage line in temperature table script 2017-10-16 00:17:06 -05:00
Scott Lahteine 9e82533eb9 Fix spelling in temperature table script 2017-10-16 00:16:25 -05:00
Scott Lahteine 4410aac60b Update temp table script for current format 2017-10-16 00:14:02 -05:00
Scott Lahteine d63d08ef8b Merge pull request #7948 from gallynero/patch-1 
Enable change feedrate in delta
 2017-10-15 16:28:45 -05:00
Scott Lahteine 5911dc597a Merge pull request #7988 from thinkyhead/bf1_progress_percentage 
Add Capability BUILD_PERCENT
 2017-10-15 03:12:31 -05:00
Scott Lahteine 6efad5e495 Merge pull request #7986 from thinkyhead/bf1_progress_percentage 
[1.1.x] Add M73 (LCD_SET_PROGRESS_MANUALLY)
 2017-10-15 02:43:30 -05:00
Scott Lahteine 23dbaaf03b Merge pull request #7983 from thinkyhead/bf1_micromake_c1 
[1.1.x] Micromake C1 Configurations, French for HD44780
 2017-10-14 20:30:06 -05:00
Scott Lahteine be55a49946 Merge pull request #7980 from thinkyhead/bf1_granular_sw_endstops 
[1.1.x] Software endstop options by axis
 2017-10-14 17:37:35 -05:00
Scott Lahteine 0976d22225 Merge pull request #7977 from thinkyhead/bf1_fix_emergency_parser 
[1.1.x] Fix Emergency Parser
 2017-10-14 17:13:04 -05:00
Scott Lahteine 1c3d06876e Merge pull request #7965 from thinkyhead/bf1_ubl_remove_z_offset 
[1.1.x] Unify Z fade factor
 2017-10-14 02:57:13 -05:00
Scott Lahteine fcd3b326e9 Merge pull request #7961 from thinkyhead/bf1_ubl_remove_z_offset 
[1.1.x] Remove obsolete UBL z_offset
 2017-10-13 09:06:38 -05:00
Scott Lahteine f054f566b4 Merge pull request #7918 from thinkyhead/bf1_neopixel_full 
[1.1.x] Different NEOPIXEL types
 2017-10-10 02:35:56 -05:00
Scott Lahteine f835245ee1 Merge pull request #7908 from thinkyhead/bf1_goodbye_legacy_advance 
[1.1.x] Remove legacy ADVANCE feature
 2017-10-10 00:31:39 -05:00
Scott Lahteine 98c7bde514 Merge pull request #7917 from thinkyhead/bf1_lcd_segmented_moves 
[1.1.x] Segmented manual moves for kinematics
 2017-10-10 00:28:44 -05:00
Scott Lahteine 75e4867d22 Merge pull request #7915 from thinkyhead/bf1_probeless_ubl 
[1.1.x] Allow UBL G29 and G26 to build without a probe
 2017-10-09 18:59:01 -05:00
Scott Lahteine 73c5675485 Merge pull request #7867 from thinkyhead/bf1_add_some_lcds 
[1.1.x] Add support for 4 new LCDs
 2017-10-09 18:27:42 -05:00
Scott Lahteine a21201a713 LCD filename already concatentated 2017-10-07 15:14:58 -05:00
Scott Lahteine 53f2f188f2 LCD filename already concatenated 2017-10-07 15:11:28 -05:00
Scott Lahteine a6e95c7d25 Fix display issue with SD_ALPHA_SORT caching 2017-10-07 15:07:05 -05:00
Scott Lahteine e2ceb1b800 Merge pull request #7632 from GMagician/Wrong-sanitycheck-message-fix 
Addressing #7612
 2017-10-07 02:25:35 -05:00
Scott Lahteine 8c93295d62 Merge pull request #7873 from thinkyhead/bf1_anet_encoder_pulses 
[1.1.x] Fixing ANET encoder pulses
 2017-10-07 01:21:14 -05:00
Scott Lahteine b825bc87ae Merge pull request #7871 from thinkyhead/bf1_fix_sd_listing_bug 
[1.1.x] Fix sd file list display bug
 2017-10-07 00:01:59 -05:00
Scott Lahteine a4954a68e0 Merge pull request #7865 from thinkyhead/bf1_finally_G33_is_done 
[1.1.x] G33 completely fixed and done
 2017-10-06 16:01:47 -05:00
Scott Lahteine 2f0164b995 Merge pull request #7864 from thinkyhead/bf1_mapper_c2c3c4_sk 
Tweak spacing in utf8_mapper.h
 2017-10-06 15:19:13 -05:00
Scott Lahteine 5e63ba970d Merge pull request #7862 from thinkyhead/bf1_mapper_c2c3c4_sk 
[1.1.x] Added Slovak C2C3C4 mapper implementation.
 2017-10-06 14:56:26 -05:00
Scott Lahteine 7999249a5c Set TEMP_SENSOR_0 to 1 in CR-10 example config 
As pointed out in #7692 by @totalitarian
 2017-10-06 14:29:00 -05:00
Scott Lahteine 0ec9a7f090 Fix xon_xoff_state initialization 2017-10-04 12:10:15 -05:00
Scott Lahteine a47c5c093d Merge pull request #7459 from ejtagle/xon-xoff-sdxfer 
[1.1.x] XON/XOFF serial handshake (for faster transfers to SD)
 2017-10-02 23:52:41 -05:00
Scott Lahteine 5a674a8e10 Merge pull request #7828 from thinkyhead/bf1_dualx_movex 
[1.1.x] Fix DUAL_X_CARRIAGE manual move
 2017-10-02 23:49:46 -05:00
Scott Lahteine f365448338 Merge pull request #7811 from thinkyhead/bf1_fix_resume_print 
[1.1.x] Fix broken M600 resume_print
 2017-10-01 22:54:34 -05:00
Scott Lahteine 3d1536a1b2 Merge pull request #7814 from thinkyhead/bf1_inhibit_option 
[1.1.x] Option to disallow motion before homing
 2017-10-01 22:53:06 -05:00
Scott Lahteine 80a0f935a1 Fix G10-G11 by adding a synchronize 
Based on #7792 by @tcm0116
 2017-09-30 17:46:31 -05:00
Scott Lahteine de3c9bade6 Merge pull request #7773 from thinkyhead/bf1_lcd_leveling_status 
[1.1.x] Show leveling status on character LCD
 2017-09-27 13:10:37 -05:00
Scott Lahteine 3a8923be74 Merge pull request #7772 from thinkyhead/bf1_user_menu_return 
[1.1.x] User menu return-to-status option
 2017-09-27 11:52:18 -05:00
Scott Lahteine b105e47cb5 Move SERVO0 pin on GT2560 A+ with BLTOUCH enabled 
Based on #7769
 2017-09-27 10:39:44 -05:00
Scott Lahteine 0c2cefed8f Merge pull request #7766 from thinkyhead/bf1_melzi_fixes 
Melzi fixes
 2017-09-27 03:21:05 -05:00
Scott Lahteine aefd2a5c4b Merge pull request #7762 from thinkyhead/bf1_g3d_and_babystep 
[1.1.x] Fix G3D_PANEL encoder steps, babystep label
 2017-09-27 01:08:20 -05:00
Scott Lahteine bbb94b8f68 babystepping tweak 2017-09-27 00:12:20 -05:00
Scott Lahteine a277b43e30 Fix babystep menu display 2017-09-27 00:12:20 -05:00
Scott Lahteine 8a994fb1b1 Fix encoder pulses for G3D_PANEL 2017-09-27 00:12:20 -05:00
Scott Lahteine 9ee92f1246 Fix ADVANCED_PAUSE_FEATURE in .travis.yml 2017-09-26 17:12:05 -05:00
Scott Lahteine ac2ac99e15 Fix bad logic in autostart 
As pointed out by @marcio-ao in #7638
 2017-09-24 17:52:35 -05:00
Scott Lahteine 72e9534d11 Merge pull request #7725 from thinkyhead/bf1_creality_fun 
More featureful CR-10 configurations
 2017-09-24 17:08:32 -05:00
Scott Lahteine ca13f4c3dd Merge pull request #7720 from thinkyhead/bf1_caselight_fix 
Fix caselight compile issues
 2017-09-23 22:15:58 -05:00
Scott Lahteine 386b74f8c2 Merge pull request #7593 from marcio-ao/bugfix-1.1.x 
Added option for graphical overlay for Z-offset (Resubmission of #7350 and #7586)
 2017-09-02 00:01:38 -05:00
Scott Lahteine 367e1b54ba Merge pull request #7591 from thinkyhead/bf1_misc_patches 
M111: no args reports current flags
 2017-08-31 15:19:29 -05:00
Scott Lahteine 41e4de62b3 Merge pull request #7592 from thinkyhead/bf1_workspace_planes 
CNC workspace planes for G5
 2017-08-31 15:18:15 -05:00
Scott Lahteine 5851c2d36f MAX7219 followup (#7564) 
* Add MAX7219_DEBUG to Travis CI testing

* Tweak config and use standard pin naming for MAX7219_DEBUG

* MAX7219: Apply coding standards, use macros, etc.

* Make code work...
 2017-08-31 11:44:43 -05:00
Scott Lahteine 52073f21c5 Merge pull request #7556 from thinkyhead/bf1_slovak_language 
Slovak UTF-8 translation
 2017-08-27 21:05:53 -05:00
Scott Lahteine 321f98f867 Fix servo delay in Folgertech config 2017-08-27 20:53:27 -05:00
Scott Lahteine 9721c77fb9 Merge pull request #7577 from thinkyhead/bf1_creality_fix 
Fixes required for Creality CR-10
 2017-08-27 20:51:15 -05:00
Scott Lahteine ca9734805c Merge pull request #7560 from thinkyhead/bf1_m406_patch 
Addressing #7552
 2017-08-25 03:38:41 -05:00
Scott Lahteine 2b12093589 Merge pull request #7532 from thinkyhead/bf1_fan_mux_vben 
New feature: Part-Cooling Fan Multiplexer
 2017-08-25 03:16:40 -05:00
Scott Lahteine ddfe527ff2 Merge pull request #7554 from thinkyhead/bf1_sanguino_config 
Sanguinololu example config
 2017-08-23 19:58:05 -05:00
Scott Lahteine e82e9073d6 Merge pull request #7530 from GMagician/Code-reduction 
Code reduction with some configurations
 2017-08-18 13:57:59 -05:00
Scott Lahteine 69d1052010 Merge pull request #7529 from GMagician/My-bugfix-1.1.x 
#7528 fix
 2017-08-18 13:57:22 -05:00
Scott Lahteine 101ba70517 Merge pull request #7505 from thinkyhead/bf1_anet_1_pio 
Add Anet 1.0 to Platformio.ini
 2017-08-17 00:33:20 -05:00
Scott Lahteine 5e14bb61de Merge pull request #7506 from thinkyhead/bf1_dual_parking_extruder 
AutoParking Extruder (APE)
 2017-08-17 00:32:20 -05:00
Scott Lahteine 385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays 
Individual servo delays
 2017-08-16 16:05:22 -05:00
Scott Lahteine 2a31c9f2ce Merge pull request #7515 from cdedwards/bugfix-1.1.x 
Fix for G26 spam output
 2017-08-16 16:01:10 -05:00
Scott Lahteine b3f59ec945 Merge pull request #7519 from thinkyhead/bf1_cleanups_aug_16 
Add "Level Corners" menu item
 2017-08-16 15:58:15 -05:00
Scott Lahteine 06541ec885 Merge pull request #7448 from thinkyhead/bf1_delta_fixes 
Prevent damage if DELTA_HEIGHT is set badly
 2017-08-15 16:35:09 -05:00
Scott Lahteine 6172f150c2 Merge pull request #7471 from thinkyhead/bf1_cleanups_aug9 
Miscellaneous style tweaks
 2017-08-15 00:12:37 -05:00
Scott Lahteine 419c8969a7 Merge pull request #7479 from thinkyhead/bf1_fix_italian 
Fix Italian string length
 2017-08-10 18:42:35 -05:00
Scott Lahteine 6440904c1c Merge pull request #7442 from thinkyhead/bf1_geeetech_gt2560_revs 
Support for Geeetech GT2560 Rev.A/Rev.A+
 2017-08-06 00:45:12 -05:00
Scott Lahteine 82cfdd4d8f Merge pull request #7437 from thinkyhead/bf1_geeetech_config 
Geeetech I3 Pro X + GT2560 Config
 2017-08-05 03:58:47 -05:00
Scott Lahteine dd841a3675 Merge pull request #7410 from benlye/user-script-feedback 
Make audible user script feedback optional
 2017-08-05 02:59:56 -05:00
Scott Lahteine 8b97da0e3d Merge pull request #7420 from benlye/patch-1 
Add VScode directory to .gitignore
 2017-08-05 02:57:07 -05:00
Scott Lahteine db188934d1 Merge pull request #7432 from FHeilmann/bf_update_de_translation 
Update language_de.h v2
 2017-08-05 02:53:32 -05:00
Scott Lahteine 43d298a324 Merge pull request #7430 from thinkyhead/bf1_fix_dualx 
Followup cleanup patch
 2017-08-03 16:41:49 -05:00
Scott Lahteine 16f8c4865a Merge pull request #7409 from FHeilmann/bf_update_ru_translation 
Update Russian Translation
 2017-08-03 14:54:40 -05:00
Scott Lahteine 50bfcf4c3e Merge pull request #7428 from thinkyhead/bf1_cleanup_aug_3 
Clean up whitespace, trailing space, bad tab conversion, etc.
 2017-08-03 14:30:33 -05:00
Scott Lahteine ce65c13a97 Merge pull request #7398 from fiveangle/bf_lcd_bed_level_requirements 
Clarify LCD_BED_LEVELING requirements
 2017-08-01 17:46:07 -05:00
Scott Lahteine 6ef71c3d5f Merge pull request #7397 from Kaibob2/patch-4 
Fix for #7395
 2017-08-01 17:40:59 -05:00
Scott Lahteine 7ef0650504 Merge pull request #7386 from oysteinkrog/fix/DualX 
Fix DUAL_X_CARRIAGE movement
 2017-07-31 20:30:06 -05:00
Scott Lahteine 08b0456d91 Merge pull request #7379 from thinkyhead/bf_manual_bed_level_floor 
Manual Bed Leveling: Goto previous Z height at each probe point
 2017-07-30 05:41:12 -05:00