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

3431 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Scott Lahteine
c05b347617 Merge pull request #1902 from msutas/Development 
Fix Syntax Error Filament Runout Statement
 2015-04-13 14:31:57 -07:00
Mehmet Sutas
5a9e45cc4a Fix Syntax Error Filament Runout Statement 2015-04-13 22:37:18 +03:00
Scott Lahteine
0908c41156 Merge pull request #1899 from thinkyhead/squash_fixups 
Several fixups
 2015-04-12 23:31:31 -07:00
Scott Lahteine
257a907456 Fix typo in next_bed_check_ms 2015-04-12 23:17:28 -07:00
Scott Lahteine
e4b1e8651b next_ vars faster than previous_ 
- Change some `previous_` time vars to `next_` so an add only happens
at intervals
- Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
 2015-04-12 23:06:50 -07:00
Scott Lahteine
cfa60bdb97 Merge branch 'Development' into squash_fixups 
Conflicts:
	Marlin/ultralcd.cpp
 2015-04-12 22:51:18 -07:00
Scott Lahteine
ccddc280be Apply three more commits 2015-04-12 22:47:44 -07:00
Scott Lahteine
666f9cd7b4 Merge pull request #1897 from epatel/Development 
Manual bed leveling menu fixes.
 2015-04-12 21:26:36 -07:00
Scott Lahteine
e7aae314de Merge pull request #1896 from thinkyhead/cold_extrude 
Homing fixes
 2015-04-12 17:50:19 -07:00
Scott Lahteine
74e4b42f7e Default MACHINE_NAME to "3D Printer" 2015-04-12 17:17:41 -07:00
Scott Lahteine
8857b9e921 Use the extruder argument in plan_buffer_line 2015-04-12 16:57:00 -07:00
Edward Patel
a37c7ff16d Manual bed leveling menu fixes. 
lcdDrawUpdate = 2 helped a lot!
 2015-04-12 16:56:17 +02: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
b089eb42eb Merge pull request #1893 from thinkyhead/cold_extrude 
Fix doubled lcd_quick_feedback
 2015-04-11 04:57:00 -07:00
Scott Lahteine
055b11814a Additional cleanup of ultralcd.cpp 2015-04-11 04:56:08 -07:00
Scott Lahteine
388dd0cfa5 Fix doubled lcd_quick_feedback 
- MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
`feedback` flag when calling `lcd_goto_menu`.
 2015-04-11 04:45:04 -07:00
Scott Lahteine
f8b4ee079b Merge pull request #1891 from thinkyhead/cold_extrude 
machine name for hephestos too
 2015-04-11 01:37:07 -07:00
Scott Lahteine
c6bb98abad machine name for hephestos too 2015-04-11 01:36:24 -07:00
Scott Lahteine
79a5b14eb7 Merge pull request #1890 from thinkyhead/cold_extrude 
Apply CUSTOM_MACHINE_NAME to configs
 2015-04-11 00:04:46 -07:00
Scott Lahteine
ccbe2c4ea3 Apply CUSTOM_MACHINE_NAME to configurations 
- Replace “Mendel” with “RepRap”
 2015-04-10 21:29:42 -07:00
Scott Lahteine
71adb1ee59 Merge branch 'Development' into cold_extrude 
Latest upstream commits
 2015-04-10 21:13:50 -07:00
Scott Lahteine
f1a03c5447 Merge pull request #1887 from thinkyhead/cold_extrude 
Break out prevent_dangerous_extrude feature
 2015-04-10 16:16:52 -07:00
Scott Lahteine
5fe382949b Some G-Codes comment cleanup 2015-04-10 16:16:13 -07:00
Scott Lahteine
8f164f4c83 Clean up M85 in GCodes.md 2015-04-10 16:04:32 -07:00
Scott Lahteine
a327d876fe Document G92 arguments in GCodes.md 2015-04-10 16:02:00 -07:00
Scott Lahteine
652d59cd80 Spacing of g-codes in GCodes.md 2015-04-10 15:59:55 -07:00
Scott Lahteine
fe912f44dc Smaller headings 2015-04-10 15:58:32 -07:00
Scott Lahteine
93eb63238f Move G Codes into categories with M Codes 2015-04-10 15:57:54 -07:00
Scott Lahteine
a3b13eb5ac Organize M Codes by Category 
- In GCodes.md
 2015-04-10 15:54:36 -07:00
Scott Lahteine
3105ebc562 Restore M928, M999 2015-04-10 15:05:00 -07:00
Scott Lahteine
01654bdec1 Cleanup formatting of some M codes 2015-04-10 15:03:41 -07:00
Scott Lahteine
907e8e98e5 Add GCodes from Marlin 1.0.3 dev, format as pre 2015-04-10 14:55:21 -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
67c0e8323e Merge pull request #1879 from thinkyhead/cold_extrude 
Fix moves for DELTA for MANUAL_BED_LEVELING
 2015-04-09 22:06:06 -07:00
Scott Lahteine
740152ee70 Merge branch 'Development' into cold_extrude 
Latest upstream commits
 2015-04-09 20:23:47 -07:00
Scott Lahteine
5914d9d7de Shuffling declarations.. 2015-04-09 20:21:30 -07:00
Scott Lahteine
b328c6e6b6 Shuffling declarations. 2015-04-09 20:05:10 -07:00
Scott Lahteine
fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis 2015-04-09 19:33:16 -07:00
Richard Miles
4c3736ed43 Feature: Add RAMPS CNC Controller Board 
Created a new board to make using RAMPS as a CNC machine controller
easier. It maps pin 8 to the spindle and pin 9 to the controller fan.
 2015-04-09 16:32:56 +01: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
AnHardt
56fc3a4835 bgr -> bg 
+ update in documentation
 2015-04-09 13:09:18 +02:00
Scott Lahteine
7a1aef1450 Merge pull request #1877 from AnHardt/display-only 
Made encoderPosition and quick_feedback dependant on NEWPANEL
 2015-04-09 03:54:05 -07:00
Scott Lahteine
6096164d79 Merge pull request #1878 from thinkyhead/cold_extrude 
Cold extrude
 2015-04-09 03:41:54 -07:00
Scott Lahteine
a488445cbe Fix spelling of "too" 2015-04-09 03:41:31 -07:00
Scott Lahteine
b1950a7f25 Merge pull request #1875 from Natealus/Development 
Z Probe inverting not present in example configs, causes error
 2015-04-09 03:37:24 -07:00
AnHardt
df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL 
where the hardware is available.
Fix for #1873
 2015-04-09 12:26:45 +02:00
Scott Lahteine
dcde09fdff Merge remote-tracking branch 'upstream/Development' into Development 
Latest upstream commits
 2015-04-09 03:21:36 -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