bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
8,787 Commits 1 Branch 4 Tags
8d9c3cc2b74f5b8a3f765d2d6e901ee6c0abc987
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott LahteineandGitHub 55653dce63 Merge pull request #8115 from thinkyhead/bf2_autotune_G33 
[2.0.x] G33 Autotune calibration update
 2017-10-27 02:42:17 -05:00
Scott LahteineandGitHub b338cafc65 Merge pull request #8111 from thinkyhead/bf2_fwretract_fix_oct26 
[2.0.x] Improved Firmware Retraction logic
 2017-10-27 02:02:06 -05:00
Scott LahteineandGitHub 3f827758d7 Merge pull request #8047 from thinkyhead/bf2_babystepping_M290 
[2.0.x] Add M290 Babystepping (extended)
 2017-10-26 21:02:21 -05:00
Scott LahteineandGitHub c45514f811 Merge pull request #8094 from thinkyhead/bf2_neopixel_led_parity 
[2.0.x] Bring NEOPIXEL_LED into parity with 1.1.x
 2017-10-26 17:24:38 -05:00
Scott LahteineandGitHub e4266d0fde Merge pull request #8093 from GMagician/gitignore-duplicate-entry-remove 
Removed duplicate entry in gitignore
 2017-10-25 18:36:00 -05:00
Scott LahteineandGitHub e00ed10c4c GT2560 config MKS_MINI_12864 => SDSUPPORT 2017-10-25 01:12:48 -05:00
Scott LahteineandGitHub 10a5e4d80f Merge pull request #8078 from thinkyhead/bf2_mks_mini_lcd 
[2.0.x] Add MKS MINI 12864 support to GT2560
 2017-10-25 01:10:03 -05:00
Scott LahteineandGitHub 6b1eddda06 Merge pull request #8009 from GMagician/gitignore-update 
gitignore update
 2017-10-24 19:16:17 -05:00
Scott LahteineandGitHub f65fc7ffab Merge pull request #8044 from thinkyhead/bf2_mesh_consolidate 
[2.0.x] Simplify mesh bounds config
 2017-10-24 18:56:43 -05:00
Scott LahteineandGitHub 070cd34fe8 Merge pull request #8077 from thinkyhead/bf2_MKS_BASE_followup 
Clean up HAL trailing spaces, MKS SBASE pins
 2017-10-24 18:38:48 -05:00
Scott LahteineandGitHub 46aae4c6e7 Merge pull request #8074 from thinkyhead/bf2_verbiage_like_8061 
Fix some config verbiage
 2017-10-24 15:25:12 -05:00
Scott LahteineandGitHub 3356d5a72d Merge pull request #8072 from thinkyhead/bf2_fix_M600 
[2.0.x] Fix position sync in M600 pause/resume
 2017-10-24 14:55:46 -05:00
Scott LahteineandGitHub adf168e68f Merge pull request #8046 from thinkyhead/bf2_fix_micromake_endstops 
[2.0.x] Add Makeboard MINI pins to fix Micromake C1
 2017-10-21 01:04:29 -05:00
Scott LahteineandGitHub 1fbb307aaf Merge pull request #8021 from thinkyhead/bf2_scroll_longnames 
[2.0.x] Add SCROLL_LONG_FILENAMES to reveal longer filenames
 2017-10-20 21:33:54 -05:00
Scott LahteineandGitHub 348e5e3109 Simplify Cartesian probing boundaries 
Followup to #8012
 2017-10-18 17:14:32 -05:00
Scott LahteineandGitHub 3b7b0492f8 Merge pull request #7993 from jeffyl/bugfix-2.0.x 
[2.0.x] Proper support for AZSMZ 12864 LCD on SmartRAMPS
 2017-10-16 14:12:29 -05:00
Scott LahteineandGitHub 02f2979760 Merge pull request #7992 from thinkyhead/bf2_M106_memorize 
[2.0.x] Add EXTRA_FAN_SPEED feature
 2017-10-16 05:19:40 -05:00
Scott LahteineandGitHub 3e7b24278f Fix usage line in temperature table script 2017-10-16 00:17:32 -05:00
Scott LahteineandGitHub bacea22a26 Update thermistor table script for current format 2017-10-16 00:15:48 -05:00
Scott LahteineandGitHub c46189e429 Fix UBL+Delta segmented feedrate 
Based on #7948
 2017-10-15 16:31:09 -05:00
Scott LahteineandGitHub a12ab611ae Merge pull request #7987 from thinkyhead/bf2_progress_percentage 
[2.0.x] Add M73 (LCD_SET_PROGRESS_MANUALLY)
 2017-10-15 16:13:23 -05:00
Scott LahteineandGitHub 014a83fe09 Merge pull request #7984 from thinkyhead/bf2_micromake_c1 
[2.0.x] Micromake C1 Configurations, Unaccented French
 2017-10-14 21:19:32 -05:00
Scott LahteineandGitHub af2397d581 Merge pull request #7979 from thinkyhead/bf2_granular_sw_endstops 
[2.0.x] Software endstop options by axis
 2017-10-14 19:57:16 -05:00
Scott LahteineandGitHub ec69e97bda Merge pull request #7974 from jeffyl/bugfix-2.0.x 
Fix include path for VIKI
 2017-10-14 17:38:42 -05:00
Scott LahteineandGitHub 4586acad8c Merge pull request #7959 from alexxy/bugfix-2.0.x 
Python isnt always python2
 2017-10-14 05:02:07 -05:00
Scott LahteineandGitHub 497f86453e Merge pull request #7964 from gallynero/patch-2 
fix 'axis_unhomed_error' not defined error
 2017-10-14 05:00:58 -05:00
Scott LahteineandGitHub 85b2e7e764 Merge pull request #7966 from thinkyhead/bf2_ubl_remove_z_offset 
[2.0.x] Unify Z fade factor
 2017-10-14 03:15:16 -05:00
Scott LahteineandGitHub 72ef508d55 Merge pull request #7962 from thinkyhead/bf2_ubl_remove_z_offset 
[2.0.x] Remove obsolete UBL z_offset
 2017-10-13 09:06:19 -05:00
Scott LahteineandGitHub cc01a36363 Merge pull request #7947 from thinkyhead/bf2_more_READMEs 
[2.0.x] Add a README.h file for Arduino IDE users
 2017-10-12 06:56:41 -05:00
Scott LahteineandGitHub 1f5c432e29 Merge pull request #7920 from thinkyhead/bf2_neopixel_full 
[2.0.x] Move FILAMENT_RUNOUT_SENSOR to a feature
 2017-10-10 03:05:00 -05:00
Scott LahteineandGitHub 732e87e83c Merge pull request #7892 from GMagician/Serial-double-echo-fix 
[2.0.x] Serial double echo fix
 2017-10-10 02:42:16 -05:00
Scott LahteineandGitHub 10124f39d9 Merge pull request #7919 from thinkyhead/bf2_neopixel_full 
[2.0.x] Different NEOPIXEL types
 2017-10-10 02:35:39 -05:00
Scott LahteineandGitHub b30b55307c Merge pull request #7909 from thinkyhead/bf2_goodbye_legacy_advance 
[2.0.x] Remove legacy ADVANCE feature
 2017-10-10 00:31:18 -05:00
Scott LahteineandGitHub 1d04197f2f Merge pull request #7916 from thinkyhead/bf2_probeless_ubl 
[2.0.x] Allow UBL G29 and G26 to build without a probe
 2017-10-10 00:30:27 -05:00
Scott LahteineandGitHub 1f05f10346 Merge pull request #7894 from tcm0116/2.0.x-lcd_segmented_moves 
[2.0.x] Use segmented moves when moving axis from LCD
 2017-10-10 00:28:34 -05:00
Scott LahteineandGitHub 5ad8f5c306 Merge pull request #7914 from thinkyhead/bf2_add_some_lcds 
[2.0.x] Add support for 4 new LCDs
 2017-10-09 17:39:41 -05:00
Scott LahteineandGitHub e31385ecf6 Merge pull request #7904 from GMagician/Addressing-#7896 
[2.0.x] Addressing #7896
 2017-10-08 19:35:45 -05:00
Scott LahteineandGitHub deeea98d22 LCD filename already concatenated 2017-10-07 15:16:05 -05:00
Scott LahteineandGitHub a058638d11 Merge pull request #7875 from thinkyhead/bf2_fill_eeprom_dat_ff 
[2.0.x] Update LPC persistent store to initialize eeprom.dat with FF
 2017-10-07 15:13:21 -05:00
Scott LahteineandGitHub ae1a18d0a1 LCD filename already concatentated 2017-10-07 15:10:15 -05:00
Scott LahteineandGitHub 12aa1b999a Fix display issue with SD_SORT_ALPHA cached names 2017-10-07 15:08:08 -05:00
Scott LahteineandGitHub f63e546b3e Merge pull request #7890 from thinkyhead/bf2_integer_HAL_TIMER_RATE 
[2.0.x] Apply fixes for DUE
 2017-10-07 14:52:41 -05:00
Scott LahteineandGitHub 4b36a542e0 Merge pull request #7876 from thinkyhead/bf2_hotend_messages 
[2.0.x] Addressing #7612
 2017-10-07 13:37:43 -05:00
Scott LahteineandGitHub 81a1e69a4a Merge pull request #7877 from fiveangle/bf2-controller_fan_includes 
[2.0.x] Resolve USE_CONTROLLER_FAN compile errors
 2017-10-07 13:08:55 -05:00
Scott LahteineandGitHub 2aa22c5a5e Merge pull request #7874 from thinkyhead/bf2_anet_encoder_pulses 
[2.0.x] Fixing ANET encoder pulses
 2017-10-07 01:21:23 -05:00
Scott LahteineandGitHub db8ded90c2 Merge pull request #7872 from thinkyhead/bf2_fix_sd_listing_bug 
[2.0.x] Fix sd file list display bug
 2017-10-07 00:13:20 -05:00
Scott LahteineandGitHub 67a7dd9792 Merge pull request #7866 from thinkyhead/bf2_finally_G33_is_done 
[2.0.x] Apply G33 updates
 2017-10-06 16:03:26 -05:00
Scott LahteineandGitHub 030c266811 Merge pull request #7863 from thinkyhead/bf2_mapper_c2c3c4_sk 
[2.0.x] Add UTF-8 mapper for Slovak language
 2017-10-06 16:00:30 -05:00
Scott LahteineandGitHub c81843a414 Set TEMP_SENSOR_0 to 1 in CR-10 example config 
As pointed out in #7692 by @totalitarian
 2017-10-06 14:30:53 -05:00
Scott LahteineandGitHub 7258218f89 Fix xon_xoff_state initialization 2017-10-04 12:11:56 -05:00
Scott LahteineandGitHub bf596fb039 Merge pull request #7818 from thinkyhead/bf2_xon_xoff 
[2.0.x] Add XON/XOFF serial handshaking
 2017-10-02 23:52:30 -05:00
Scott LahteineandGitHub ab4943e24c Merge pull request #7829 from thinkyhead/bf2_fix_dualx_manual 
[2.0.x] Fix DUAL_X_CARRIAGE manual move
 2017-10-02 23:50:00 -05:00
Scott LahteineandScott Lahteine 200f971ef7 Reduce Teensy++ 2.0 to a single entry 
Followup to #7750, #7826
 2017-10-02 22:55:43 -05:00
Scott LahteineandGitHub 33c4d45f2f Merge pull request #7812 from thinkyhead/bf2_fix_resume_print 
[2.0.x] Fix broken M600 resume_print
 2017-10-01 22:55:28 -05:00
Scott LahteineandGitHub f3677e077c Merge pull request #7816 from thinkyhead/bf2_inhibit_option 
[2.0.x] Option to disallow motion before homing
 2017-10-01 22:52:54 -05:00
Scott LahteineandGitHub ac41eb5871 Merge pull request #7722 from tcm0116/2.0.x-warnings 
Cleanup 2.0.x compiler warnings
 2017-10-01 21:56:54 -05:00
Scott LahteineandGitHub c0b365fdb4 Merge pull request #7775 from GMagician/Fix-gitignore-for-Visualstudio-&-platformio 
gitignorefix
 2017-10-01 18:15:12 -05:00
Scott LahteineandGitHub 26d4c01660 Merge pull request #7802 from thinkyhead/bf2_fwretract_fixes 
Fix G10/G11 with synchronize
 2017-09-30 17:50:38 -05:00
Scott LahteineandGitHub 6904561fd5 Merge pull request #7793 from tcm0116/2.0.x-servo 
[2.0.x] Fix Servo class compile errors
 2017-09-29 17:51:21 -05:00
Scott LahteineandGitHub 92389e4236 Merge pull request #7794 from tcm0116/2.0.x-usb_interrupt 
[2.0.x] Fix LPC1768 USB interrupt priority
 2017-09-29 17:50:02 -05:00
Scott LahteineandGitHub 8c622a59cf Merge pull request #7774 from thinkyhead/bf2_lcd_leveling_status 
[2.0.x] Show leveling status on character LCD
 2017-09-27 13:10:25 -05:00
Scott LahteineandGitHub 2ee4eef25c Merge pull request #7748 from GMagician/Addressing-#7730 
[bugfix-2.0.x] Fix compiler error (issue #7730)
 2017-09-27 12:06:55 -05:00
Scott LahteineandGitHub ffed785656 Merge pull request #7768 from thinkyhead/bf2_HAL_STM32F1 
[2.0.x] HAL for STM32F1
 2017-09-27 11:52:34 -05:00
Scott LahteineandGitHub 88f9194168 Merge pull request #7771 from thinkyhead/bf2_user_menu_return 
[2.0.x] User menu return-to-status option
 2017-09-27 11:51:57 -05:00
Scott LahteineandGitHub baf0bd2b24 Merge pull request #7770 from thinkyhead/bf2_HAL_cleanups_etc 
Some HAL formatting cleanup
 2017-09-27 11:11:12 -05:00
Scott LahteineandGitHub f582f1bf4e Merge pull request #7769 from thinkyhead/bf2_GT2560 
Fixes for GT2560, ANET A8
 2017-09-27 10:32:50 -05:00
Scott LahteineandGitHub afe77bd138 Merge pull request #7763 from thinkyhead/bf2_fixes_from_bf1 
[2.0.x] Fix G3D_PANEL encoder steps, babystep label #7762
 2017-09-27 03:20:47 -05:00
Scott LahteineandGitHub 7239ab231c Fix ADVANCED_PAUSE_FEATURE in .travis.yml 2017-09-26 17:12:46 -05:00
Scott LahteineandGitHub c4e4a0688c Fix bug in SD Autostart 
As pointed out by @marcio-ao in #7638
 2017-09-24 17:53:39 -05:00
Scott LahteineandGitHub 88407727ec Merge pull request #7727 from thinkyhead/apply_7697_from_1.1.x 
G33 changes from 1.1.x
 2017-09-24 17:48:16 -05:00
Scott LahteineandGitHub 1ab679b1d2 Merge pull request #7723 from fiveangle/bf20-improve_avr_arch_detection 
[bf20ng] Improve AVR arch detection
 2017-09-24 00:48:59 -05:00
Scott LahteineandGitHub 8089f73549 Merge pull request #7721 from thinkyhead/bugfix_refactor_work 
Apply LCD changes from 1.1.x
 2017-09-23 22:10:37 -05:00
Scott LahteineandGitHub 6da97ebdd1 Merge pull request #7719 from thinkyhead/bugfix_refactor_work 
[2.0.x] Group G-codes to fix command-line overflow
 2017-09-23 19:18:33 -05:00
Scott LahteineandGitHub ff1f211eb4 Merge pull request #7695 from tcm0116/move_framework 
Move LPC1768 framework out of Marlin source folder
 2017-09-23 17:12:48 -05:00
Scott LahteineandGitHub 9a03f758cd Merge pull request #7715 from GMagician/bugfix-2.0.x 
[PR] [Marlin 2.0] Fix compiler warning message
 2017-09-23 16:55:28 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 41e4de62b3 Merge pull request #7592 from thinkyhead/bf1_workspace_planes 
CNC workspace planes for G5
 2017-08-31 15:18:15 -05:00
Scott LahteineandRoxy-3D 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 LahteineandGitHub 52073f21c5 Merge pull request #7556 from thinkyhead/bf1_slovak_language 
Slovak UTF-8 translation
 2017-08-27 21:05:53 -05:00
Scott LahteineandGitHub 321f98f867 Fix servo delay in Folgertech config 2017-08-27 20:53:27 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub ca9734805c Merge pull request #7560 from thinkyhead/bf1_m406_patch 
Addressing #7552
 2017-08-25 03:38:41 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub ddfe527ff2 Merge pull request #7554 from thinkyhead/bf1_sanguino_config 
Sanguinololu example config
 2017-08-23 19:58:05 -05:00
Scott LahteineandGitHub e82e9073d6 Merge pull request #7530 from GMagician/Code-reduction 
Code reduction with some configurations
 2017-08-18 13:57:59 -05:00
Scott LahteineandGitHub 69d1052010 Merge pull request #7529 from GMagician/My-bugfix-1.1.x 
#7528 fix
 2017-08-18 13:57:22 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 5e14bb61de Merge pull request #7506 from thinkyhead/bf1_dual_parking_extruder 
AutoParking Extruder (APE)
 2017-08-17 00:32:20 -05:00
Scott LahteineandGitHub 385f1bb9e5 Merge pull request #7504 from thinkyhead/bf1_servo_delays 
Individual servo delays
 2017-08-16 16:05:22 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 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 LahteineandGitHub 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 LahteineandGitHub 6172f150c2 Merge pull request #7471 from thinkyhead/bf1_cleanups_aug9 
Miscellaneous style tweaks
 2017-08-15 00:12:37 -05:00
Scott LahteineandGitHub 419c8969a7 Merge pull request #7479 from thinkyhead/bf1_fix_italian 
Fix Italian string length
 2017-08-10 18:42:35 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 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 LahteineandGitHub 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 LahteineandGitHub 8b97da0e3d Merge pull request #7420 from benlye/patch-1 
Add VScode directory to .gitignore
 2017-08-05 02:57:07 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 43d298a324 Merge pull request #7430 from thinkyhead/bf1_fix_dualx 
Followup cleanup patch
 2017-08-03 16:41:49 -05:00