bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
5,047 Commits 1 Branch 4 Tags
8ccd97e7ccff5b91ad4a8c5da484cd66087266d3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott LahteineandGitHub d50ba08246 Merge pull request #4011 from thinkyhead/rc_manual_move_cond 
Wrap all items depending on ULTIPANEL
 2016-06-11 15:26:52 -07:00
Scott LahteineandGitHub ddbb05fd8d Merge pull request #3998 from jbrazio/bugfix/better-regex 
Improves travis buildroot regexp
 2016-06-11 13:40:58 -07:00
Scott LahteineandGitHub bf8710d522 Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL 
manage_manual_move(); -> ULTIPANEL
 2016-06-10 17:17:57 -07:00
Scott LahteineandGitHub 93ffa0288c Merge pull request #4003 from jbrazio/bugfix/3999 
Closes #3999: Compilation error with BEEPER_PIN -1
 2016-06-10 17:15:23 -07:00
Scott LahteineandGitHub e2d4919c01 Merge pull request #3991 from thinkyhead/rc_axis_units 
Rename some vars to clarify their relationship to acceleration
 2016-06-09 20:57:01 -07:00
Scott LahteineandGitHub 4a212f707b Merge pull request #3993 from jbrazio/feature/update-travis 
Update travis to test for ULTRA and DOG LCD options
 2016-06-09 20:56:07 -07:00
Scott LahteineandGitHub 74060f17b7 Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer 
New feature: Non blocking tone queue
 2016-06-09 20:55:29 -07:00
Scott LahteineandGitHub 27d5794298 Merge pull request #3992 from thinkyhead/rc_pid_autotune_e_range 
Throw an error in PID_autotune for E < -1
 2016-06-09 20:07:27 -07:00
Scott Lahteine 26f8f54c56 Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin 
Support inches, fahrenheit, and kelvin
 2016-06-08 20:10:33 -07:00
Scott Lahteine f0a5b7f0bc Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration 
Use memset in mbl.reset to save 58 bytes
 2016-06-08 17:33:41 -07:00
Scott Lahteine a569e89775 Merge pull request #3978 from thinkyhead/rc_planner_local_rename 
Rename some auto/locals to avoid name conflict
 2016-06-08 16:41:57 -07:00
Scott Lahteine 9b42658faf Merge pull request #3983 from thinkyhead/rc_fix_ftostr 
Cleanup and naming for number-to-string functions
 2016-06-08 14:21:16 -07:00
Scott Lahteine 3d56b9d127 Merge pull request #3979 from thinkyhead/mbl_cell 
MBL: cel => cell
 2016-06-07 19:12:46 -07:00
Scott Lahteine 08a9bd017b Merge pull request #3976 from petrzjunior/rc_lang_cz_160607 
[Language] Update Czech 2016/06/07
 2016-06-07 18:05:44 -07:00
Scott Lahteine 5e6fdbb4cb Merge pull request #3963 from thinkyhead/rc_advance_steppers 
Use e_steps[EXTRUDERS] instead of e_steps[4]
 2016-06-05 02:46:06 -07:00
Scott Lahteine 4b3d5aec7a Merge pull request #3110 from thinkyhead/rc_manual_moves 
Alternative impl. of LCD-based manual movement
 2016-06-05 02:45:39 -07:00
Scott Lahteine 43947072d5 Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2 
SINGLENOZZLE: EXTRUDERS versus HOTENDS
 2016-06-04 15:23:17 -07:00
Scott Lahteine 05868de195 Merge pull request #3958 from thinkyhead/rc_fix_3955 
Fix a typo in #3955
 2016-06-04 02:10:26 -07:00
Scott Lahteine 4bdcf3afe4 Merge pull request #3956 from thinkyhead/rc_mbl_single_axis_fix 
MBL: Keep active when homing single axes (#3750)
 2016-06-03 21:56:12 -07:00
Scott Lahteine 32f8300cc6 Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast 
Improved LCD contrast handling
 2016-06-03 17:08:41 -07:00
Scott Lahteine 9c87bf835c Merge pull request #3947 from thinkyhead/rc_statics_stepper 
Apply static to remaining Stepper methods
 2016-06-03 17:08:15 -07:00
Scott Lahteine 08871d4d6e Merge pull request #3950 from boelle/patch-3 
last of missing defines added
 2016-06-03 17:07:02 -07:00
Scott Lahteine 4e13cd3f35 Merge pull request #3955 from MagoKimbra/RCBugFix 
Fix M428 width DELTA & SCARA
 2016-06-03 15:50:37 -07:00
Scott Lahteine 2403a1cf9c Merge pull request #3952 from rafacouto/RCBugFix 
Galician language update.
 2016-06-03 15:46:03 -07:00
Scott Lahteine 8529122af1 Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow 
Raise the servo probe before stow outside ABL context
 2016-06-03 15:45:36 -07:00
Scott Lahteine 0d793fb2be Merge pull request #3939 from thinkyhead/rc_resume_get_position 
set_current_position_from_planner() after stepper.quick_stop()
 2016-06-02 17:25:51 -07:00
Scott Lahteine 663d2463dc Merge pull request #3922 from thinkyhead/rc_statics_stepper 
Apply static to Stepper class
 2016-06-02 17:14:24 -07:00
Scott Lahteine 194185539d Merge pull request #3925 from thinkyhead/rc_statics_planner 
Apply static to Planner class
 2016-06-02 17:14:04 -07:00
Scott Lahteine 3fd9b331f0 Merge pull request #3924 from thinkyhead/rc_statics_temperature 
Apply static to Temperature class
 2016-06-02 17:13:17 -07:00
Scott Lahteine 5b5270ab50 Merge pull request #3943 from thinkyhead/rc_contrast_adjust 
Combine ST7565 / U8GLIB_NHD_C12864 items in dogm
 2016-06-02 17:05:04 -07:00
Scott Lahteine f331763eca Merge pull request #3829 from thinkyhead/rc_fix_T_command 
Fix bad movement in gcode_T when switching extruders
 2016-05-31 19:36:18 -07:00
Scott Lahteine 67f816ff79 Merge pull request #3926 from thinkyhead/rc_statics_endstops 
Drop FORCE_INLINE from endstops.h
 2016-05-31 19:35:41 -07:00
Scott Lahteine 2bd4f33369 Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 
Remove excess allen key probe examples from configs
 2016-05-31 19:18:21 -07:00
Scott Lahteine 1a01a44a94 Merge pull request #3936 from thinkyhead/rc_sav_mk1 
Support for SAV_3DGLCD OLED LCD controller
 2016-05-31 18:46:25 -07:00
Scott Lahteine 4770d7c346 Merge pull request #3933 from boelle/patch-2 
added defines present in en but not in da
 2016-05-31 18:42:38 -07:00
Scott Lahteine c6c01eaaac Merge pull request #3888 from thinkyhead/rc_slower_max31855 
Slower SPI speed for MAX31855
 2016-05-31 18:40:38 -07:00
Scott Lahteine bc77670673 Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac 
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
 2016-05-31 10:29:37 -07:00
Scott Lahteine 1582ed43bf Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv 
MBL: Move border macros to Configuration_adv.h
 2016-05-30 18:15:50 -07:00
Scott Lahteine c3df293fc6 Merge pull request #3923 from thinkyhead/rc_statics_endstops 
Apply static to Endstops class
 2016-05-30 16:48:23 -07:00
Scott Lahteine 02735fd500 Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak 
Tiny calc_timer speedup
 2016-05-30 16:47:03 -07:00
Scott Lahteine ffe55c230d Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast 
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
 2016-05-30 11:20:14 -07:00
Scott Lahteine 5a8918c9ec Merge pull request #3911 from epatel/marlin/mbl_3903_example_configs 
MBL: Apply PR 3903 to example_configurations
 2016-05-30 01:01:04 -07:00
Scott Lahteine 7ba8f2dbc3 Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers 
Less greedy regex in travis helper scripts
 2016-05-30 00:27:41 -07:00
Scott Lahteine 3861f1e0da Merge pull request #3908 from jbrazio/bugfix/3826 
Closes #3826: SD printing will now pause and stop the print counter
 2016-05-30 00:08:57 -07:00
Scott Lahteine 8806c7bbcc Merge pull request #3903 from epatel/marlin/mbl_negative_xy 
MBL: Fix for negative x/y positions
 2016-05-29 22:07:35 -07:00
Scott Lahteine 189e60db55 Merge pull request #3909 from thinkyhead/fix_array_inits 
Fix some array initializations
 2016-05-29 21:02:20 -07:00
Scott Lahteine fe3122774a Merge pull request #3806 from thinkyhead/rc_coreyz_support 
Support for COREYZ. Fixes for COREXY, COREXZ
 2016-05-26 18:50:43 -07:00
Scott Lahteine 30f6b84561 Merge pull request #3812 from thinkyhead/rc_mbl_index_finders 
Two index finding functions for MBL
 2016-05-23 15:54:37 -07:00
Scott Lahteine 89e630b2fb Merge pull request #3808 from thinkyhead/rc_singlenozzle 
SINGLENOZZLE
 2016-05-23 15:52:19 -07:00
Scott Lahteine 678cbad76a Merge pull request #3819 from jbrazio/bugfix/followup-3813 
Followup for #3813
 2016-05-23 13:56:11 -07:00
Scott Lahteine 6cdae35261 Merge pull request #3822 from jbrazio/cleanup/hires-logo 
Cleanup the Marlin logo with a hires svg version
 2016-05-23 13:55:42 -07:00
Scott Lahteine 714d526614 Merge pull request #3828 from AnHardt/hw-endstops-default 
Correct hardware endstops default
 2016-05-23 13:55:02 -07:00
Scott Lahteine f9b4b90058 Merge pull request #3813 from jbrazio/bugfix/3809 
Stopwatch and PrintCounter improvements
 2016-05-21 18:33:57 -07:00
Scott Lahteine 03e44e0f83 Merge pull request #3807 from thinkyhead/rc_reverse_options_doc 
Additional instructions for controller reverse options
 2016-05-20 20:36:31 -07:00
Scott Lahteine cadf441059 Merge pull request #3798 from AnHardt/extend-M421 
Extend M421 with I and J parameters
 2016-05-20 16:17:23 -07:00
Scott Lahteine 2f6e7b7b9b Merge pull request #3805 from MatixYo/patch-7 
Update language_pl.h to the latest strings
 2016-05-20 14:50:49 -07:00
Scott Lahteine 88291d1656 Merge pull request #3802 from thinkyhead/rc_epatel_g28_rest_pos 
MBL: Add option to configure G28 resting position for all axes
 2016-05-20 12:10:52 -07:00
Scott Lahteine 319d184999 Merge pull request #3803 from jbrazio/feature/buildroot-cleanup 
Buildroot cleanup
 2016-05-19 21:34:11 -07:00
Scott Lahteine a469341555 Merge pull request #3800 from jbrazio/feature/move-felix-cfg 
Moves Felix's dual configuration to a folder
 2016-05-19 18:53:39 -07:00
Scott Lahteine 61de6daf1d Merge pull request #3761 from thinkyhead/rc_plan_arc_idle 
Apply config changes, tweak comments, next_ping_ms => next_idle_ms
 2016-05-19 17:10:17 -07:00
Scott Lahteine 6d68b12e28 Merge pull request #3797 from AnHardt/fix-screen-updatedelay 
Rework intermediate idle() and manage_heater() calls in G2/G3 and G5
 2016-05-19 16:29:27 -07:00
Scott Lahteine aaaf4febaf Merge pull request #3794 from esenapaj/RCBugFix 
Update Galician language to 1.1.0-RCBugFix.
 2016-05-19 16:22:10 -07:00
Scott Lahteine b422e39016 Merge pull request #3779 from thinkyhead/rc_x2_automatic_pins 
Automatically set X2 stepper pins
 2016-05-18 19:27:34 -07:00
Scott Lahteine 8aa591ca09 Merge pull request #3789 from jbrazio/feature/m999-s-arg 
Implements S1 argument in M999
 2016-05-18 16:58:09 -07:00
Scott Lahteine 138c5c8378 Merge pull request #3788 from thinkyhead/rc_dual_x_compile_fix 
DUAL_X_CARRIAGE fixes, improvements, Travis test
 2016-05-18 16:56:54 -07:00
Scott Lahteine bffa928954 Merge pull request #3785 from esenapaj/update-japanese-translation 
Update Japanese trasration
 2016-05-18 15:21:35 -07:00
Scott Lahteine 3bdc03667e Merge pull request #3784 from thinkyhead/rc_funcs_not_extern 
Function declarations in headers don't need "extern"
 2016-05-17 18:43:25 -07:00
Scott Lahteine 82c2d308dc Merge pull request #3783 from thinkyhead/rc_bezier_delta_fix 
Bezier style and DELTA patch
 2016-05-17 18:27:48 -07:00
Scott Lahteine d66e53c42b Merge pull request #3782 from thinkyhead/rc_home_z_before_g29 
Require homing of Z before G29
 2016-05-17 17:53:56 -07:00
Scott Lahteine 552516ddf5 Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup 
Minor DELTA segmentation speedup
 2016-05-17 17:17:38 -07:00
Scott Lahteine 3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
Scott Lahteine d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770 
G29: Report final position back to host when using MBL
 2016-05-17 13:55:26 -07:00
Scott Lahteine ce1d6981c2 Merge pull request #3725 from esenapaj/patch-1 
Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
 2016-05-16 20:23:03 -07:00
Scott Lahteine 58339aea5f Merge pull request #3769 from jbrazio/bugfix/iteration-invokes-undef-behavior 
Bugfix: iteration invokes undefined behavior
 2016-05-15 20:36:25 -07:00
Scott Lahteine 26b4cb5b42 Merge pull request #3771 from thinkyhead/rc_auto_fans_again 
Fix checkExtruderAutoFans
 2016-05-15 20:32:31 -07:00
Scott Lahteine c9271e610b Merge pull request #3762 from jbrazio/bugfix/lcd-hide-bed-icon 
Remove the hotbed icon from the status screen
 2016-05-15 19:11:05 -07:00
Scott Lahteine abdfd914f8 Merge pull request #3763 from esenapaj/patch-4 
Follow-up for #3720 and #3759
 2016-05-15 12:37:51 -07:00
Scott Lahteine 388a58ec02 Merge pull request #3767 from thinkyhead/rc_fix_zigzag_calls 
Fix MBL zigzag calls
 2016-05-15 12:35:36 -07:00
Scott Lahteine 86ac48a374 Merge pull request #3760 from thinkyhead/rc_fix_mbl_m503_output 
Fix various issues with MBL command M421
 2016-05-15 11:49:49 -07:00
Scott Lahteine 1fcc9ec721 Merge pull request #3715 from jbrazio/feature/buildroot 
Cleanup the buildroot
 2016-05-15 11:44:10 -07:00
Scott Lahteine 1b90682617 Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins 
Remove need to define unused pins as -1 in pins files
 2016-05-14 15:49:22 -07:00
Scott Lahteine c8a40f06a6 Merge pull request #3759 from thinkyhead/rc_more_printcounter 
Printcounter bugfix and some new features
 2016-05-14 15:36:31 -07:00
Scott Lahteine 585c8a918f Merge pull request #3758 from thinkyhead/rc_verbiage 
Tweaks to some verbiage
 2016-05-14 15:27:11 -07:00
Scott Lahteine c63f95f2fe Merge pull request #3748 from clexpert/patch-1 
Lastest changes in Czech translate
 2016-05-14 15:12:39 -07:00
Scott Lahteine e01e52969e Merge pull request #3757 from thinkyhead/rc_fix_auto_fans 
Don't try to enable unused auto fans
 2016-05-14 15:09:24 -07:00
Scott Lahteine a713043acd Merge pull request #3749 from esenapaj/patch-3 
Enclose all #error strings by double-quotes
 2016-05-14 15:01:56 -07:00
Scott Lahteine 3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE 
G29 missing FIX_MOUNTED_PROBE condition
 2016-05-14 15:00:42 -07:00
Scott Lahteine 08dfe08f9a Merge pull request #3754 from jbrazio/feature/update-pt_PT 
Updated pt_PT language pack
 2016-05-14 15:00:12 -07:00
Scott Lahteine 596ebccd54 Merge pull request #3753 from jbrazio/feature/followup-3740 
Warn user about useless of individual axis homing and DELTA kinematics
 2016-05-14 14:59:49 -07:00
Scott Lahteine 6e3556cb75 Merge pull request #3746 from esenapaj/patch-2 
Update Japanese translation
 2016-05-14 14:57:43 -07:00
Scott Lahteine f13c4a9ec4 Merge pull request #3720 from jbrazio/feature/host-keepalive 
Removes the DISABLE from HOST_KEEPALIVE
 2016-05-14 14:39:31 -07:00
Scott Lahteine 6903eb1c5b Merge pull request #3751 from AnHardt/fix-arcs 
Idle during long arcs
 2016-05-14 14:33:56 -07:00
Scott Lahteine 14cd0f4c92 Merge pull request #3740 from thinkyhead/rc_lcd_home_options 
Individual Axis Homing LCD menu items
 2016-05-12 11:59:46 -07:00
Scott Lahteine ddf8f5eb10 Merge pull request #3741 from esenapaj/patch-2 
Follow-up the PR #3719(Harmonize LCD comment section)
 2016-05-12 11:59:24 -07:00
Scott Lahteine 675e92ab1f Merge pull request #3738 from thinkyhead/rc_limit_i2c_request 
Print an error on bad i2c request
 2016-05-11 19:36:49 -07:00
Scott Lahteine a42655b9ac Merge pull request #3739 from thinkyhead/rc_reverse_encoder 
Add REVERSE_ENCODER_DIRECTION option
 2016-05-11 19:32:23 -07:00
Scott Lahteine a454a88f9c Merge pull request #3722 from jbrazio/bugfix/printcounter 
Minor #warning fix for PrintCounter
 2016-05-10 17:17:04 -07:00
Scott Lahteine 03bda5c141 Merge pull request #3719 from jbrazio/feature/update-configs 
Harmonize LCD comment section
 2016-05-10 17:16:23 -07:00
Scott Lahteine 5085892204 Merge pull request #3728 from thinkyhead/rc_mention_allen_key 
Mention Z_PROBE_ALLEN_KEY in probe sanity checks
 2016-05-10 14:06:14 -07:00
Scott Lahteine be5d17de17 Merge pull request #3713 from thinkyhead/rc_file_offset_long 
Use code_value_long for potentially large values
 2016-05-10 09:15:53 -07:00