AnHardt
120d4c7a8c
Merge remote-tracking branch 'origin/kill2' into _temp_error
2015-05-20 21:25:32 +02:00
AnHardt
cb6e82dc60
Change from kill() to kill(const char *)
...
in temperature.cpp
2015-05-20 21:22:48 +02:00
AnHardt
9d13942278
Use new kill() with parameter.
2015-05-20 21:18:52 +02:00
AnHardt
6398c5e28d
Merge remote-tracking branch 'origin/kill2' into _temp_error
2015-05-20 21:08:19 +02:00
AnHardt
f4a93ed997
Add a string parameter to kill()
...
Makes the output on the LCD adjustable.
2015-05-20 20:53:48 +02:00
AnHardt
2990c6c45f
Use new kill_() for _temp_error()
...
instead of stop(). We really want to require a reset and no chance to set a new temperature.
2015-05-20 14:03:14 +02:00
AnHardt
70163dafb9
Use _temp_error() for all errors thrown by different mechanisms
...
Now ending in an endless loop.
Tidy up the output format.
We now get:
ERRORTEXT ", system stopped! Heater_ID: " HEATERID
Where ERRORTEXT can be:
"Heating failed"
"Thermal Runaway"
"MAXTEMP triggered"
"MINTEMP triggered"
and soon
"Thermal Jump"
HEATERID can be
0, 1, 2 ,3 , "bed"
This messages are always followed by the common:
"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
2015-05-18 20:26:25 +02:00
Scott Lahteine
7ff18f6657
Merge pull request #2107 from thinkyhead/fix_issue_2106
...
Have G92 set the nozzle position on Delta and SCARA
2015-05-17 17:39:09 -07:00
Scott Lahteine
3feaef6526
Have G92 set the nozzle position on Delta and SCARA
2015-05-17 17:08:05 -07:00
Scott Lahteine
c5feb9c6a1
Merge pull request #2103 from Wurstnase/rework_out_bits
...
rework out_bits
2015-05-17 07:07:21 -07:00
wurstnase
21ff773832
rework out_bits
2015-05-17 14:33:09 +02:00
Scott Lahteine
6c27eaf864
Merge pull request #2101 from thinkyhead/code_style
...
Code style and a dangling "else"
2015-05-17 03:39:08 -07:00
Scott Lahteine
80d2c11f9d
Merge pull request #2099 from thinkyhead/gcode_rename
...
Rename gCode to codenum as a consistency
2015-05-17 03:09:46 -07:00
Scott Lahteine
d580a0d186
Use "+=" in plane rotation
2015-05-17 01:51:14 -07:00
Scott Lahteine
2f3a410cb0
Fix a potential hanging "else" bug
2015-05-17 01:50:30 -07:00
Scott Lahteine
b83e3f0905
Combine "Bed X: " strings
2015-05-17 01:49:52 -07:00
Scott Lahteine
7dfb8becdb
Adjust some names and types in Marlin_main.cpp
2015-05-17 01:48:51 -07:00
Scott Lahteine
c966aa26ff
Comments in Marlin_main.cpp
2015-05-17 01:47:53 -07:00
Scott Lahteine
c54a2ea042
Adjust spacing in Marlin_main.cpp and stepper.*
2015-05-17 01:47:02 -07:00
Scott Lahteine
072625ccad
Update headings in Marlin_main.cpp and stepper.cpp
2015-05-17 01:44:53 -07:00
Scott Lahteine
16032f149f
Rename to codenum as a consistency
2015-05-16 23:17:35 -07:00
Scott Lahteine
273a4a253f
Merge pull request #2096 from thinkyhead/cherry_picking3
...
Hide M117 with no LCD
2015-05-16 21:10:28 -07:00
Scott Lahteine
64825a3d1e
Merge pull request #2095 from thinkyhead/cherry_picking2
...
Add gcode_line_error to reduce code size
2015-05-16 21:09:15 -07:00
Scott Lahteine
ea3df2b0b3
Merge pull request #2094 from thinkyhead/cherry_picking
...
Rename process_commands to process_next_command
2015-05-16 21:08:59 -07:00
Scott Lahteine
ca79282eaf
Hide M117 with no LCD
2015-05-16 20:59:04 -07:00
Scott Lahteine
ce218cafdb
Add gcode_line_error to reduce code size
2015-05-16 20:54:58 -07:00
Scott Lahteine
46d59784ad
Rename preocess_command to process_next_command
2015-05-16 20:47:40 -07:00
Scott Lahteine
98c4f22432
Merge pull request #2093 from thinkyhead/timeout_default
...
Tweak to fan kick routine
2015-05-16 19:43:45 -07:00
Scott Lahteine
513077c317
Minor change to fan kick
2015-05-16 19:42:28 -07:00
Scott Lahteine
ef62463d20
Merge pull request #2089 from thinkyhead/timeout_default
...
NO_TIMEOUTS and ADVANCED_OK off by default
2015-05-16 18:35:29 -07:00
Scott Lahteine
76438195f0
NO_TIMEOUTS and ADVANCED_OK off by default
2015-05-16 02:47:20 -07:00
Scott Lahteine
7fecc48174
Merge pull request #2081 from thinkyhead/better_lsdive
...
Allow lsDive to recurse with minimal stack usage
2015-05-15 22:16:59 -07:00
Scott Lahteine
d2563804c8
Add LF to file errors
2015-05-15 04:37:22 -07:00
Scott Lahteine
e114662cfa
Adjust SdBaseFile spacing
2015-05-15 03:23:49 -07:00
Scott Lahteine
98e91f5253
Allow lsDive to recurse with minimal stack usage
2015-05-15 03:19:07 -07:00
Scott Lahteine
8b2cd930c3
Update README.md
2015-05-14 18:21:53 -07:00
Scott Lahteine
19166a92e4
Merge pull request #2057 from Wurstnase/serial_wait
...
add plan buffer remaining for 'P' and block buffer remaining 'B'
2015-05-14 04:57:08 -07:00
Scott Lahteine
95f5a68006
Merge pull request #2074 from thinkyhead/lcd_xyz_unknown
...
Display unknown XYZ on the LCD as "---"
2015-05-14 04:56:38 -07:00
Scott Lahteine
e97fcafd0e
Merge pull request #2076 from thinkyhead/mendel_inverting
...
Use MSG_OK in M105
2015-05-14 04:54:11 -07:00
Scott Lahteine
197a256669
Hardtung
2015-05-14 04:43:10 -07:00
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
