CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,299 Commits 1 Branch 0 Tags 107 MiB
ffe054c129
Commit Graph

4299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
2e6f57baa9 More active authors 2015-05-14 04:40:07 -07:00
Scott Lahteine
0f6cd3640b Drop extraneous ok_to_send 2015-05-14 04:38:09 -07:00
Scott Lahteine
0ce355d9e7 Use MSG_OK in M105 2015-05-14 03:33:38 -07:00
Scott Lahteine
a366e57385 Merge pull request #2075 from thinkyhead/mendel_inverting 
Use Mendel default for INVERT_Y_DIR
 2015-05-14 03:29:24 -07:00
Scott Lahteine
7b3acfbb6f Merge pull request #2072 from thinkyhead/better_arc_code 
Consolidate arc code, remove motion_control.*
 2015-05-14 00:27:22 -07:00
Scott Lahteine
78beef2d73 Use Mendel default for INVERT_Y_DIR 2015-05-14 00:25:47 -07:00
Scott Lahteine
1a4a09c26f Display unknown XYZ on the LCD as "---" 
- Also show 2 digits past decimal for Z on DOGM
 2015-05-13 22:45:58 -07:00
Scott Lahteine
68ce419147 Note on segment size 2015-05-13 19:11:36 -07:00
Scott Lahteine
8b92249f18 Bring arc_offset into auto scope 2015-05-13 19:00:46 -07:00
Scott Lahteine
80807b2d71 Consolidate arc code, remove motion_control.* 2015-05-13 18:52:41 -07:00
Scott Lahteine
56126786a6 Merge pull request #2069 from thinkyhead/sd_alpha_sort 
Formatting tweaks
 2015-05-13 02:04:24 -07:00
Scott Lahteine
f65833931d Formatting tweaks 2015-05-13 02:02:19 -07:00
Scott Lahteine
56090fc374 Merge pull request #2067 from thinkyhead/thermal_unified 
Fix heating error message
 2015-05-12 19:06:16 -07:00
Scott Lahteine
fcfd99c1ae Add comments to lcd_control_temperature_menu 2015-05-12 18:46:16 -07:00
Scott Lahteine
d693e0f378 Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit 2015-05-12 18:30:38 -07:00
Scott Lahteine
6697a8f375 Watch the heater a little longer 2015-05-12 18:22:47 -07:00
Scott Lahteine
5693a6e3c9 Fix heating error message 2015-05-12 18:17:13 -07:00
Scott Lahteine
747fd5801c Merge pull request #2055 from thinkyhead/thermal_unified 
Combine thermal runaway and watch-period
 2015-05-12 08:04:29 -07:00
Scott Lahteine
6e5572228d Merge pull request #2064 from thinkyhead/wait_before_g28 
Split up prepare_move by type
 2015-05-12 07:53:11 -07:00
Scott Lahteine
27ad381e25 Allow fractional seconds in G4 and M0 2015-05-12 07:52:08 -07:00
Scott Lahteine
5146694452 Merge pull request #1884 from shaggythesheep/feature_new_board_ramps_cnc_controller 
Feature: Add RAMPS CNC Controller Board
 2015-05-12 04:31:49 -07:00
Scott Lahteine
b2bd9aae7c SCARA_SEGMENTS_PER_SECOND 2015-05-12 04:18:15 -07:00
Scott Lahteine
bd20bd5444 Merge pull request #2063 from chris-bo/autobed_sled 
improve sled handling
 2015-05-12 03:29:21 -07:00
Scott Lahteine
9e95ceb3fc Split up prepare_move by type 
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
 2015-05-12 02:08:20 -07:00
Scott Lahteine
9ba8cf5fe3 Merge pull request #2061 from thinkyhead/wait_before_g28 
Always do st_synchronize() before G28
 2015-05-12 02:05:30 -07:00
Scott Lahteine
873f7d6f2a Check that configs are up-to-date 2015-05-12 01:33:51 -07:00
Christian Bohn
f48599f172 add pin definition to some motherboards 2015-05-12 10:02:23 +02:00
Scott Lahteine
b5200e184c Remove extra setup_for_endstop_move 2015-05-12 01:01:53 -07:00
Scott Lahteine
8d814de558 Return void in prevent_dangerous_extrude 2015-05-12 00:55:00 -07:00
Scott Lahteine
367e2eb9f4 Global setup_for_endstop_move 2015-05-12 00:51:22 -07:00
Wurstnase
fd873c00c6 Merge pull request #2062 from Wurstnase/z_probe_bit_fix 
add missing endstop-bits
(Travis don't see that part of code)
 2015-05-12 09:47:52 +02:00
Wurstnase
1d5677cc3b add missing Z-bits 2015-05-12 09:36:19 +02:00
Wurstnase
df12e68e7d add missing Z_PROBE-bit 2015-05-12 09:33:24 +02:00
Scott Lahteine
fa951f8a0b Always do st_synchronize() before G28 2015-05-12 00:31:51 -07:00
Christian Bohn
27a3b1d895 disable sled pin by default 2015-05-12 08:51:01 +02:00
Christian Bohn
fb44b53ae3 sled improvements 
- create sled pin definition
- G28 Works with sled
 2015-05-11 23:22:19 +02:00
Wurstnase
46d1932380 add plan buffer remaining for 'P' and block buffer remaining 'B' 2015-05-11 13:04:00 +02:00
Scott Lahteine
429c6ccad2 Neaten config formatting 2015-05-10 23:27:00 -07:00
Scott Lahteine
8a0dc4d54a Merge pull request #1922 from Wurstnase/serial_wait 
Serial wait
 2015-05-10 23:10:25 -07:00
Scott Lahteine
8332a15899 Fix testing of runaway options in temperature.cpp 2015-05-10 23:03:24 -07:00
Wurstnase
526ad82d20 activate advanced_ok and no_timeout 2015-05-11 08:01:51 +02:00
Scott Lahteine
2b92b01afc Fix typo in SanityCheck.h 2015-05-10 22:58:37 -07:00
Scott Lahteine
2445ae3d3a Combine thermal runaway and watch-period 
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
 2015-05-10 22:52:01 -07:00
Scott Lahteine
4097207c75 Merge pull request #2041 from thinkyhead/watch_temp 
More thermal protection
 2015-05-10 21:39:05 -07:00
Scott Lahteine
45d64040fe Merge pull request #2048 from Wurstnase/hit_bits 
replace some bools
 2015-05-10 20:37:17 -07:00
Scott Lahteine
9b3d4380d3 Only watch the heater that was set 2015-05-10 20:26:45 -07:00
Scott Lahteine
52c0696e44 Merge pull request #2044 from thinkyhead/fix_servos_too 
Make some z probe and servo code tweaks
 2015-05-10 20:10:42 -07:00
Scott Lahteine
58781cb88c Merge pull request #2045 from delagela/upstream 
Correction traductions
 2015-05-10 17:58:00 -07:00
Wurstnase
b55f32f8a1 replace some bools 
this PR replaces some bools with one char. this will safe 3 bytes and should also be sometimes a little bit faster.
 2015-05-10 21:37:39 +02:00
Laurent DELAGE
e70e6e2b48 Correction traductions 2015-05-10 15:38:50 +02:00