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

497 commits

Author SHA1 Message Date
Scott Lahteine
642f6a92bc fix type of code_has_value 2015-04-13 18:02:17 -07:00
Scott Lahteine
17ad80c1e1 Spacing in XYZ_CONSTS 2015-04-13 17:58:47 -07:00
Scott Lahteine
09d60e0128 Naming and code comments 2015-04-13 17:17:36 -07:00
Mehmet Sutas
5a9e45cc4a Fix Syntax Error Filament Runout Statement 2015-04-13 22:37:18 +03:00
Scott Lahteine
ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine
ac2b23f574 Homing fixes 
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
 2015-04-11 20:06:48 -07:00
Scott Lahteine
5fe382949b Some G-Codes comment cleanup 2015-04-10 16:16:13 -07:00
Scott Lahteine
8b16ebe705 Break out prevent_dangerous_extrude feature 
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
 2015-04-09 22:40:37 -07:00
Scott Lahteine
9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING 
- Use `line_to_current` in place of `plan_buffer_line`
 2015-04-09 04:32:14 -07:00
Scott Lahteine
2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude 
Catch dangerous extrude before trying several
 2015-04-09 03:21:19 -07:00
Scott Lahteine
a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR 
Moved the definitions of the LCD_STR_* to Conditionals.h
 2015-04-09 01:56:23 -07:00
Scott Lahteine
1269c445ab Catch dangerous extrude before trying several 2015-04-09 01:40:48 -07:00
AnHardt
540dbb35e2 And an other MSG_BED in Marlin_main.cpp 2015-04-09 01:16:06 +02:00
AnHardt
14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed") 
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
 2015-04-08 23:59:01 +02:00
AnHardt
6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp 
and cleaned typo.
 2015-04-08 13:26:29 +02:00
Scott Lahteine
3162971cd6 current_position not static 2015-04-08 01:05:39 -07:00
Scott Lahteine
27cb90da8b IsStopped / IsRunning inline 2015-04-08 00:56:19 -07:00
Scott Lahteine
e03da4805b Merge pull request #1774 from epatel/Development 
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
 2015-04-07 19:24:46 -07:00
Scott Lahteine
f7c4e7e19f Fix G29 not deploying in some instances 2015-04-07 15:38:29 -07:00
Edward Patel
002340f32c Merge branch 'Development-Marlin' into Development 2015-04-07 22:49:12 +02:00
Scott Lahteine
c379f17117 Encapsulate setting of homing_bump_feedrate 2015-04-06 23:21:33 -07:00
Scott Lahteine
d20f42c883 Don't stow the probe until the last grid point! 
- Address Issue #1682 at hash #issuecomment-89756858
 2015-04-06 20:58:09 -07:00
Scott Lahteine
6d084c017f Fix typo in FWRETRACT handler 
Should be `retracting` and not `retract`
 2015-04-06 17:04:22 -07:00
Edward Patel
2f0081bbb5 Compile error fix! Fix for merge artifacts. 2015-04-05 04:16:16 +02:00
Edward Patel
ea10601406 Merge branch 'Development-Marlin' into Development 
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
 2015-04-05 04:06:02 +02:00
Scott Lahteine
61f8394361 Compare indices instead of floats for probe actions 2015-04-04 05:01:16 -07:00
Scott Lahteine
0935084141 Fix manage_inactivity 
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
 2015-04-03 23:42:50 -07:00
Scott Lahteine
c065da52ec Spacing and spelling 2015-04-03 22:54:48 -07:00
Scott Lahteine
8680b515b0 Fix missing tmp_extruder -> target_extruder 2015-04-03 22:12:49 -07:00
Scott Lahteine
c185912c19 Latest upstream commits, mostly 2015-04-03 21:58:48 -07:00
Scott Lahteine
1e5c18bb14 Add code_value_short and SERIAL_CHAR 2015-04-03 21:43:30 -07:00
Scott Lahteine
84e4edaea7 Add M48 comment for #1794 2015-04-03 19:52:00 -07:00
Scott Lahteine
b98ebd517e disable / enable_all_steppers functions 2015-04-03 19:25:22 -07:00
Scott Lahteine
713953d8c1 Upstream commits, allow no extruder in M105 2015-04-03 19:16:38 -07:00
Scott Lahteine
8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing 
Fix probe height at G28 start
 2015-04-03 19:03:00 -07:00
Scott Lahteine
dde7e11f8e Merge branch 'Development' into fixup_tr 
Latest upstream commits
 2015-04-03 18:56:52 -07:00
Scott Lahteine
abd7fc36b6 Fix probe height at G28 start 2015-04-03 18:54:55 -07:00
Scott Lahteine
610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing 
Finish pin tests
 2015-04-03 18:44:44 -07:00
Scott Lahteine
e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z 
fix feedrate for homing z
 2015-04-03 18:35:09 -07:00
Scott Lahteine
a469d796e1 Add cleanups needed for #1772 2015-04-03 18:14:57 -07:00
Scott Lahteine
c0ca26cd50 Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 18:05:17 -07:00
Scott Lahteine
5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup 
Z_PROBE_ENDSTOP
 2015-04-03 18:04:31 -07:00
Scott Lahteine
92119d0f7d Static delta[] for SCARA 2015-04-03 16:46:56 -07:00
Scott Lahteine
6b919e14c1 Group all universal variables 2015-04-03 15:45:41 -07:00
Scott Lahteine
21cd2e4fae Merge branch 'Development' into fixup_probing 
Latest upstream commits
 2015-04-03 15:32:15 -07:00
Scott Lahteine
0e8182bbf2 Additional pin tests, cleanup 2015-04-03 15:31:35 -07:00
Wurstnase
45565b680d second wrong feedrate 2015-04-03 18:01:28 +02:00
Wurstnase
581b2aae04 fix feedrate for homing z 
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
 2015-04-03 16:11:32 +02:00
AnHardt
23cd54755f Fix typo in Marlin_main.cpp 
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
 2015-04-02 14:50:31 +02:00
Scott Lahteine
e96df67630 Clarify thermal_runaway_protection 
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
 2015-04-02 05:10:14 -07:00