Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to latest rcbugfix #3

Merged
merged 627 commits into from
Jun 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
627 commits
Select commit Hold shift + click to select a range
8a4376d
Idle during long arcs
AnHardt May 13, 2016
d752215
Warn user about useless of individual axis homing and DELTA kinematics
jbrazio May 14, 2016
596f153
Updated pt_PT language pack
jbrazio May 14, 2016
6903eb1
Merge pull request #3751 from AnHardt/fix-arcs
thinkyhead May 14, 2016
f13c4a9
Merge pull request #3720 from jbrazio/feature/host-keepalive
thinkyhead May 14, 2016
4d6bb52
Don't try to enable unused auto fans
thinkyhead May 14, 2016
9f6b8f7
Remove extra @section directive from configs
thinkyhead May 12, 2016
b4c891d
Remove obsolete reference to prepare_arc_move
thinkyhead May 12, 2016
ddac17a
Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ)
thinkyhead May 12, 2016
6e3556c
Merge pull request #3746 from esenapaj/patch-2
thinkyhead May 14, 2016
596ebcc
Merge pull request #3753 from jbrazio/feature/followup-3740
thinkyhead May 14, 2016
08dfe08
Merge pull request #3754 from jbrazio/feature/update-pt_PT
thinkyhead May 14, 2016
3cfea3f
Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE
thinkyhead May 14, 2016
a713043
Merge pull request #3749 from esenapaj/patch-3
thinkyhead May 14, 2016
ddf3e1e
Tweaks to some verbiage
thinkyhead May 14, 2016
e01e529
Merge pull request #3757 from thinkyhead/rc_fix_auto_fans
thinkyhead May 14, 2016
c63f95f
Merge pull request #3748 from clexpert/patch-1
thinkyhead May 14, 2016
b660f1b
Bugfix: Multiple M77 no longer increment the print counter
jbrazio May 14, 2016
a792672
M78 now allows stats reset using the S78 argument
jbrazio May 14, 2016
8a18c52
Adds an option to disable print job timer auto start
jbrazio May 14, 2016
f9a62f6
Added PRINTJOB_TIMER_AUTOSTART section to example config files
jbrazio May 14, 2016
585c8a9
Merge pull request #3758 from thinkyhead/rc_verbiage
thinkyhead May 14, 2016
c8a40f0
Merge pull request #3759 from thinkyhead/rc_more_printcounter
thinkyhead May 14, 2016
1b90682
Merge pull request #3702 from thinkyhead/rc_sensitive_fan_pins
thinkyhead May 14, 2016
a3520b6
More precision in M503 output for MBL's M421
thinkyhead May 14, 2016
bc5a547
More robust MBL index / point conversion
thinkyhead May 14, 2016
13175ce
Fix error checking in M421
thinkyhead May 15, 2016
a058226
Prevent watchdog timeout in bezier moves
thinkyhead May 15, 2016
4510003
Remove the hotbed icon when HAS_TEMP_BED is false
jbrazio May 15, 2016
6d72271
Follow-up the PR #3720 and #3759
May 15, 2016
1fcc9ec
Merge pull request #3715 from jbrazio/feature/buildroot
thinkyhead May 15, 2016
86ac48a
Merge pull request #3760 from thinkyhead/rc_fix_mbl_m503_output
thinkyhead May 15, 2016
754b015
Fix MBL zigzag calls
thinkyhead May 15, 2016
388a58e
Merge pull request #3767 from thinkyhead/rc_fix_zigzag_calls
thinkyhead May 15, 2016
abdfd91
Merge pull request #3763 from esenapaj/patch-4
thinkyhead May 15, 2016
ecd490e
Bugfix: iteration invokes undefined behavior
jbrazio May 15, 2016
2f14934
Fix checkExtruderAutoFans
thinkyhead May 16, 2016
c9271e6
Merge pull request #3762 from jbrazio/bugfix/lcd-hide-bed-icon
thinkyhead May 16, 2016
26b4cb5
Merge pull request #3771 from thinkyhead/rc_auto_fans_again
thinkyhead May 16, 2016
58339ae
Merge pull request #3769 from jbrazio/bugfix/iteration-invokes-undef-…
thinkyhead May 16, 2016
e2b87f6
Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
May 10, 2016
95f3052
Add stowing process for MECHANICAL_PROBE
May 11, 2016
b6a3aef
G29: Report final position back to host when using MBL
jbrazio May 17, 2016
ce1d698
Merge pull request #3725 from esenapaj/patch-1
thinkyhead May 17, 2016
d0ac454
Merge pull request #3775 from jbrazio/bugfix/followup-3770
thinkyhead May 17, 2016
3016dfe
Merge pull request #3744 from thinkyhead/rc_bezier_curves
thinkyhead May 17, 2016
41e9569
Minor DELTA segmentation speedup
AnHardt May 17, 2016
a9926b7
Require homing of Z before G29
thinkyhead May 17, 2016
a289707
XYZ unhomed
thinkyhead May 18, 2016
552516d
Merge pull request #3781 from AnHardt/minor-delta-segmenting-speedup
thinkyhead May 18, 2016
d66e53c
Merge pull request #3782 from thinkyhead/rc_home_z_before_g29
thinkyhead May 18, 2016
ecec5c5
Bezier style and DELTA patch
thinkyhead May 18, 2016
82c2d30
Merge pull request #3783 from thinkyhead/rc_bezier_delta_fix
thinkyhead May 18, 2016
4041508
Function decl. in headers don't need "extern"
thinkyhead May 18, 2016
3bdc036
Merge pull request #3784 from thinkyhead/rc_funcs_not_extern
thinkyhead May 18, 2016
56d5ae5
Update Japanese trasration
May 18, 2016
bffa928
Merge pull request #3785 from esenapaj/update-japanese-translation
thinkyhead May 18, 2016
516e79b
Declare extruder_duplication_enabled in Marlin.h
thinkyhead May 18, 2016
2a7b1a8
Improve DUAL_X_CARRIAGE sanity check errors
thinkyhead May 18, 2016
e6effb8
Implements S1 argument in M999
jbrazio May 18, 2016
7527fde
Add Travis test for DUAL_X_CARRIAGE
thinkyhead May 18, 2016
138c5c8
Merge pull request #3788 from thinkyhead/rc_dual_x_compile_fix
thinkyhead May 18, 2016
8aa591c
Merge pull request #3789 from jbrazio/feature/m999-s-arg
thinkyhead May 18, 2016
07c9a11
Automatically set X2 stepper pins
thinkyhead May 17, 2016
b422e39
Merge pull request #3779 from thinkyhead/rc_x2_automatic_pins
thinkyhead May 19, 2016
9d41628
Update Galician language to 1.1.0-RCBugFix.
rafacouto May 18, 2016
0c4d885
Speedup sreen update delay
AnHardt May 19, 2016
2207001
No compromises for the manage_heater()
AnHardt May 19, 2016
e761bdb
Remove SF_ARC_FIX from G5 (Cubic B-spline)
AnHardt May 19, 2016
aaaf4fe
Merge pull request #3794 from esenapaj/RCBugFix
thinkyhead May 19, 2016
6d68b12
Merge pull request #3797 from AnHardt/fix-screen-updatedelay
thinkyhead May 19, 2016
8218558
Update comments, rename next_ping_ms, followup to #3797
thinkyhead May 15, 2016
80f0592
Moves Felix's dual configuration to a folder
jbrazio May 19, 2016
61de6da
Merge pull request #3761 from thinkyhead/rc_plan_arc_idle
thinkyhead May 20, 2016
14652bb
Moves shared helper scripts to the buildroot
jbrazio May 20, 2016
66fb23e
Makes buildroot bin scripts executable
jbrazio May 20, 2016
a469341
Merge pull request #3800 from jbrazio/feature/move-felix-cfg
thinkyhead May 20, 2016
08b485a
Travis will now generate and use the custom version header file
jbrazio May 20, 2016
3d3a919
Moves the Marlin logo into the buildroot
jbrazio May 20, 2016
319d184
Merge pull request #3803 from jbrazio/feature/buildroot-cleanup
thinkyhead May 20, 2016
bbe4c20
Update language_pl.h
May 20, 2016
c7d90dc
Add option to configure G28 all axis resting position for MBL
epatel May 17, 2016
37c6d0f
Reword MESH_G28_REST_ORIGIN comment
thinkyhead May 20, 2016
1a6c72c
Apply to the rest of the configs
thinkyhead May 20, 2016
f69b5af
Travis CI test for MBL
thinkyhead May 20, 2016
88291d1
Merge pull request #3802 from thinkyhead/rc_epatel_g28_rest_pos
thinkyhead May 20, 2016
2f6e7b7
Merge pull request #3805 from MatixYo/patch-7
thinkyhead May 20, 2016
f5a0365
Extend M421 with I and J parameters
AnHardt May 20, 2016
69abfef
Add "SINGLENOZZLE" extruder option
thinkyhead May 20, 2016
92ac133
Conditionals and Sanity Check for SINGLENOZZLE
thinkyhead May 20, 2016
0c7c450
PID_ADD_EXTRUSION_RATE based on MarlinKimbra
thinkyhead May 20, 2016
cadf441
Merge pull request #3798 from AnHardt/extend-M421
thinkyhead May 20, 2016
c5130fd
Additional instructions for controller reverse options
thinkyhead May 20, 2016
03e44e0
Merge pull request #3807 from thinkyhead/rc_reverse_options_doc
thinkyhead May 21, 2016
8c0edb2
Fixes #3809 and adds several improvements to the Stopwatch and
jbrazio May 22, 2016
f9b4b90
Merge pull request #3813 from jbrazio/bugfix/3809
thinkyhead May 22, 2016
75221fa
Followup for #3813
jbrazio May 22, 2016
bb66ffb
Correct hardware endstops default
AnHardt May 22, 2016
05a041c
Cleanup the Marlin logo with a hires svg version
jbrazio May 23, 2016
714d526
Merge pull request #3828 from AnHardt/hw-endstops-default
thinkyhead May 23, 2016
6cdae35
Merge pull request #3822 from jbrazio/cleanup/hires-logo
thinkyhead May 23, 2016
678cbad
Merge pull request #3819 from jbrazio/bugfix/followup-3813
thinkyhead May 23, 2016
95fee8c
Add option for CoreYZ kinematics
thinkyhead May 20, 2016
6c7f490
COREYZ Conditionals, SanityCheck for only a single kinematic
thinkyhead May 20, 2016
5172d4b
COREYZ stepper, planner, endstop, babysteps
thinkyhead May 20, 2016
0e55c06
Rename CORE_AXIS_3 to NORMAL_AXIS
thinkyhead May 20, 2016
a4ed988
Two index finding functions for MBL
thinkyhead May 22, 2016
360adc6
Small reduction in M421 code
thinkyhead May 22, 2016
a1a5cb5
Propose simpler cel index methods
thinkyhead May 22, 2016
4955163
Propose simpler probe index methods
thinkyhead May 22, 2016
9049f40
EEPROM report uses G29 S3
thinkyhead May 23, 2016
827738a
set_z parameters marked const
thinkyhead May 23, 2016
89e630b
Merge pull request #3808 from thinkyhead/rc_singlenozzle
thinkyhead May 23, 2016
30f6b84
Merge pull request #3812 from thinkyhead/rc_mbl_index_finders
thinkyhead May 23, 2016
fad7680
Slower SPI speed for MAX31855
thinkyhead May 26, 2016
fe31227
Merge pull request #3806 from thinkyhead/rc_coreyz_support
thinkyhead May 27, 2016
eb2746a
MBL: Fix for negative x/y positions
epatel May 28, 2016
40e64b3
Closes #3826: SD printing will now pause and stop the print counter
jbrazio May 29, 2016
dc22097
Fix some of array initializations
thinkyhead May 30, 2016
189e60d
Merge pull request #3909 from thinkyhead/fix_array_inits
thinkyhead May 30, 2016
8806c7b
Merge pull request #3903 from epatel/marlin/mbl_negative_xy
thinkyhead May 30, 2016
3861f1e
Merge pull request #3908 from jbrazio/bugfix/3826
thinkyhead May 30, 2016
2805bf3
Less greedy regex in travis helper scripts
thinkyhead May 27, 2016
7ba8f2d
Merge pull request #3906 from thinkyhead/rc_fix_travis_helpers
thinkyhead May 30, 2016
92a27c3
MBL: Apply https://github.com/MarlinFirmware/Marlin/pull/3903 to exam…
epatel99 May 30, 2016
5a8918c
Merge pull request #3911 from epatel/marlin/mbl_3903_example_configs
thinkyhead May 30, 2016
d3efc96
Patch conditionals for DEFAULT_LCD_CONTRAST, MINIPANEL
thinkyhead May 30, 2016
ffe55c2
Merge pull request #3914 from thinkyhead/rc_fix_lcd_contrast
thinkyhead May 30, 2016
0659383
MBL: Move border macros to Configuration_adv.h
epatel May 30, 2016
ecfdcf7
Tiny calc_timer speedup
thinkyhead May 11, 2016
470d5ac
Apply static to Planner class
thinkyhead May 26, 2016
26f866b
Apply static to Endstops class
thinkyhead May 26, 2016
668d50f
Keep Stepper encapsulation, use static data and methods
thinkyhead May 11, 2016
02735fd
Merge pull request #3921 from thinkyhead/rc_calc_timer_tweak
thinkyhead May 30, 2016
c3df293
Merge pull request #3923 from thinkyhead/rc_statics_endstops
thinkyhead May 30, 2016
78fb02a
Apply static to Temperature class
thinkyhead May 26, 2016
85512e9
Drop FORCE_INLINE from temperature.h
thinkyhead May 31, 2016
e60224a
Drop FORCE_INLINE from endstops.h
thinkyhead May 31, 2016
ff53819
Drop FORCE_INLINE in planner.h
thinkyhead May 31, 2016
1582ed4
Merge pull request #3918 from epatel/marlin/mbl_negative_xy_adv
thinkyhead May 31, 2016
43a71ef
Remove excess allen key probe examples from configs
thinkyhead May 31, 2016
55ef04a
Need to call dac_init() in setup() for DAC_STEPPER_CURRENT
thinkyhead May 31, 2016
5eb7a79
initial changes to DA
boelle May 31, 2016
3d7d034
Merge pull request #3932 from boelle/patch-1
May 31, 2016
a1a8240
added defines present in en but not in da
boelle May 31, 2016
bc77670
Merge pull request #3929 from thinkyhead/rc_fix_printrboard_dac
thinkyhead May 31, 2016
bd97bbc
Make HAS_LCD_CONTRAST a boolean flag
thinkyhead May 31, 2016
a0b000d
Support for SAV_3DGLCD OLED LCD controller
thinkyhead May 31, 2016
c6c01ea
Merge pull request #3888 from thinkyhead/rc_slower_max31855
thinkyhead Jun 1, 2016
4770d7c
Merge pull request #3933 from boelle/patch-2
thinkyhead Jun 1, 2016
1a01a44
Merge pull request #3936 from thinkyhead/rc_sav_mk1
thinkyhead Jun 1, 2016
d698c89
Fix bad movement in gcode_T when switching
thinkyhead May 23, 2016
2bd4f33
Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup
thinkyhead Jun 1, 2016
67f816f
Merge pull request #3926 from thinkyhead/rc_statics_endstops
thinkyhead Jun 1, 2016
f331763
Merge pull request #3829 from thinkyhead/rc_fix_T_command
thinkyhead Jun 1, 2016
9729e9c
Combine ST7565 / U8GLIB_NHD_C12864 items in dogm
thinkyhead Jun 1, 2016
3aefa04
Raise the servo probe before stow outside ABL context
lrpirlet Jun 1, 2016
b703fa9
Add sanity check for SAV_3DGLCD display types
thinkyhead Jun 2, 2016
efa7209
Improved LCD contrast handling
thinkyhead Jun 2, 2016
5390c84
Positive conditions for HAS_LCD_CONTRAST
thinkyhead Jun 2, 2016
b3a37b4
Patch G28 servo stow to use Conditionals, raise_z_after_probing
thinkyhead Jun 2, 2016
28fb1f8
Tweak #endif comment for ABL GRID
thinkyhead Jun 2, 2016
9eecb44
Make raise_z_after_probing null sometimes
thinkyhead Jun 2, 2016
db0fd02
Z raise options independent of ABL so G28 can use them
thinkyhead Jun 2, 2016
5b5270a
Merge pull request #3943 from thinkyhead/rc_contrast_adjust
thinkyhead Jun 3, 2016
3fd9b33
Merge pull request #3924 from thinkyhead/rc_statics_temperature
thinkyhead Jun 3, 2016
1941855
Merge pull request #3925 from thinkyhead/rc_statics_planner
thinkyhead Jun 3, 2016
663d246
Merge pull request #3922 from thinkyhead/rc_statics_stepper
thinkyhead Jun 3, 2016
381bc6f
set_position => set_position_mm
thinkyhead May 31, 2016
6277395
set_current_position_from_planner() after stepper.quick_stop()
thinkyhead May 31, 2016
064efb2
Also call clear_command_queue for lcd_sdcard_stop
thinkyhead Jun 1, 2016
664b299
This fix is not DELTA compatible
thinkyhead Jun 3, 2016
0d793fb
Merge pull request #3939 from thinkyhead/rc_resume_get_position
thinkyhead Jun 3, 2016
81384df
Apply static to remaining stepper methods
thinkyhead Jun 3, 2016
8532bf4
last of missing defines added
boelle Jun 3, 2016
e1591be
Galician language update.
rafacouto Jun 3, 2016
5f8db3f
Galician language update.
rafacouto Jun 3, 2016
5f759a2
Merge branch 'RCBugFix' of https://github.com/rafacouto/Marlin into R…
rafacouto Jun 3, 2016
f499be0
Fix M428 width DELTA & SCARA
MagoKimbra Jun 3, 2016
8529122
Merge pull request #3946 from thinkyhead/rc_g28_servo_raise_before_stow
thinkyhead Jun 3, 2016
2403a1c
Merge pull request #3952 from rafacouto/RCBugFix
thinkyhead Jun 3, 2016
4e13cd3
Merge pull request #3955 from MagoKimbra/RCBugFix
thinkyhead Jun 3, 2016
08871d4
Merge pull request #3950 from boelle/patch-3
thinkyhead Jun 4, 2016
9c87bf8
Merge pull request #3947 from thinkyhead/rc_statics_stepper
thinkyhead Jun 4, 2016
32f8300
Merge pull request #3944 from thinkyhead/rc_eboston_lcd_contrast
thinkyhead Jun 4, 2016
cd441ce
SINGLENOZZLE: EXTRUDERS versus HOTENDS
thinkyhead May 27, 2016
f2fb66c
With SINGLENOZZLE only set temperature for the active tool
thinkyhead May 30, 2016
c06de0f
MBL: Added keeping MBL active when homing single axises for #3750
epatel May 24, 2016
c2362c1
Apply Marlin coding standards to MBL class
thinkyhead Jun 4, 2016
4bdcf3a
Merge pull request #3956 from thinkyhead/rc_mbl_single_axis_fix
thinkyhead Jun 4, 2016
d7e4e8e
Fix a typo in #3955
thinkyhead Jun 4, 2016
05868de
Merge pull request #3958 from thinkyhead/rc_fix_3955
thinkyhead Jun 4, 2016
4394707
Merge pull request #3895 from thinkyhead/rc_singlenozzle_part_2
thinkyhead Jun 4, 2016
e2a8961
Use e_steps[EXTRUDERS] instead of e_steps[4]
thinkyhead Jun 5, 2016
a3e25a0
Instead of trying to move now, set a flag to move asap
thinkyhead Mar 8, 2016
47b5c55
Implement the delayed-move technique
thinkyhead Apr 4, 2016
4b3d5ae
Merge pull request #3110 from thinkyhead/rc_manual_moves
thinkyhead Jun 5, 2016
5e6fdbb
Merge pull request #3963 from thinkyhead/rc_advance_steppers
thinkyhead Jun 5, 2016
9171a3d
Update Czech language 2016/06/07
petrzjunior Jun 7, 2016
49ecaf7
Rename some auto/locals to avoid name conflict
thinkyhead Jun 7, 2016
08a9bd0
Merge pull request #3976 from petrzjunior/rc_lang_cz_160607
thinkyhead Jun 8, 2016
cca0474
MBL: cel => cell
thinkyhead Jun 8, 2016
3d56b9d
Merge pull request #3979 from thinkyhead/mbl_cell
thinkyhead Jun 8, 2016
b23f710
Cleanup and naming for num-to-string functions
thinkyhead Jun 8, 2016
9b42658
Merge pull request #3983 from thinkyhead/rc_fix_ftostr
thinkyhead Jun 8, 2016
2d55862
Use memset in mbl.reset to save 58 bytes
thinkyhead Jun 8, 2016
a569e89
Merge pull request #3978 from thinkyhead/rc_planner_local_rename
thinkyhead Jun 8, 2016
1621243
G20/21 and M149 support, and code_value() refactor
mrnerdhair May 31, 2016
4980ecc
Smaller binary using inline gcode argument getters
thinkyhead Jun 9, 2016
0b3142b
Remove redundant declarations from M100 code
thinkyhead Jun 9, 2016
38279a0
Travis tests for Inch, Fahrenheit, Kelvin, M100
thinkyhead Jun 9, 2016
f0a5b7f
Merge pull request #3986 from thinkyhead/rc_mbl_forward_iteration
thinkyhead Jun 9, 2016
26f8f54
Merge pull request #3985 from thinkyhead/rc_inch_fahrenheit_kelvin
thinkyhead Jun 9, 2016
3c68be7
Throw an error in PID_autotune for E < -1
thinkyhead Jun 9, 2016
cb4704e
Rename some planner acceleration vars
thinkyhead Jun 9, 2016
3b08eb1
`acceleration_st` => `acceleration_steps_per_s2`
thinkyhead Jun 9, 2016
80ab749
Rename acceleration locals for clarity
thinkyhead Jun 9, 2016
446515a
Adjust spacing in block_t
thinkyhead Jun 9, 2016
72c6f29
axis_steps_per_unit => axis_steps_per_mm
thinkyhead Jun 9, 2016
24e70c9
Update travis to test for ULTRA and DOG LCD options
jbrazio Jun 10, 2016
27d5794
Merge pull request #3992 from thinkyhead/rc_pid_autotune_e_range
thinkyhead Jun 10, 2016
5b5aa15
Non-blocking buzzer
jbrazio Jun 4, 2016
a82c755
Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings
thinkyhead Jun 10, 2016
d13c86f
Adds travis test for SPEAKER
jbrazio Jun 9, 2016
74060f1
Merge pull request #3995 from thinkyhead/rc_nonblocking_buzzer
thinkyhead Jun 10, 2016
4a212f7
Merge pull request #3993 from jbrazio/feature/update-travis
thinkyhead Jun 10, 2016
e2d4919
Merge pull request #3991 from thinkyhead/rc_axis_units
thinkyhead Jun 10, 2016
378ff92
manage_manual_move(); -> ULTIPANEL
Blue-Marlin Jun 10, 2016
2c34ec2
Closes #3999: Compilation error with BEEPER_PIN -1
jbrazio Jun 10, 2016
93ffa02
Merge pull request #4003 from jbrazio/bugfix/3999
thinkyhead Jun 11, 2016
bf8710d
Merge pull request #4001 from Blue-Marlin/manage_manual_move-ULTIPANEL
thinkyhead Jun 11, 2016
280af07
Improves travis buildroot regexp
jbrazio Jun 10, 2016
9b3a089
Upgrades travis Arduino IDE version to 1.6.9
jbrazio Jun 10, 2016
ddbb05f
Merge pull request #3998 from jbrazio/bugfix/better-regex
thinkyhead Jun 11, 2016
45ea874
Wrap all items depending on ULTIPANEL
thinkyhead Jun 11, 2016
ae9b09f
menu => screen
thinkyhead Jun 11, 2016
d50ba08
Merge pull request #4011 from thinkyhead/rc_manual_move_cond
thinkyhead Jun 11, 2016
b75e648
Clarify names of prepare_move functions
thinkyhead Jun 11, 2016
efe719f
Heal the watchgog
Blue-Marlin Jun 11, 2016
2f1bf83
Merge pull request #4005 from thinkyhead/rc_prepare_move_destination
thinkyhead Jun 11, 2016
c7eeb09
Merge pull request #4012 from Blue-Marlin/watchdoghealing
thinkyhead Jun 11, 2016
b322ac4
No need to check ULTIPANEL with DOGLCD
thinkyhead Jun 11, 2016
e51f8df
Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond
thinkyhead Jun 12, 2016
9a1dfd0
Fix Travis test for FILAMENTCHANGEENABLE
thinkyhead Jun 12, 2016
4fbe818
Add macros to move servos
thinkyhead Jun 12, 2016
0d0b751
Merge pull request #4023 from thinkyhead/rc_servo_macros
thinkyhead Jun 12, 2016
8119679
Fix manual_move to move the correct E stepper
thinkyhead Jun 12, 2016
4d2119f
_lcd_move => _lcd_move_xyz
thinkyhead Jun 12, 2016
b4c37a6
Merge pull request #4025 from thinkyhead/rc_fix_ultralcd_move_e
thinkyhead Jun 13, 2016
17c8634
Merge pull request #4020 from thinkyhead/rc_test_M600
thinkyhead Jun 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
220 changes: 148 additions & 72 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,54 @@
language: c
#
before_install:
# Travis runs a detached head. We need to find the current branch
- git checkout `git branch --contains HEAD | grep -v '*'`
# Also tags for the root(s) of the minor version(s)
#
# Fetch the tag information for the current branch
- git fetch origin --tags
- mkdir ~/bin
#
# Publish the buildroot script folder
- chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
- ln -s ${TRAVIS_BUILD_DIR}/buildroot/bin/ ~/bin
#
# Start fb X server
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
- sleep 3
- export DISPLAY=:1.0
#
install:
# Install arduino 1.6.4
- wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz
- tar Jxf arduino-1.6.4-linux64.tar.xz
- sudo mv arduino-1.6.4 /usr/local/share/arduino
- ln -s /usr/local/share/arduino/arduino ~/bin/arduino
# Our custom build commands
- mv LinuxAddons/bin/* ~/bin/
- ls -la ~/bin
# install our platform
- cp -r ArduinoAddons/Arduino_1.6.x/hardware/* /usr/local/share/arduino/hardware
# copy libraries to arduino dir, as conditional includes do not work in .ino files
- cp -r /usr/local/share/arduino/hardware/marlin/avr/libraries/* /usr/local/share/arduino/libraries/
- cp -r ArduinoAddons/Arduino_1.6.x/libraries/* /usr/local/share/arduino/libraries/
# add LiquidCrystal_I2C & LiquidTWI2 libraries
#
# Install arduino 1.6.9
- wget http://downloads-02.arduino.cc/arduino-1.6.9-linux64.tar.xz
- tar xf arduino-1.6.9-linux64.tar.xz
- sudo mv arduino-1.6.9 /usr/local/share/arduino
- ln -s /usr/local/share/arduino/arduino ${TRAVIS_BUILD_DIR}/buildroot/bin/arduino
#
# Install: LiquidCrystal_I2C library
- git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
- mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
#
# Install: LiquidTWI2 library
- git clone https://github.com/lincomatic/LiquidTWI2.git
- mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
- sudo mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
#
# Install: Monochrome Graphics Library for LCDs and OLEDs
- arduino --install-library "U8glib"
#
# Install: L6470 Stepper Motor Driver library
- git clone https://github.com/ameyer/Arduino-L6470.git
- sudo mv Arduino-L6470/L6470 /usr/local/share/arduino/libraries/L6470
#
# Install: TMC26X Stepper Motor Controller library
- git clone https://github.com/trinamic/TMC26XStepper.git
- sudo mv TMC26XStepper /usr/local/share/arduino/libraries/TMC26XStepper
#
before_script:
# arduino requires an X server even with command line
# https://github.com/arduino/Arduino/issues/1981
- Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
# change back to home directory for compiling
- cd $TRAVIS_BUILD_DIR
#
# Change current working directory to the build dir
- cd ${TRAVIS_BUILD_DIR}
#
# Generate custom version include
- generate_version_header_for_marlin ${TRAVIS_BUILD_DIR}/Marlin
- cat ${TRAVIS_BUILD_DIR}/Marlin/_Version.h
#
script:
#
Expand Down Expand Up @@ -78,19 +94,107 @@ script:
- opt_enable ENABLE_AUTO_BED_LEVELING DEBUG_LEVELING_FEATURE
- build_marlin
#
# Test MESH_BED_LEVELING feature, with LCD
#
- restore_configs
- opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN MANUAL_BED_LEVELING ULTIMAKERCONTROLLER
- build_marlin
#
# Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos
#
- opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- build_marlin
#
# Test EEPROM_SETTINGS & EEPROM_CHITCHAT
# Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER,
# INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT
#
- restore_configs
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
- build_marlin
#
# Test DUAL_X_CARRIAGE
#
- restore_configs
- opt_set MOTHERBOARD BOARD_RUMBA
- opt_set EXTRUDERS 2
- opt_set TEMP_SENSOR_1 1
- opt_enable USE_XMAX_PLUG
- opt_enable_adv DUAL_X_CARRIAGE
- build_marlin
#
# Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
#
- restore_configs
- opt_set MOTHERBOARD BOARD_BQ_ZUM_MEGA_3D
- opt_set LCD_FEEDBACK_FREQUENCY_DURATION_MS 10
- opt_set LCD_FEEDBACK_FREQUENCY_HZ 100
- opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
- build_marlin
#
# Enable FILAMENTCHANGEENABLE
#
- restore_configs
- opt_enable ULTIMAKERCONTROLLER
- opt_enable_adv FILAMENTCHANGEENABLE
- build_marlin
#
# Enable filament sensor
#
- restore_configs
- opt_enable FILAMENT_WIDTH_SENSOR
- build_marlin
#
# Enable filament sensor with LCD display
#
- opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY
- build_marlin
#
# Enable BEZIER_CURVE_SUPPORT
#
- restore_configs
- opt_enable_adv BEZIER_CURVE_SUPPORT
- build_marlin
#
# Enable COREXY
#
- restore_configs
- opt_enable COREXY
- build_marlin
#
# Enable COREXZ
#
- restore_configs
- opt_enable COREXZ
- build_marlin
#
# Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
#
- restore_configs
- opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
- pins_set RAMPS_14 X_MAX_PIN -1
- opt_set_adv Z2_MAX_PIN 2
- build_marlin
#
# Test PRINTCOUNTER
#
- restore_configs
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
- opt_enable PRINTCOUNTER
- build_marlin
#
### LCDS ###
#
######## STANDARD LCD/PANELS ##############
#
# ULTRA_LCD
#
- restore_configs
- opt_enable ULTRA_LCD
- build_marlin
#
# DOGLCD
#
- restore_configs
- opt_enable DOGLCD
- build_marlin
#
# ULTIMAKERCONTROLLER
#
Expand All @@ -105,10 +209,10 @@ script:
#- opt_enable MAKRPANEL
#- build_marlin
#
# REPRAP_DISCOUNT_SMART_CONTROLLER
# REPRAP_DISCOUNT_SMART_CONTROLLER, SDSUPPORT, and BABYSTEPPING
#
- restore_configs
- opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
- opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING
- build_marlin
#
# G3D_PANEL
Expand Down Expand Up @@ -136,72 +240,44 @@ script:
- opt_enable RA_CONTROL_PANEL
- build_marlin
#
### I2C PANELS ###
######## I2C LCD/PANELS ##############
#
# !!!ATTENTION!!!
# Most I2C configurations are failing at the moment because they require
# a different Liquid Crystal library "LiquidTWI2".
#
# LCD_I2C_SAINSMART_YWROBOT
# Failing at the moment needs different library
#
#- restore_configs
#- opt_enable LCD_I2C_SAINSMART_YWROBOT
#- build_marlin
#
# LCD_I2C_PANELOLU2
#
- restore_configs
- opt_enable LCD_I2C_PANELOLU2
- build_marlin
#- restore_configs
#- opt_enable LCD_I2C_PANELOLU2
#- build_marlin
#
# LCD_I2C_VIKI
#
- restore_configs
- opt_enable LCD_I2C_VIKI
- build_marlin
#- restore_configs
#- opt_enable LCD_I2C_VIKI
#- build_marlin
#
# LCM1602
#
- restore_configs
- opt_enable LCM1602
- build_marlin
#
# Enable FILAMENTCHANGEENABLE
#
- restore_configs
- opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER
- build_marlin
#
# Enable filament sensor
#
- restore_configs
- opt_enable FILAMENT_WIDTH_SENSOR
- build_marlin
#
# Enable filament sensor with LCD display
#
- opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY
- build_marlin
#
# Enable COREXY
#
- restore_configs
- opt_enable COREXY
- build_marlin
#
# Enable COREXZ
#
- restore_configs
- opt_enable COREXZ
- build_marlin
#
# Enable Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS
######## Example Configurations ##############
#
# BQ Hephestos 2
- restore_configs
- opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
- pins_set RAMPS_14 X_MAX_PIN -1
- opt_set_adv Z2_MAX_PIN 2
- use_example_configs Hephestos_2
- build_marlin
#
#
######## Example Configurations ##############
#
# Delta Config (generic)
- restore_configs
- use_example_configs delta/generic
Expand Down
23 changes: 0 additions & 23 deletions ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/boards.txt

This file was deleted.

This file was deleted.

Loading