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

6074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
93ea281061 Split up Conditionals.h into two files 
Rather than include twice, which is tricky but may confuse
 2016-07-25 20:30:45 -07:00
Scott Lahteine
8684570f68 Merge pull request #4412 from thinkyhead/rc_followup_4402 
Followup #4402 fixing 3-point leveling
 2016-07-25 16:10:50 -07:00
Scott Lahteine
c55b7d0750 Merge pull request #4405 from thinkyhead/rc_theres_always_something 
Move HAS_DIGIPOTSS to Conditionals.h
 2016-07-25 15:58:42 -07:00
Scott Lahteine
42eebcd518 Merge pull request #4409 from thinkyhead/rc_cleanup_comment 
Clean up Transfer Buffer Size comment
 2016-07-25 15:58:34 -07:00
Scott Lahteine
5272147f7c Followup #4402 fixing 3-point leveling 2016-07-25 15:56:34 -07:00
Scott Lahteine
fcc39e2b5f Clean up Transfer Buffer Size comment 2016-07-25 12:54:55 -07:00
Scott Lahteine
7e37c20839 Merge pull request #4408 from thinkyhead/rc_reprapworld_lcd 
Add support for reprapworld LCD
 2016-07-25 12:37:58 -07:00
Scott Lahteine
0c0a63322b Patches to prepare REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
brupje
a60a668f6b Support for REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
Scott Lahteine
4f2ff46ab9 Move HAS_DIGIPOTSS to conditionals 2016-07-25 00:10:46 -07:00
Scott Lahteine
54f4f80077 Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection 
Arrange stepper_indirection by axis
 2016-07-24 19:26:39 -07:00
Scott Lahteine
169c21b477 Merge pull request #4402 from thinkyhead/rc_consistent_positioning 
Account for coordinate space offsets
 2016-07-24 19:23:20 -07:00
Scott Lahteine
750a1e5116 Arrange stepper_indirection by axis 2016-07-24 19:00:51 -07:00
Scott Lahteine
7c27f34996 Merge pull request #4397 from thinkyhead/rc_tweak_eeprom 
Neaten up EEPROM read/write functions
 2016-07-24 18:45:54 -07:00
Scott Lahteine
2595a40a61 Account for coordinate space more in G28 / G29 / M48 2016-07-24 18:34:05 -07:00
Scott Lahteine
060dc6d95a Neaten up EEPROM read/write functions 2016-07-24 18:19:39 -07:00
Scott Lahteine
b7b7c90477 Merge pull request #4389 from thinkyhead/rc_optimize_planner 
Optimize planner with precalculation, etc.
 2016-07-24 17:48:23 -07:00
Scott Lahteine
6900bb2286 Merge pull request #4395 from tnw513/italian_fix 
Update Italian translations. Remove trailing spaces.
 2016-07-24 17:47:48 -07:00
Scott Lahteine
e4816293a8 serial_echopair_P for uint16_t 2016-07-24 17:46:37 -07:00
Scott Lahteine
d8e5af6834 Use RAW_POSITION for MBL in planner.set_position_mm 2016-07-24 17:20:36 -07:00
Scott Lahteine
b183442c61 Fix inactive_extruder_x_pos for coordinate space 2016-07-24 17:20:36 -07:00
Scott Lahteine
f75b0c2ee1 Make POSITION macros global 2016-07-24 17:20:36 -07:00
Scott Lahteine
101b60ef42 Tweak Dual X Carriage data spacing 2016-07-24 17:20:35 -07:00
Scott Lahteine
1fe60b723f Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor 
Sanity check for too many temp sensors
 2016-07-24 15:38:41 -07:00
Scott Lahteine
bedda3be61 Patch generic delta error caught by sanity check 2016-07-24 15:24:40 -07:00
Scott Lahteine
a5212bf277 Sanity check for too many temp sensors 2016-07-24 13:47:27 -07:00
Scott Lahteine
d8f2876753 Replace some float division with multiplication 2016-07-24 13:27:50 -07:00
Scott Lahteine
ddde785b37 Code formatting in planner.cpp 2016-07-24 13:27:50 -07:00
Scott Lahteine
f8b5749235 Replace division in planner with multiplication 2016-07-24 13:27:49 -07:00
Scott Lahteine
b921f6b69d Optimize calculation of block->millimeters for DELTA 2016-07-24 13:27:49 -07:00
Scott Lahteine
db5df9500b Move sync_plan_position closer to the top 2016-07-24 13:27:49 -07:00
Scott Lahteine
2839c56f5a Merge pull request #4390 from jbrazio/duration_t 
Renamed timestamp_t to duration_t
 2016-07-24 13:24:05 -07:00
Scott Lahteine
450fe8134d Merge pull request #4398 from thinkyhead/rc_z_safe_sanity 
Sanity checks for Z_SAFE_HOMING
 2016-07-24 12:21:10 -07:00
Scott Lahteine
d6c50671d3 Sanitycheck: Z_SAFE_HOMING points are reachable 2016-07-24 10:54:47 -07:00
Scott Lahteine
a6203366b6 Sanitycheck: Z_SAFE_HOMING requires a probe 2016-07-24 10:54:25 -07:00
Scott Lahteine
bbe5b80492 Always define probe limits if there is a probe 2016-07-24 10:53:58 -07:00
Silvio Didonna
950397f2a0 Added missing translations. Removed trailing spaces for consistency (#4376) 2016-07-24 17:22:30 +02:00
João Brázio
50fb0f7cec M31 serial output is now always in EN 2016-07-24 15:52:03 +01:00
João Brázio
62d96d72f3 Renamed timestamp_t to duration_t 2016-07-24 03:16:02 +01:00
Scott Lahteine
3e2b3353b0 Fix axis indices for COREYZ 2016-07-23 19:02:14 -07:00
Scott Lahteine
c287846f46 Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370 
Update Z in a unified way in run_z_probe
 2016-07-23 16:47:10 -07:00
Scott Lahteine
22d0654fe6 Merge pull request #4382 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-07-23 16:31:38 -07:00
Scott Lahteine
bb93b6822a Use set_current_from_steppers_for_axis 2016-07-23 15:25:54 -07:00
AnHardt
96a162beda Use implications from #4370 in run_z_probe() 
See also https://github.com/MarlinFirmware/Marlin/pull/4370#issuecomment-234713680
 2016-07-23 13:09:28 -07:00
Scott Lahteine
4e67a85a5d Macros to loop over axes 2016-07-23 13:09:28 -07:00
Scott Lahteine
a3b5d5eb65 Merge pull request #4383 from esenapaj/Follow-up-the-PR-#4353 
Follow-up the PR #4353 (General cleanup: enum)
 2016-07-23 12:17:45 -07:00
esenapaj
784be56e99 Follow-up the PR #4353 (General cleanup: enum) 
・Update description of M111
 2016-07-24 00:53:35 +09:00
esenapaj
3c11977558 Update Japanese translation 
・Add translation
・Change translation
・Remove translation
 2016-07-23 22:07:20 +09:00
Scott Lahteine
5167cb424a Merge pull request #4381 from thinkyhead/rc_blocking_move_logging 
Banish do_blocking_move_to_axis_pos
 2016-07-23 01:33:17 -07:00
Scott Lahteine
08459a003f Undo the self-sabotage that is do_blocking_move_to_axis_pos 2016-07-23 00:59:11 -07:00