Commit graph

9277 commits

Author SHA1 Message Date
Scott Lahteine
79778d46d9 Merge pull request #3066 from Blue-Marlin/Fix-disable_all_heaters()
Fix disable_all_heaters() for MAX6675
2016-03-02 17:35:08 -08:00
Blue-Marlin
a68228bf55 Remove unused ALARM_PIN
Remove unused ALARM_PIN from all the Configuration.h's
2016-03-02 14:29:49 +01:00
Scott Lahteine
9eb4aceee4 Merge pull request #2986 from thinkyhead/enable_watchdog
Enable USE_WATCHDOG by default
2016-03-02 05:29:42 -08:00
Blue-Marlin
0631541166 Fix disable_all_heaters() for MAX6675 2016-03-02 14:17:23 +01:00
Scott Lahteine
222d13d5ed Merge pull request #3051 from thinkyhead/rcbugfix_dual_axis_offset
Code cleanup in gcode_T
2016-03-02 03:45:40 -08:00
Scott Lahteine
186629aee8 Merge pull request #3057 from jbrazio/3034-z_raise_after_probing_fix
Fix Z_RAISE_AFTER_PROBING for non DELTA printers
2016-03-02 03:14:27 -08:00
Scott Lahteine
a42fb35c56 Merge pull request #3050 from Blue-Marlin/fix-1166
Temporary workaround for stack overflow
2016-03-01 11:33:19 -08:00
jbrazio
67e15aac3d As pointed out by @Blue-Marlin the previous code would raise the Z axis
twice for a servo based probe.
2016-03-01 00:22:48 +00:00
jbrazio
17cc2a9663 Z_RAISE_AFTER_PROBING value was being ignored by Marlin because
raise_z_after_probing() was only called if the printer type was set to a
DELTA or if the printer had a docking sled for the probe.
2016-02-29 15:48:26 +00:00
Scott Lahteine
252f4a75cd Merge pull request #3043 from oxivanisher/RCBugFix
Example configuration for Kossel XL
2016-02-28 23:57:13 -08:00
Scott Lahteine
fd1243c184 Merge pull request #3052 from thinkyhead/rc_fix_m145_eeprom_output
Fix "M145" output in M503 report
2016-02-28 23:43:08 -08:00
Scott Lahteine
0bc648353f Merge pull request #3031 from tnw513/RCBugFix
Fix board type for Hephestos: RAMPS 1.4
2016-02-28 23:23:01 -08:00
AnHardt
f27c2b6b4b Reimplement #2892
Include #2892 to fix the isHeating symbol in the extruder graphics
2016-02-28 23:20:30 +01:00
AnHardt
615bec2329 Activate warning about possible reduced accuracy by default
Renamed `WARN_REDUCED_ACCURACY` to `DISABLE_REDUCED_ACCURACY_WARNING`

Changed the condition for blinking from
```
#if ENABLED(WARN_REDUCED_ACCURACY)
```
to
```
#if DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
```
2016-02-28 23:20:21 +01:00
AnHardt
1c889cd303 Refresh previous_cmd_ms during run_z_probe()
Refresh previous_cmd_ms during run_z_probe() to prevent:
stepper shutdown for expired DEFAULT_STEPPER_DEACTIVE_TIME
and extrudes for expired EXTRUDER_RUNOUT_SECONDS
(https://github.com/MarlinFirmware/MarlinDev/issues/238)
2016-02-28 23:20:12 +01:00
AnHardt
4b02f33e69 Distribute config-changes to the other configurations 2016-02-28 23:20:04 +01:00
AnHardt
be24fdacea The same changes to the axis-letters now for the char-displays
Exactly the same - copy/paste.
2016-02-28 23:19:54 +01:00
AnHardt
5b0f659355 Changes for graphics displays
Replaced displaying "---" instead of the value of a coordinate when
unhomed or with reduced precision
with blinking the coordinate-prefix-character ('X','Y','Z').
For "unhomed" a '?' is shown every second second - until that axis is
homed. The value displayed is, as before the "---" where displayed, the
relative to the reset position coordinate value.
When the axis stepper was disabled, now we can display a hint on that,
by showing a blinking ' ' instead of the axis letter, when
WARN_REDUCED_ACCURACY is defined.

I suppose the code itself is here the better documentation.

A '+/-' character is in non of our charsets so i decided for a '?' for
now to reduce the work.
There is no additional space on the displays one could use to display
the information, so replacing something is the only option. As the axis
letters are totally redundant with their positions on the display they
contain the least information.
So my decision was to overwrite them.
2016-02-28 23:19:32 +01:00
AnHardt
32ae9f9ab7 Fix stepper shutdown during waiting for temperatures
In the wait loops of M109 M190 idle() is called, what checks
stepper_inactive_time against previous_cmd_ms.
Because we can be several minutes inside the loop, resetting
previous_cmd_ms only outside the loop caused stepper shutdowns.

The name of previous_cmd_ms does not really reflect its use. It's set
not only when a new command was received or executed but also in many of
the movement routines. For that the little extension of using it during
the wait will (hopefully) not hurt.

# Conflicts:
#	Marlin/Configuration_adv.h
2016-02-28 16:58:50 +01:00
AnHardt
b6e69e71ce Make stepper shutdown after inactivity dependent
Make stepper shutdown after inactivity dependent on a new set of
#defines.
DISABLE_INACTIV_X
DISABLE_INACTIV_Y
DISABLE_INACTIV_Z
DISABLE_INACTIV_E

And make exemplaric Configuration.
Names can be discussed.

This makes the disabling of the steppers independent from the DISABLE_?
settings witch shut down the steppers immediately.
2016-02-28 16:58:42 +01:00
AnHardt
051325ccd7 Introduce axis_homed
Introduce additional variable axis_homed to replace axix_known_position
when the coordinate display should indicate the axis is not homed.
This is to distinguish between "not homed" and "inexact position possible
because stepper was disabled".

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
2016-02-28 16:58:28 +01:00
AnHardt
e736779d7e blink for char-lcds
Implement and test blinking for char-lcds

# Conflicts:
#	Marlin/ultralcd_implementation_hitachi_HD44780.h
solved
2016-02-28 16:58:19 +01:00
Scott Lahteine
7253a1971d Fix "M145" output in M503 report 2016-02-27 22:28:08 -08:00
Scott Lahteine
d118e3f985 Merge pull request #3044 from thinkyhead/rc_gcode_spaces
Fix GCode handling of spaces between command letter and first digit
2016-02-27 22:21:28 -08:00
Scott Lahteine
100271e6ac minor cleanup in gcode_T 2016-02-27 19:56:56 -08:00
Blue-Marlin
fd9e94e5a4 Fix crashes when the Z axis is moved via LCD
Fix crashes when the Z axis is moved via LCD
by calling `plan_buffer_line` only when there is enough room in the
planner buffer, to avoid endless recursion.
A brief description about what went wrong is in #1166
2016-02-28 00:59:47 +01:00
Scott Lahteine
8dccd5a7ea Merge pull request #3018 from CONSULitAS/RCBugFix_K8200_backinsync
K8200: sample config back in sync
2016-02-27 05:22:12 -08:00
Scott Lahteine
6a4f06d35d Fix GCode handling of spaces between command letter and first digit 2016-02-26 18:42:59 -08:00
Marc Urben
68eae2b5a8 added kossel xl example configuration 2016-02-27 01:48:45 +01:00
Silvio Didonna
eb5817675d Fix board type: RAMPS 1.4 2016-02-25 15:52:41 +01:00
Scott Lahteine
8006684c19 Merge pull request #3027 from CONSULitAS/RCBugFix_current_command
Fix: current_command_args contains command
2016-02-24 17:43:38 -08:00
AnHardt
cb88fdd242 Protect MarlinSerial against interrupts
Protect MarlinSerial against interrupts
by shielding the CRITICAL_SECTIONs

Now with a test if RX_BUFFER_SIZE is in the required range.
Code in peek() and read() is now optimized for readability and showing the similarity between the two.

Maybe a bit overprotected in checkRx() and store_char(), but now some days without detected errors from this source.
2016-02-24 17:18:12 +01:00
AnHardt
dc0f41868e Make rx tail/head atomic 2016-02-24 15:51:34 +01:00
CONSULitAS
ea8409ad5d Fix: current_command_args contains command
@thinkyhead
Hi Scott,
your code from a0f362c@thinkyhead is great, but you forgot to skip the
command.
Symptom `M117 Test`shows `M117 Test` on LCD instead of `Test`.

see also
https://github.com/MarlinFirmware/Marlin/commit/a0f362c735401ebbcd95de3f
6f8e3c2f17ecc770 lines 941, 2851 and so on

Greetings and welcome back

Jochen
2016-02-24 09:35:04 +01:00
Scott Lahteine
9a3408e58f Merge pull request #3024 from thinkyhead/rc_remove_steps_mm_e
Remove obsolete STEPS_MM_E setting
2016-02-23 23:37:09 -08:00
Scott Lahteine
1093c780c8 Remove obsolete STEPS_MM_E setting 2016-02-23 01:11:58 -08:00
CONSULitAS
a4fe6a45ae K8200: sample config back in sync
* Configuration.h:
  * updated header comment
  * new UUID feature used
  * sync to default config
  * typos fixed
  * changes better documented
  * reflect change in SDSUPPORT feature
* Configuration_adv.h
  * updated header comment
  * thermal protection tuned to work with K8200
  * homing tuned
  * sync to default config
  * typos fixed
  * changes better documented
  * reflect change in LCD features
  * use long filenames
  * use Watchdog
  * use Babystepping
  * use Auto Filament Change
2016-02-21 16:06:25 +01:00
Scott Lahteine
c2e5c6c12c Nest Manual Bed Leveling options
This formalizes the dependency of MANUAL_BED_LEVELING on
MESH_BED_LEVELING
2016-02-20 20:35:10 -08:00
Scott Lahteine
042a6a0a37 Extend existing MESH_BED_LEVELING test 2016-02-20 20:35:10 -08:00
esenapaj
08b3147791 sanity check for MANUAL_BED_LEVELING 2016-02-20 20:35:10 -08:00
Scott Lahteine
9f8e6dce20 Merge pull request #2942 from esenapaj/esenapaj-patch-2
more suitable display format for delta printer
2016-02-18 17:59:35 -08:00
Scott Lahteine
e1beaf61eb Merge pull request #2985 from AnHardt/adv-ok
Repair N in ADVANCED_OK
2016-02-18 17:06:26 -08:00
esenapaj
34cde1b77c Merge pull request #14 from MarlinFirmware/RCBugFix
Rc bug fix
2016-02-19 09:19:23 +09:00
Scott Lahteine
f00ca3fd89 Fix layout descr. in configuration_store.cpp 2016-02-17 19:44:04 -08:00
Scott Lahteine
0c9db67273 Merge pull request #2983 from AnHardt/ok-echo
Replace the "ok" in M280, M301, M304, M851 with output not including …
2016-02-17 19:09:41 -08:00
Scott Lahteine
fbfbc5e330 Enable USE_WATCHDOG by default 2016-02-17 17:14:57 -08:00
Scott Lahteine
d4e7c2d694 Merge pull request #2976 from thinkyhead/drop_configurator
Drop the experimental Configurator
2016-02-17 17:08:08 -08:00
Scott Lahteine
9df0e0e0cc Merge pull request #2974 from thinkyhead/sanitycheck_spi_speed
Sanity-check deprecated options replaced by SPI_SPEED
2016-02-17 17:07:58 -08:00
Scott Lahteine
3e2473e695 Merge pull request #2988 from thinkyhead/z2_more_extruders
Use next open E connector for Y2/Z2
2016-02-17 17:07:07 -08:00
Scott Lahteine
8eaba020fb Merge pull request #2973 from thinkyhead/fix_splash_url
Remove references to marlinfirmware.org
2016-02-17 17:05:06 -08:00