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

Rc bug fix #5

Merged
merged 458 commits into from
Jun 22, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
458 commits
Select commit Hold shift + click to select a range
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
fb8e880
Add LIN_ADVANCE
May 4, 2016
6d62a4f
Patch LIN_ADVANCE for style and forward-compatibility
thinkyhead May 4, 2016
506d78b
Run the advance_isr faster instead of doing multiple e-steps per inte…
thinkyhead May 6, 2016
aad9c0e
Apply updated ISR timing code
thinkyhead May 8, 2016
45b701d
Travis test for LIN_ADVANCE
thinkyhead Jun 1, 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
0e2bfd0
Use linear feedrate in gcode_T, not volumetric
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
de81086
Added a versioning system to the config files
jbrazio Apr 22, 2016
2f1bf83
Merge pull request #4005 from thinkyhead/rc_prepare_move_destination
thinkyhead Jun 11, 2016
7fb69e2
Use "Tn S1" to change tools without moving
thinkyhead Jun 11, 2016
c7eeb09
Merge pull request #4012 from Blue-Marlin/watchdoghealing
thinkyhead Jun 11, 2016
8ccd97e
Updated all example configuration files
jbrazio Apr 22, 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
29337db
Merge pull request #3 from MarlinFirmware/RCBugFix
Jun 13, 2016
08e2c5a
Added and translated some strings from language_en
silvio-didonna Jun 13, 2016
b4fedec
Show bootscreen later
AnHardt Jun 13, 2016
738f414
Merge pull request #4029 from tnw513/FixLangIt
thinkyhead Jun 14, 2016
587de1b
Merge pull request #3676 from thinkyhead/rc_lin_advance_feature
thinkyhead Jun 14, 2016
b708196
Merge pull request #4032 from AnHardt/bootscreen-delay
thinkyhead Jun 14, 2016
2b340f5
patch LIN_ADVANCE to use code_value_float
thinkyhead Jun 14, 2016
e7e57f0
Merge pull request #4035 from thinkyhead/rc_lin_advance_feature
thinkyhead Jun 14, 2016
8d8180e
Parse M905 args in Marlin_main.cpp
thinkyhead Jun 14, 2016
fc4fb9e
Merge pull request #4036 from thinkyhead/rc_lin_advance_feature
thinkyhead Jun 14, 2016
ee5be92
Fix broken DISABLE_HEATER macro
thinkyhead Jun 14, 2016
78a48d7
Merge pull request #4038 from thinkyhead/rc_fix_heater_off
thinkyhead Jun 14, 2016
02b3d6b
Custom Splash Screen
AnHardt Jun 14, 2016
741cda0
Follow-up the PR #3676(Advance extrusion algorithm – LIN_ADVANCE)
Jun 14, 2016
574c938
Merge pull request #4040 from esenapaj/Follow-up-the-PR-#3676
CONSULitAS Jun 14, 2016
0ad26d0
Merge pull request #4034 from AnHardt/custom-splash-screen
thinkyhead Jun 15, 2016
d2a00b7
Merge pull request #4004 from thinkyhead/rc_feedrate_in_gcode_T
thinkyhead Jun 15, 2016
52ac2a6
Merge pull request #4013 from thinkyhead/rc_toolchange_no_move
thinkyhead Jun 15, 2016
c2b7ef1
"e" was renamed to "eindex" in a previous commit
Alex9779 Jun 15, 2016
44f091a
Fix for the PR #4023(Add macros to move servos)
Jun 15, 2016
1219310
Introduce save_delay()
AnHardt Jun 15, 2016
2d6de3e
Merge pull request #4047 from Alex9779/Fix/ultralcd_move_e
thinkyhead Jun 16, 2016
8c7babb
Merge pull request #4049 from esenapaj/Fix-for-the-PR-#4023
thinkyhead Jun 16, 2016
9c800d1
Position adjustment for bed leveling
thinkyhead Jun 11, 2016
4b93989
MBL Z adjustment on toolchange
thinkyhead Jun 11, 2016
948c467
Merge pull request #4043 from AnHardt/save_delay
thinkyhead Jun 16, 2016
da90bbe
Merge pull request #4010 from thinkyhead/rc_toolchange_adjust
thinkyhead Jun 16, 2016
4d2cb70
Cartesio UI Support
thinkyhead Jun 16, 2016
f639044
Merge pull request #3609 from jbrazio/feature/config-version
thinkyhead Jun 16, 2016
4fa0591
Script to init the upstream remote for Marlin
thinkyhead Jun 16, 2016
b410bf9
Merge pull request #4053 from thinkyhead/rc_cartesio_redo
thinkyhead Jun 16, 2016
114d9db
Show babysteps on the LCD in mm, not steps
edwilliams16 Jun 13, 2016
cd9ecfd
Merge pull request #4057 from thinkyhead/rc_babysteps_mm
thinkyhead Jun 16, 2016
008d063
Fix gcode_T
MagoKimbra Jun 16, 2016
1062275
Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support)
Jun 16, 2016
55edb37
Merge pull request #4058 from MagoKimbra/gcode_T
thinkyhead Jun 16, 2016
340f97d
Add ghtp script to set remotes to HTTP or SSL
thinkyhead Jun 16, 2016
4640974
Merge pull request #4060 from esenapaj/Follow-up-the-PR-#4053
thinkyhead Jun 16, 2016
9030cee
Merge pull request #4056 from thinkyhead/rc_mfinit
thinkyhead Jun 16, 2016
ef3bef6
Fix feedrate in gcode_T (max_feedrate is mm/s)
thinkyhead Jun 15, 2016
884bc63
Add Croatian language
robimarko Jun 15, 2016
2015aad
Tweak Croatian language file heading
thinkyhead Jun 16, 2016
02e5dad
Include Croatian in language listings
thinkyhead Jun 16, 2016
c42b136
Merge pull request #4045 from thinkyhead/rc_max_feedrate_is_mm_s
thinkyhead Jun 16, 2016
ebbed29
Delete mysterious .swp files from #3609
thinkyhead Jun 16, 2016
8d8cbef
Merge pull request #4055 from thinkyhead/rc_croatian_language
thinkyhead Jun 17, 2016
d991a4c
Merge pull request #4063 from thinkyhead/rc_remove_swp_files
thinkyhead Jun 17, 2016
e7ab26d
Updates .gitignore
jbrazio Jun 17, 2016
cabb71f
Merge pull request #4064 from jbrazio/feature/update-gitignore
thinkyhead Jun 17, 2016
c5eecb1
Follow-up the PR #4055 (Croatian language support)
Jun 17, 2016
d1e5dc6
Fixes misc gcc warnings
jbrazio Jun 16, 2016
d087ae0
Update README.md
token47 Jun 17, 2016
dbb6d1e
Merge pull request #4071 from token47/patch-1
thinkyhead Jun 17, 2016
7641f41
Merge pull request #4069 from esenapaj/Follow-up-the-PR-#4055
thinkyhead Jun 17, 2016
47ce810
Remove support for XY servo endstops
thinkyhead Jun 14, 2016
1bed392
HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP
thinkyhead Jun 17, 2016
e189f6a
Patch Travis test for bed leveling
thinkyhead Jun 17, 2016
f66a194
Merge pull request #4062 from jbrazio/bugfix/compiler-warnings
thinkyhead Jun 17, 2016
1000563
Make M851 standard with a bed probe
thinkyhead Jun 15, 2016
a8b8796
Define probe offsets when a probe exists
thinkyhead Jun 17, 2016
fc56a54
Rename movement section to motion
thinkyhead Jun 17, 2016
eab44b3
Safety and serial sections
thinkyhead Jun 17, 2016
de177ba
Minor tweaks to M109 / M190
thinkyhead Jun 18, 2016
692a6e7
Merge pull request #4065 from thinkyhead/rc_goodbye_xy_servos
thinkyhead Jun 18, 2016
bd4ec72
Merge pull request #4066 from thinkyhead/rc_M851_with_probe
thinkyhead Jun 18, 2016
17bd770
.gitignore comments in correct format
thinkyhead Jun 18, 2016
c53d644
Merge pull request #4074 from thinkyhead/rc_fix_gitignore
thinkyhead Jun 18, 2016
3a150f0
Merge pull request #4073 from thinkyhead/rc_temp_mystery
thinkyhead Jun 18, 2016
bbf5b48
Add an SD Card stop function, use in ultralcd
thinkyhead Jun 18, 2016
defcacc
Delete some obsolete Z servo macros
thinkyhead Jun 18, 2016
599154f
Merge pull request #4076 from thinkyhead/rc_stop_print
thinkyhead Jun 18, 2016
f33bd0b
Merge pull request #4077 from thinkyhead/rc_delete_old_macros
thinkyhead Jun 18, 2016
5991eb4
Update Spanish Language
RicardoGA Jun 18, 2016
d3a05de
Save and restore feedrate in probe functions
thinkyhead Jun 18, 2016
d36d4ed
Tweak partial homing code
thinkyhead Jun 18, 2016
4e860ba
Allow setting xy_travel_speed for delta leveling also
thinkyhead Jun 18, 2016
d55b94d
Follow-up the PR #4065 (Remove support for XY servo endstops)
Jun 18, 2016
da526f6
Merge pull request #4080 from thinkyhead/rc_probe_feedrates
thinkyhead Jun 18, 2016
6dff52d
Merge pull request #4078 from RicardoGA/Language_Spanish
thinkyhead Jun 18, 2016
e355838
Merge pull request #4082 from esenapaj/Follow-up-the-PR-#4065
thinkyhead Jun 18, 2016
c475291
Fix M851
RicardoGA Jun 18, 2016
4edf813
Just-in-time declaration style in M48
thinkyhead Jun 18, 2016
a647b05
Shrink some debug code in G28
thinkyhead Jun 18, 2016
46d3ef2
Simplify sample_set probe_pt call in M48
thinkyhead Jun 18, 2016
1dad912
Adjust M48 raise / move handling
thinkyhead Jun 18, 2016
b714fb6
Merge pull request #4085 from thinkyhead/rc_fix_M851
thinkyhead Jun 18, 2016
b7e3c1b
Tweak M48 output conditions
thinkyhead Jun 18, 2016
96b8bcc
Merge pull request #4081 from thinkyhead/rc_tweaky_m48_tweaks
Roxy-3D Jun 19, 2016
400e13d
Output a message for SD read errors
thinkyhead Jun 20, 2016
43ec241
Merge pull request #4092 from thinkyhead/rc_sd_error
thinkyhead Jun 20, 2016
f8c278c
Cartesio UI display option in all configs
thinkyhead Jun 20, 2016
15a5eeb
Merge pull request #4094 from thinkyhead/rc_cartesio_config
thinkyhead Jun 20, 2016
add0032
Improve FILAMENT_RUNOUT_SENSOR, FILRUNOUT_PIN
thinkyhead Jun 20, 2016
de12228
Make Z Probe options independent of ABL
thinkyhead Jun 15, 2016
42ccb5b
Travis test a servo probe without ABL
thinkyhead Jun 20, 2016
7b5cd31
Merge pull request #4095 from thinkyhead/rc_fil_runout_cleanup
thinkyhead Jun 20, 2016
dfbf8b3
FIL_RUNOUT_INVERTING false by default
thinkyhead Jun 20, 2016
2fd2301
FILRUNOUT => FIL_RUNOUT
thinkyhead Jun 20, 2016
f215b30
Merge pull request #4093 from thinkyhead/rc_probe_without_abl
thinkyhead Jun 20, 2016
9beb3f2
Merge pull request #4097 from thinkyhead/rc_fil_runout_cleanup
thinkyhead Jun 20, 2016
7e9d4a6
Always raise Z (if needed) for servo deploy/stow
thinkyhead Jun 12, 2016
524f6d9
Merge pull request #4096 from thinkyhead/rc_always_raise_servo
thinkyhead Jun 20, 2016
3b457c2
Use deploy/stow with FIX_MOUNTED_PROBE too
thinkyhead Jun 20, 2016
f6b09cf
Always use deploy/stow for dock_sled
thinkyhead Jun 20, 2016
51d52cb
Make run_z_probe available for any bed probe
thinkyhead Jun 20, 2016
ed75b0e
Make clean_up function available for probes
thinkyhead Jun 20, 2016
04e88d0
Clear up ordering in G30
thinkyhead Jun 20, 2016
6aba98e
Comment on setup_for_endstop_move
thinkyhead Jun 20, 2016
2530371
Always disable probe at the end of G29
thinkyhead Jun 20, 2016
6563b07
Test for mechanical and fix mounted probes
thinkyhead Jun 20, 2016
71534dc
Merge pull request #4100 from thinkyhead/rc_z_deploy
thinkyhead Jun 21, 2016
7f8a202
Move raise_z_after_probing into earlier block
thinkyhead Jun 21, 2016
26a9cd0
Move run_z_probe to earlier block
thinkyhead Jun 21, 2016
3996242
Allow Z_MIN_PROBE_REPEATABILITY_TEST solo
thinkyhead Jun 21, 2016
dcb8ec3
Fix compile error with watch_bed_next_ms
thinkyhead Jun 21, 2016
5e46962
Merge pull request #4105 from thinkyhead/rc_combine_probe_blocks
thinkyhead Jun 21, 2016
71a7408
Merge pull request #4106 from thinkyhead/rc_temp_compile_err
thinkyhead Jun 21, 2016
19fe93a
Clean up configs for Z_MIN_PROBE_REPEATABILITY_TEST
thinkyhead Jun 21, 2016
f77f3ff
Remove duplicated Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX
Jun 21, 2016
740fb2c
Adjust spacing
Jun 21, 2016
aa6d35b
Move code block of probe to appropriate position
Jun 21, 2016
d583ea8
Standardize format description of Panel
Jun 21, 2016
14b661b
Enclose #error string by double-quotes
May 15, 2016
fac58f0
Cosmetic changes for language files
Jun 16, 2016
385945c
Cosmetic changes and small fix for thermistortables.h
Jun 20, 2016
67750d7
Merge pull request #4107 from thinkyhead/rc_fixup_M48_config
thinkyhead Jun 21, 2016
40cd20a
Fix comments on EXPERIMENTAL_I2CBUS
thinkyhead Jun 22, 2016
d8dcc4a
Merge pull request #4117 from thinkyhead/rc_i2c_comment_fix
thinkyhead Jun 22, 2016
c8186e9
Merge pull request #4109 from esenapaj/Enclose-#error-string-by-doubl…
thinkyhead Jun 22, 2016
cdc661e
Merge pull request #4110 from esenapaj/Small-cosmetic-changes-for-lan…
thinkyhead Jun 22, 2016
c84732e
Merge pull request #4111 from esenapaj/Cosmetic-changes-and-small-fix…
thinkyhead Jun 22, 2016
b0e4760
Merge pull request #4108 from esenapaj/Fix-for-PR-#4093
thinkyhead Jun 22, 2016
19fb04d
Update bq Hephestos 2 config
jbrazio Jun 20, 2016
111260f
Merge pull request #4118 from thinkyhead/bq_update_rebase
thinkyhead Jun 22, 2016
117db77
make motor_current_setting static and constexpr
thinkyhead Jun 22, 2016
528df1b
Travis test for MINIRAMBO and PWM_MOTOR_CURRENT
thinkyhead Jun 22, 2016
937123a
Merge pull request #4119 from thinkyhead/fix_stepper_compile_error
thinkyhead Jun 22, 2016
88dc543
Add a macro for XY_TRAVEL_FEEDRATE
thinkyhead Jun 22, 2016
2798499
XY_TRAVEL_SPEED => XY_PROBE_SPEED
thinkyhead Jun 22, 2016
d505395
Make XY_PROBE_SPEED a general probe option
thinkyhead Jun 22, 2016
bd99a2b
Add a Travis test of Z Safe Homing without ABL
thinkyhead Jun 22, 2016
f30df89
Merge pull request #4122 from thinkyhead/rc_xy_travel_feedrate
thinkyhead Jun 22, 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
  •  
  •  
  •  
114 changes: 105 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,116 @@
// Our automatic versioning scheme generates the following file
// NEVER put it in the repository
_Version.h
#
# Marlin 3D Printer Firmware
# Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

// All of the following OS, IDE and compiler generated file
// references should be moved from this file
// They are needed, but they belong in your global .gitignore
// rather than in a per-project file such as this
# Our automatic versioning scheme generates the following file
# NEVER put it in the repository
_Version.h

*.o
#
# OS
#
applet/
*.DS_Store


#
# Misc
#
*~
*.orig
*.rej
*.bak
*.DS_Store
*.idea
*.s
*.i
*.ii
*.swp


#
# C++
#
# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app


#
# C
#
# Object files
*.o
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo

# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib

# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex

# Debug files
*.dSYM/
*.su
Loading