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

2296 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
3d6deb9bdf Simplify manage_heater 
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
 2015-03-13 19:49:41 -07:00
alexborro
2f3c77b751 Fix decimal places in G29 Bed Equation Coeficients 2015-03-13 14:39:41 -03:00
Scott Lahteine
196db5720e Merge pull request #1598 from thinkyhead/temp_errors 
Fix missing temp_error declarations
 2015-03-11 22:18:49 -07:00
Scott Lahteine
e3ca9137b5 Fix missing temp_error declarations 
- Fix for #1591 replacing #1595
 2015-03-11 16:38:42 -07:00
Scott Lahteine
e4d77a6313 Merge pull request #1554 from 2PrintBeta/Development 
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
 2015-03-11 15:31:57 -07:00
alexborro
c0b6075f77 Fix max acceleration limits in planner 
The max acceleration limiting was in wrong place.
 2015-03-11 15:08:11 -03:00
Bo Herrmannsen
c7067edddf initial empty change log 2015-03-11 18:56:46 +01:00
alexborro
9157cbd8f3 Add Travel Acceleration and change the M204 options 
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).

It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves

I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
 2015-03-11 13:19:02 -03:00
alexborro
888cf161bd fix travel speed option for G29 
I forgot to enclousure the variable with #ifdef
 2015-03-11 10:03:32 -03:00
alexborro
af63b54562 Add travel speed option to G29 command line 2015-03-11 09:51:56 -03:00
Bo Herrmannsen
749e5b9b84 updated milestone link 2015-03-11 10:30:03 +01:00
Bo Herrmannsen
33fe89f539 removed irc archive link 
removed the link as the software i had did not work, nor does anyone hardly use irc chat but just hang out there
 2015-03-11 10:24:56 +01:00
alexborro
5bf42066fa Fix typo in configuration.h 2015-03-10 15:06:34 -03:00
alexborro
8a4b62d081 Set more regular setup in configuration.h 2015-03-10 14:41:21 -03:00
alexborro
60ceca1bc1 Add speed configuration for home-bumping movement 2015-03-10 14:08:32 -03:00
domonoky
d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development 
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
 2015-03-10 10:46:37 +01:00
Scott Lahteine
c321c97f35 Merge pull request #1584 from galexander1/stringcleanup 
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
 2015-03-10 01:48:30 -07:00
Scott Lahteine
0eae9c24bc Merge pull request #1582 from galexander1/deltaconftypo 
fix typo in delta example config introduced in commit 697ee2d
 2015-03-08 21:13:14 -07:00
Scott Lahteine
624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan 
Fix controller fan
 2015-03-08 20:36:38 -07:00
Greg Alexander
b9dfa5cad4 use code_value_long() instead of (int)code_value() 2015-03-07 17:33:15 -05:00
Greg Alexander
901b03d020 use strtol() instead of strtod() when an integer value is desired 2015-03-07 17:24:26 -05:00
Greg Alexander
4fba7b084f fix typo in delta example config introduced in 
commit 697ee2dc50
 2015-03-07 16:43:41 -05:00
Wurstnase
a5342c942e Update Marlin_main.cpp 2015-03-07 16:47:53 +01:00
Scott Lahteine
9dccd3a94f Merge pull request #1579 from thinkyhead/fix_abl_issues 
More sanity-checking for ABL
 2015-03-06 22:50:03 -08:00
Scott Lahteine
d085725c86 More sanity-checking for ABL 
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
 2015-03-06 22:14:34 -08:00
Scott Lahteine
ca4b36deda Merge pull request #1578 from thinkyhead/require_lcd_style 
Make sure a ROM is selected for ULTRA_LCD
 2015-03-06 15:38:24 -08:00
Scott Lahteine
9eed8c8cf0 Make sure a ROM is selected for ULTRA_LCD 2015-03-06 15:37:54 -08:00
Scott Lahteine
254970c92a Merge pull request #1570 from C-o-r-E/escape_fix 
Fixes gCode handling of comments and escaped characters
 2015-03-06 15:09:35 -08:00
Scott Lahteine
d3660d22ae Merge pull request #1577 from thinkyhead/fix_gcode_g29 
Fix compile error in gcode_G29
 2015-03-06 14:55:05 -08:00
Scott Lahteine
25dc79f124 Remove M48 credits also 2015-03-06 14:54:30 -08:00
Scott Lahteine
34e51f576f Fix compile error in gcode_G29 
- A redo of #1576, which missed topo_flag
- Always set verbose_level
 2015-03-06 14:52:05 -08:00
Scott Lahteine
bbeb1117d4 Merge pull request #1572 from Wackerbarth/Issue1572 
Minor typos in the README
 2015-03-06 10:10:40 -08:00
Scott Lahteine
344a12bd10 Merge pull request #1571 from AnHardt/Undubble 
Undubble MSG_MIN & MSG MAX
 2015-03-06 10:08:19 -08:00
Wurstnase
62bd734612 fix controllerFan() for inverted enable pins 
add ```^ !(n_ENABLE_ON)``` for each stepper
 2015-03-06 12:01:17 +01:00
Richard Wackerbarth
fd9beb1672 Minor typos in the README 2015-03-05 22:03:21 -06:00
AnHardt
3024f6c706 Undubble MSG_MIN &MSG MAX 2015-03-06 00:25:44 +01:00
Corey C
ba27f90e36 Merge pull request #1 from foosel/C-o-r-E-escape_fix 
In-line comments and escaping fixed by foosel
 2015-03-05 17:50:41 -05:00
Gina Häußge
63b62d8d4e Fixed in-line comments and escaping 
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
 2015-03-05 23:30:34 +01:00
C-o-r-E
99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 2015-03-05 15:22:37 -05:00
Wurstnase
92ebb7f4c8 Merge pull request #1 from MarlinFirmware/Development 
dev pull
 2015-03-05 17:51:33 +01:00
Scott Lahteine
273d00353f Merge pull request #1565 from thinkyhead/gcode_handler_functions 
Gcode handlers to inline functions
 2015-03-05 04:55:46 -08:00
Scott Lahteine
cdc38aa783 Move gcode handlers into inline functions 2015-03-05 04:27:24 -08:00
Scott Lahteine
94fd8c7555 Merge pull request #1556 from thinkyhead/enhanced_g29 
Enhanced G29
 2015-03-05 03:54:53 -08:00
Scott Lahteine
6d9e9a6bef Merge branch 'Development' into enhanced_g29 
Latest upstream changes
 2015-03-05 02:49:18 -08:00
Scott Lahteine
4db2179f5c Include 4th extruder support 2015-03-05 02:37:36 -08:00
Scott Lahteine
0e074d4050 Merge pull request #1561 from OhmEye/Development 
Fix autoretract
 2015-03-05 02:14:34 -08:00
OhmEye
f90a947e65 Fix autoretract 
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
 2015-03-04 20:28:08 -10:00
Scott Lahteine
2ef6b3d57a Fix wrong defines, broken syntax 2015-03-04 22:24:44 -08:00
OhmEye
f3f04e9fd6 Merge pull request #1 from MarlinFirmware/Development 
Sync with upstream
 2015-03-04 20:23:10 -10:00
Scott Lahteine
08b722b635 Merge pull request #1555 from C-o-r-E/solenoids 
Add support for solenoid articulated extruders
 2015-03-04 21:36:29 -08:00