bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
8,628 Commits 1 Branch 4 Tags
af153835787413541fa7acfa320b79344c0e57af
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott LahteineandGitHub 16f8c4865a Merge pull request #7409 from FHeilmann/bf_update_ru_translation 
Update Russian Translation
 2017-08-03 14:54:40 -05:00
Scott LahteineandGitHub 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 LahteineandGitHub 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 LahteineandGitHub 6ef71c3d5f Merge pull request #7397 from Kaibob2/patch-4 
Fix for #7395
 2017-08-01 17:40:59 -05:00
Scott LahteineandGitHub 7ef0650504 Merge pull request #7386 from oysteinkrog/fix/DualX 
Fix DUAL_X_CARRIAGE movement
 2017-07-31 20:30:06 -05:00
Scott LahteineandGitHub 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
Scott LahteineandGitHub 850e404838 Merge pull request #7380 from thinkyhead/bf_touchy_probe_delay 
Implement probing delay for piezo sensors
 2017-07-30 05:39:45 -05:00
Scott LahteineandGitHub 29eef360d0 Merge pull request #7308 from thinkyhead/bf_cleanup_config_adv 
Fixes for FWRETRACT
 2017-07-29 21:20:19 -05:00
Scott LahteineandGitHub ff06e1a030 Merge pull request #7372 from tcm0116/delta_calib_menu 
Move Delta Calibration menu to the Prepare menu
 2017-07-29 21:05:03 -05:00
Scott LahteineandGitHub 8b0bd44b1e Merge pull request #7368 from thinkyhead/bf_fix_warnings 
Patch to fix some compiler warnings
 2017-07-28 02:53:13 -05:00
Scott LahteineandGitHub 48c5f3dddf Tweak kill action #ifdef 2017-07-27 23:42:01 -05:00
Scott LahteineandGitHub be7a9a07c5 Don't reset grid with G29 Q + PROBE_MANUALLY 2017-07-27 22:47:43 -05:00
Scott LahteineandGitHub dfe670247d Merge pull request #7363 from marcio-ao/bugfix-1.1.x 
Makefile fixes and U8G support.
 2017-07-27 21:31:56 -05:00
Scott LahteineandGitHub e52c1a0882 Merge pull request #7341 from thinkyhead/bf_bed_size 
Add X_BED_SIZE, Y_BED_SIZE to configurations
 2017-07-27 04:05:24 -05:00
Scott LahteineandGitHub 5b69d67da9 Merge pull request #7359 from fiveangle/pio_printrboard_revf 
Add PIO entry for PRINTRBOARD_REVF
 2017-07-26 23:09:06 -05:00
Scott LahteineandGitHub a972c060d7 Merge pull request #7347 from fiveangle/at90usb_usbcon_unification 
Remove extraneous USBCON defines for AT90USB boards
 2017-07-26 21:44:18 -05:00
Scott LahteineandGitHub 21591352d7 Merge pull request #7340 from thinkyhead/bf_neopixel_rgbw 
Add support for Printrbot Neopixel RGBW strip.
 2017-07-22 16:19:12 -05:00
Scott LahteineandGitHub d6d6043548 Merge pull request #7338 from thinkyhead/bf_mks_ps_on_pin 
MKS 1.3+: Add pin mapping for PS_ON
 2017-07-21 20:00:26 -05:00
Scott LahteineandGitHub 03989824fa Merge pull request #7339 from thinkyhead/bf_russian_part_1 
Update Russian translation - Part 1
 2017-07-21 19:57:18 -05:00
Scott LahteineandGitHub b7a16e4468 Merge pull request #7315 from fixoid/patch-1 
Fixing SWITCHING_EXTRUDER feature to work with HOTENDS > 1
 2017-07-21 19:10:54 -05:00
Scott LahteineandGitHub 60cb2bd4e7 Merge pull request #7332 from thinkyhead/bf_before_fwretract 
Improve FWRETRACT comments
 2017-07-21 00:20:56 -05:00
Scott LahteineandGitHub b9809ea86c Merge pull request #7281 from thinkyhead/bf_seen_not_volatile 
Fixes for recent merges
 2017-07-13 00:54:10 -05:00
Scott LahteineandGitHub e5904c4df8 Merge pull request #7275 from thinkyhead/bf_seen_not_volatile 
Volatile keyword not needed for parser.seen
 2017-07-10 16:11:08 -05:00
Scott LahteineandGitHub f63f1ff12c Merge pull request #7272 from thinkyhead/bf_user_menu_stay 
Stay in User Menu after command. Add feedback.
 2017-07-10 15:10:07 -05:00
Scott LahteineandGitHub 1066b17457 Merge pull request #7260 from thinkyhead/bf_G33_update_27 
Updates to G33 and its LCD code
 2017-07-10 13:39:36 -05:00
Scott LahteineandGitHub 68aea9c01d Merge pull request #7261 from thinkyhead/bf_configs_by_vendor 
Arrange more example configs by vendor
 2017-07-07 15:46:22 -05:00
Scott LahteineandGitHub 7fc31a7940 Merge pull request #7258 from thinkyhead/bf_cleanups_jbrazio 
Add support for BQ heated bed kit with Hephestos 2
 2017-07-07 04:11:07 -05:00
Scott LahteineandGitHub 11e376e920 Merge pull request #7256 from thinkyhead/bf_cleanup_july_6 
Assign -1 to LCD_PINS_D4-7 if not defined
 2017-07-07 03:22:47 -05:00
Scott LahteineandGitHub a3aa798f6d Merge pull request #7257 from thinkyhead/bf_Creality_CR10 
Support for Creality CR-10
 2017-07-07 03:22:27 -05:00
Scott LahteineandGitHub ce834bb78e Merge pull request #7255 from thinkyhead/bf_cleanup_july_6 
Use FastIO for spindle, probe test, and case light
 2017-07-06 22:03:27 -05:00
Scott LahteineandGitHub 2cb308fb53 Merge pull request #7253 from thinkyhead/bf_busy_protocol 
"Keepalive" is now "Busy protocol"
 2017-07-06 16:39:50 -05:00
Scott LahteineandGitHub 504d26341a Merge pull request #7251 from thinkyhead/bf_simplify3d_workaround 
Patch M23 to work around Simplify3D bug
 2017-07-06 14:45:04 -05:00
Scott LahteineandGitHub ef94ddf53c Merge pull request #7238 from thinkyhead/bf_probe_manual_G33 
Add PROBE_MANUALLY support to G33
 2017-07-04 18:18:32 -05:00
Scott LahteineandGitHub 28deff01b8 Fix a bug in mfup 2017-07-04 17:38:45 -05:00
Scott LahteineandGitHub cca1cca3a5 Merge pull request #7237 from thinkyhead/bf_cz_mapper 
UTF-8 mapper for Czech
 2017-07-04 16:45:13 -05:00
Scott LahteineandGitHub a2babb532d Merge pull request #7217 from benlye/add-kill-action 
Add configurable action command to send when printer is killed
 2017-07-04 16:44:08 -05:00
Scott LahteineandGitHub b8066fb36f Merge pull request #7232 from fiveangle/disable_xyz_compatibility_check 
DISABLE_[XYZ] compatibility check
 2017-07-04 13:26:56 -05:00
Scott LahteineandGitHub df87278fce Add "CAP:PRINT_JOB:1" (M75 / M76 / M77) to M115 output 2017-07-03 15:59:06 -05:00
Scott LahteineandGitHub 4be8d7720e Fix spelling of "Chinese" 2017-07-03 15:24:49 -05:00
Scott LahteineandGitHub 760bf49a00 Merge pull request #7221 from thinkyhead/bf_fix_reachable 
Fix for issues #6997 and #7152
 2017-07-03 03:40:42 -05:00
Scott LahteineandGitHub 57fff2e95e Merge pull request #7219 from thinkyhead/bf_update_git_scripts 
Update Marlin+git helper scripts
 2017-07-03 01:49:27 -05:00
Scott LahteineandGitHub 94c965fad6 Merge pull request #7220 from thinkyhead/bf_fix_eeprom_opts 
Make all EEPROM optimization options available
 2017-07-03 01:39:01 -05:00
Scott LahteineandGitHub 015839fc50 Merge pull request #7212 from thinkyhead/bf_m48_real_probe 
M48 needs a real probe
 2017-07-02 16:22:47 -05:00
Scott LahteineandGitHub 395a9f59ac Merge pull request #7211 from thinkyhead/bf_lcd_bootscreen 
Use lcd_bootscreen for both
 2017-07-02 02:11:07 -05:00
Scott LahteineandGitHub 14663efe0d Merge pull request #7210 from fiveangle/printrboard_revf_cleanup 
Printrboard RevF cleanup
 2017-07-02 01:02:26 -05:00
Scott LahteineandGitHub 41e0955c27 Merge pull request #7208 from thinkyhead/bf_lcd_for_melzi 
LCD for Melzi support
 2017-07-02 00:32:13 -05:00
Scott LahteineandGitHub 312f63dbe8 Merge pull request #7207 from thinkyhead/bf_update_ubl_lcd 
Expose DISABLE_M503 option as a test option
 2017-07-01 22:10:34 -05:00
Scott LahteineandGitHub 3e78a01262 Merge pull request #7204 from thinkyhead/bf_update_ubl_lcd 
UBL radar map corrections
 2017-07-01 20:59:03 -05:00
Scott LahteineandGitHub 2ff967f3e6 Merge pull request #7205 from thinkyhead/bf_infitary_m508 
Add configuration for Infitary M508 (i3 clone)
 2017-07-01 20:11:02 -05:00
Scott LahteineandGitHub 009a6104c5 Merge pull request #7201 from Bob-the-Kuhn/intermittent_Teensy2++_G26_compile_issue 
intermittent AT90USB & G26 compile problem (proposal)
 2017-07-01 18:54:36 -05:00
Scott LahteineandGitHub 457489d7ac Merge pull request #7187 from thinkyhead/bf_sanitycheck_G33 
Add a sanity check for DELTA_AUTO_CALIBRATION
 2017-06-30 11:39:09 -05:00
Scott LahteineandGitHub 814925d692 Merge pull request #7179 from thinkyhead/bf_anet_a6 
Add ANET A6 example configuration
 2017-06-28 17:06:04 -05:00
Scott LahteineandGitHub bb0508b6cf Fix comment in M115 code 2017-06-28 13:08:33 -05:00