SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9431 commits 1 branch 0 tags 118 MiB
Commit graph

9431 commits

This branch
This branch
All branches
Author SHA1 Message Date
AnHardt
6ef26a85d8 Back to the differences method in run_z_probe() 2016-07-21 18:16:38 +02:00
Scott Lahteine
4226f56f53 Revert the planner acceleration logic somewhat 2016-07-20 19:19:47 -07:00
Scott Lahteine
16e5348659 Merge pull request #4360 from thinkyhead/rc_toolchange_for_G28 
Always switch to tool 0 for G28
 2016-07-20 19:07:35 -07:00
Scott Lahteine
209f5c03d0 Fewer temporary vars in planner accel limit 2016-07-20 18:29:29 -07:00
Scott Lahteine
62ecd107ba Patch ultralcd_impl header conditional names 2016-07-20 09:36:55 -07:00
Scott Lahteine
d2e9a9c188 Always switch to tool 0 for G28 2016-07-20 09:36:55 -07:00
Scott Lahteine
194d9521c3 Merge pull request #4356 from thinkyhead/rc_simpler_run_z_probe 
Unify run_z_probe
 2016-07-19 19:02:39 -07:00
Scott Lahteine
4a6ed5e221 Use HOMING_FEEDRATE_Z for Z_PROBE_SPEED_FAST 2016-07-19 18:42:48 -07:00
AnHardt
09a3cc33e6 Unify run_z_probe 
Unify run_z_probe
Add double touch for DELTAs.
Introduce Z_PROBE_SPEED_FAST and Z_PROBE_SPEED_SLOW
  defaulting to homing_feedrate_mm_m[Z_AXIS] and homing_feedrate_mm_m[Z_AXIS]/2
 2016-07-19 18:42:48 -07:00
Scott Lahteine
6137a1d934 Merge pull request #4359 from thinkyhead/rc_wrangle_movement_etc 
Use ENABLED(MAPPER_NON)
 2016-07-19 18:22:55 -07:00
Scott Lahteine
792fff5771 Merge pull request #4358 from thinkyhead/rc_individual_homing_rates 
Set homing feedrates individually
 2016-07-19 18:20:30 -07:00
Scott Lahteine
0432613ad7 use enabled macro for mapper setting 2016-07-19 18:08:56 -07:00
Scott Lahteine
e44b37cdc2 motion section marker below homing speeds 2016-07-19 17:31:58 -07:00
Scott Lahteine
204fd6ec44 Set homing feedrates individually 2016-07-19 17:31:58 -07:00
Scott Lahteine
e6e4d4062d Merge pull request #4357 from thinkyhead/rc_fix_keypad_issues 
Fix some Reprapworld Keypad issues
 2016-07-19 17:31:37 -07:00
Scott Lahteine
2bad02e60d Reprapworld Keypad: F1 opens the Move Axis menu 2016-07-19 16:40:39 -07:00
Scott Lahteine
eaa6f568ee Prevent re-entrant call of Reprapworld Keypad handler 2016-07-19 16:40:39 -07:00
Scott Lahteine
6abf916575 Reprapworld Keypad move step is 1mm 2016-07-19 16:40:39 -07:00
Scott Lahteine
06ac1f3bcf Reduce Reprapworld Keypad move code size 2016-07-19 16:40:39 -07:00
Scott Lahteine
5d5affdfca Merge pull request #4355 from thinkyhead/rc_rename_ultralcd_files 
Rename ultralcd implementation files for consistency
 2016-07-19 16:14:27 -07:00
Scott Lahteine
bb225dedc6 Merge pull request #4354 from thinkyhead/rc_jbrazio_rework_g12 
NOZZLE_CLEAN_FEATURE with no dependency on HAS_BED_PROBE
 2016-07-19 15:26:59 -07:00
Scott Lahteine
8a2efd1155 Rename ultralcd implementation files for consistency 2016-07-19 15:26:14 -07:00
João Brázio
0149fc189a Update travis config so NOZZLE_CLEAN_FEATURE no longer depends on AUTO_BED_LEVELING_FEATURE 2016-07-19 15:07:03 -07:00
João Brázio
b869fbc05e Update all config files with the new G12 options 2016-07-19 15:07:03 -07:00
João Brázio
47fef80848 Nozzle::clean() no longer requires HAS_BED_PROBE 2016-07-19 15:07:02 -07:00
Scott Lahteine
f1f1bac0e1 Merge pull request #4341 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-07-19 15:04:22 -07:00
João Brázio
5cdd6f02ec Update travis config not to send email notifications 2016-07-19 13:44:24 -07:00
Scott Lahteine
6c899bb520 Merge pull request #4349 from jbrazio/gcc-bark-bark 
Removes some minor GCC warnings
 2016-07-19 13:42:33 -07:00
Scott Lahteine
ef0a22871e Merge pull request #4350 from jbrazio/followup-a875861 
Adds utility.h
 2016-07-19 13:40:52 -07:00
Scott Lahteine
9eba58a031 Merge pull request #4351 from jbrazio/u8glib-converter 
Updates u8glib's bmp2hex converter
 2016-07-19 13:39:33 -07:00
Scott Lahteine
c502018eab Merge pull request #4353 from jbrazio/global-enum-file 
General cleanup: enum
 2016-07-19 13:37:56 -07:00
Scott Lahteine
0f9953b031 Merge pull request #4342 from AnHardt/rep-cons-g28 
Introduce line_to_axis_pos() for use in homeaxis()
 2016-07-19 12:56:58 -07:00
Scott Lahteine
d76389b4d1 Merge pull request #4340 from esenapaj/Follow-up-the-PR-#4335 
Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins)
 2016-07-19 12:43:50 -07:00
AnHardt
11c075c6b2 Introduce line_to_axis_pos(axis_codes axis, float where, float feed_rate = 0.0) 
and use it in `homeaxis()` instead of `do_blocking_move_to_axis_pos()`.
`do_blocking_move_to_axis_pos` was wrong because it performed subdivided, delta-corrected moves for x- and y-axis.

The first common move for delta homing is like quick_home but for 3 towers.

Fix two warnings.
 2016-07-19 17:24:44 +02:00
João Brázio
3ebad4e020 Moves all global enums to a central file 2016-07-19 14:31:09 +01:00
João Brázio
238fefcb00 Updates Stopwatch class to use internal state enum 2016-07-19 14:30:44 +01:00
João Brázio
30ac0782a9 Comment section style correction 2016-07-19 03:27:42 +01:00
João Brázio
8ecee431c4 Updates u8glib's bmp2hex converter 2016-07-19 03:16:30 +01:00
João Brázio
79e7721b76 Removes some minor GCC warnings 2016-07-19 03:03:11 +01:00
João Brázio
f4d63796b2 Adds utility.h 2016-07-19 02:55:23 +01:00
esenapaj
361307831e Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins) 
・Solve a flickering when SD card is inserted or removed at using a ASCII
LCD + language_kana.h
 2016-07-18 20:09:24 +09:00
esenapaj
ff48bbb86a Update Japanese translation 
・Add new translation
 2016-07-18 17:01:56 +09:00
Scott Lahteine
46117593b9 Merge pull request #4185 from esenapaj/Update-Japanese-translation 
Update Japanese translation (work in progress)
 2016-07-17 18:36:34 -07:00
Scott Lahteine
3422103863 Merge pull request #4310 from thinkyhead/rc_mbl_position_shift 
Fix position shift with MBL
 2016-07-17 18:31:25 -07:00
Scott Lahteine
92757bd7b3 Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163 
Follow-up the PR #4163 (Mixing and Switching Extruders)
 2016-07-17 18:15:23 -07:00
Scott Lahteine
cbf9fa7995 Merge pull request #4338 from thinkyhead/rc_anhardt_58 
Use blocking_move, current_position in G28 homing
 2016-07-17 18:12:40 -07:00
Scott Lahteine
493d30cd97 Drop intermediate nx, ny, and set destination directly 2016-07-17 17:59:52 -07:00
Scott Lahteine
07a735ad22 We always use destination so modify mesh_buffer_line 2016-07-17 17:57:33 -07:00
Scott Lahteine
04a5b7b257 A macro to normalize positions 2016-07-17 17:57:32 -07:00
esenapaj
5c8e87a866 Follow-up the PR #4163 (Mixing and Switching Extruders) 
・Update forgotten K8400 files
 2016-07-18 09:48:13 +09:00