Scott Lahteine
6eb4f90ce7
Also synchronize configurator copies of configs
2015-05-20 21:34:00 -07:00
Scott Lahteine
9d1961ebe3
Witbox and Hephestos are just RAMPS_13_EFB
2015-05-20 21:33:23 -07:00
AnHardt
4422365a53
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into _temp_error
2015-05-20 23:34:39 +02:00
AnHardt
4113762062
Merge pull request #2130 from AnHardt/kill2
...
Add a string parameter to kill()
2015-05-20 23:32:51 +02:00
AnHardt
89d2ee6f13
Make output on display dependant of ULTRA_LCD
2015-05-20 22:03:16 +02:00
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
9b8c6ed254
Merge pull request #2120 from chris-bo/dogm_config
...
move dogm font selection to configuration_adv.h
2015-05-20 10:11:34 +02:00
AnHardt
06513565e9
Merge pull request #2105 from eboston/Development
...
Add ELB_FULL_GRAPHIC_CONTROLLER with ADAFRUIT_ST7565 display.
2015-05-20 09:56:21 +02:00
Ed Boston
082ed3beed
Propagate Configuration.h changes
...
Updated all the example Configuration.h files for the new display type.
2015-05-19 14:04:57 -07:00
Ed Boston
152b681bb5
Added link to controller github
...
Added the link to the github information about the
ELB_FULL_GRAPHIC_CONTROLLER
2015-05-19 04:14:55 -07:00
AnHardt
995b84944b
Merge pull request #1982 from CONSULitAS/Development_Update_language.h
...
language.h: update documentation / URL für K8200
2015-05-19 12:13:35 +02:00
Scott Lahteine
7bc5fd8193
Merge pull request #2123 from AnHardt/Duemilanove
...
Remove Duemilanove
2015-05-18 20:36:05 -07:00
Scott Lahteine
94de1e0d93
Merge pull request #2116 from AnHardt/wording
...
transpire -> expire
2015-05-18 20:34:46 -07:00
AnHardt
4d4fa3607b
Remove Duemilanove
...
No way to fit Marlin into 32K.
2015-05-19 02:46:37 +02:00
AnHardt
e353d27430
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian
2015-05-18 23:56:53 +02:00
Ed Boston
ca8d1756d5
Define fixes
...
Fixed a couple defines that were not changed or commented out.
2015-05-18 14:23:31 -07:00
CONSULitAS
b96b28b7cc
language.h: update documentation for LANGUAGE_INCLUDE
...
language.h: update documentation for LANGUAGE_INCLUDE
@thinkyhead What do you think? I think there should be a warning like
this.
2015-05-18 23:11:26 +02:00
Christian Bohn
258bcdefe0
move dogm font selection to configuration_adv.h
2015-05-18 22:54:53 +02:00
AnHardt
7750180c93
transpire -> expire
...
Minor wording correction.
2015-05-18 21:48:10 +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
a0f362c735
Simplify & optimize with current_command_args
2015-05-18 07:08:04 -07:00
Scott Lahteine
adc8fcb77f
More parser comments, optimize code_seen, save with goto
2015-05-18 07:08:04 -07:00
Scott Lahteine
c6d8dd19d9
use fetched value
2015-05-18 07:08:04 -07:00
Scott Lahteine
1116e13f5a
Further optimization of command parser
2015-05-18 07:08:03 -07:00
Scott Lahteine
3a4c3ab76e
Pre-sanitize the command before handling
...
- Use a global pointer for the current sanitized command
- Pre-sanitize the current command to bypass `N` and nullify `*`,
removing the need for handlers to bypass, ignore, or nullify these
parts, and reducing overhead for `code_seen`, etc.
- Pre-skip leading whitespace.
- Only look for G, M, T codes at the start of the command.
- Verify that G, M, T codes are followed by command codes.
2015-05-18 07:06:51 -07:00
Ed Boston
a83bf18ee1
More functional seperation
...
Moved SDCARDDETECTINVERTED and SDSLOW to Conditionals.h.
Added U8GLIB_LM6059_AF to define display specific actions.
Added reminder to compile in u8glib
2015-05-18 05:37:46 -07:00
AnHardt
97ca1b3f4d
Name magic value 20 to MAX_OVERSHOOT_PID_AUTOTUNE
...
to make it better findable.
2015-05-18 14:15:29 +02:00
Scott Lahteine
0f2c9bacfd
M33 LONG_FILENAME_HOST_SUPPORT
2015-05-17 17:36:32 -07:00
Scott Lahteine
3feaef6526
Have G92 set the nozzle position on Delta and SCARA
2015-05-17 17:08:05 -07:00
Ed Boston
047e688e93
Changed ADAFRUIT_ST7565 to ELB_FULL_GRAPHIC_CONTROLLER
...
Rename of define to avoid confusion between the controller and the
display which had similar names.
2015-05-17 15:23:17 -07:00
Ed Boston
1999ac415c
Formatting Changes
...
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
2015-05-17 13:39:24 -07:00
Ed Boston
41f8cdb3a6
ADAFRUIT_ST7565
...
Added support for new display type
2015-05-17 12:47:41 -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
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
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
513077c317
Minor change to fan kick
2015-05-16 19:42:28 -07:00
Scott Lahteine
76438195f0
NO_TIMEOUTS and ADVANCED_OK off by default
2015-05-16 02:47:20 -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
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
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
Scott Lahteine
f65833931d
Formatting tweaks
2015-05-13 02:02:19 -07:00
Scott Lahteine
fcfd99c1ae
Add comments to lcd_control_temperature_menu
2015-05-12 18:46:16 -07:00
Scott Lahteine
d693e0f378
Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit
2015-05-12 18:30:38 -07:00
Scott Lahteine
6697a8f375
Watch the heater a little longer
2015-05-12 18:22:47 -07:00
Scott Lahteine
5693a6e3c9
Fix heating error message
2015-05-12 18:17:13 -07:00
Scott Lahteine
747fd5801c
Merge pull request #2055 from thinkyhead/thermal_unified
...
Combine thermal runaway and watch-period
2015-05-12 08:04:29 -07:00
Scott Lahteine
6e5572228d
Merge pull request #2064 from thinkyhead/wait_before_g28
...
Split up prepare_move by type
2015-05-12 07:53:11 -07:00
Scott Lahteine
27ad381e25
Allow fractional seconds in G4 and M0
2015-05-12 07:52:08 -07:00
Scott Lahteine
5146694452
Merge pull request #1884 from shaggythesheep/feature_new_board_ramps_cnc_controller
...
Feature: Add RAMPS CNC Controller Board
2015-05-12 04:31:49 -07:00
Scott Lahteine
b2bd9aae7c
SCARA_SEGMENTS_PER_SECOND
2015-05-12 04:18:15 -07:00
Scott Lahteine
bd20bd5444
Merge pull request #2063 from chris-bo/autobed_sled
...
improve sled handling
2015-05-12 03:29:21 -07:00
Scott Lahteine
9e95ceb3fc
Split up prepare_move by type
...
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
2015-05-12 02:08:20 -07:00
Scott Lahteine
9ba8cf5fe3
Merge pull request #2061 from thinkyhead/wait_before_g28
...
Always do st_synchronize() before G28
2015-05-12 02:05:30 -07:00
Scott Lahteine
873f7d6f2a
Check that configs are up-to-date
2015-05-12 01:33:51 -07:00
Christian Bohn
f48599f172
add pin definition to some motherboards
2015-05-12 10:02:23 +02:00
Scott Lahteine
b5200e184c
Remove extra setup_for_endstop_move
2015-05-12 01:01:53 -07:00
Scott Lahteine
8d814de558
Return void in prevent_dangerous_extrude
2015-05-12 00:55:00 -07:00
Scott Lahteine
367e2eb9f4
Global setup_for_endstop_move
2015-05-12 00:51:22 -07:00
Wurstnase
1d5677cc3b
add missing Z-bits
2015-05-12 09:36:19 +02:00
Wurstnase
df12e68e7d
add missing Z_PROBE-bit
2015-05-12 09:33:24 +02:00
Scott Lahteine
fa951f8a0b
Always do st_synchronize() before G28
2015-05-12 00:31:51 -07:00
Christian Bohn
27a3b1d895
disable sled pin by default
2015-05-12 08:51:01 +02:00
Christian Bohn
fb44b53ae3
sled improvements
...
- create sled pin definition
- G28 Works with sled
2015-05-11 23:22:19 +02:00
Wurstnase
46d1932380
add plan buffer remaining for 'P' and block buffer remaining 'B'
2015-05-11 13:04:00 +02:00
Scott Lahteine
429c6ccad2
Neaten config formatting
2015-05-10 23:27:00 -07:00
Scott Lahteine
8a0dc4d54a
Merge pull request #1922 from Wurstnase/serial_wait
...
Serial wait
2015-05-10 23:10:25 -07:00
Scott Lahteine
8332a15899
Fix testing of runaway options in temperature.cpp
2015-05-10 23:03:24 -07:00
Wurstnase
526ad82d20
activate advanced_ok and no_timeout
2015-05-11 08:01:51 +02:00
Scott Lahteine
2b92b01afc
Fix typo in SanityCheck.h
2015-05-10 22:58:37 -07:00
Scott Lahteine
2445ae3d3a
Combine thermal runaway and watch-period
...
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
2015-05-10 22:52:01 -07:00
Scott Lahteine
4097207c75
Merge pull request #2041 from thinkyhead/watch_temp
...
More thermal protection
2015-05-10 21:39:05 -07:00
Scott Lahteine
45d64040fe
Merge pull request #2048 from Wurstnase/hit_bits
...
replace some bools
2015-05-10 20:37:17 -07:00
Scott Lahteine
9b3d4380d3
Only watch the heater that was set
2015-05-10 20:26:45 -07:00
Scott Lahteine
52c0696e44
Merge pull request #2044 from thinkyhead/fix_servos_too
...
Make some z probe and servo code tweaks
2015-05-10 20:10:42 -07:00
Wurstnase
b55f32f8a1
replace some bools
...
this PR replaces some bools with one char. this will safe 3 bytes and should also be sometimes a little bit faster.
2015-05-10 21:37:39 +02:00
Laurent DELAGE
e70e6e2b48
Correction traductions
2015-05-10 15:38:50 +02:00
Scott Lahteine
f73f4ce555
Make some z probe and servo code tweaks
2015-05-09 19:11:19 -07:00
Scott Lahteine
28c87ec81b
Disable all heaters on temp error
2015-05-08 23:17:25 -07:00
Scott Lahteine
79106638a8
Fix documentation of heating sanity check
2015-05-08 22:50:08 -07:00
Scott Lahteine
6110494a56
Change default to 4°C in 16s
2015-05-08 22:41:12 -07:00
Scott Lahteine
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
2015-05-08 22:36:02 -07:00
Scott Lahteine
deedb00c18
Document WATCH_TEMP_PERIOD
2015-05-08 22:25:51 -07:00
Scott Lahteine
be77cfd895
Merge pull request #2032 from Wurstnase/toshiba_for_all_stepper
...
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER …
2015-05-08 20:32:30 -07:00
Scott Lahteine
cb4ea75fab
Support for MKS BASE 1.0 board
2015-05-08 19:07:37 -07:00
Scott Lahteine
0e70511381
Merge pull request #2036 from brupje/mainline
...
Fixes for reprapworld's keypad
2015-05-08 18:19:31 -07:00
Wurstnase
0cb87795a3
advanced 'ok'
...
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.
Some pseudo code:
If (bufferremaining > 0) send command
## as long there is free buffer send command
Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
2015-05-08 22:28:51 +02:00
Wurstnase
182e0d99c9
Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait
2015-05-08 21:27:18 +02:00
brupje
d1148a0198
Rename Configuration_megatronics.h to Configuration.h
2015-05-08 14:36:23 +02:00
Scott Lahteine
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
2015-05-08 04:39:59 -07:00
Scott Lahteine
181ccc884c
Edit thermal runaway description
2015-05-07 20:46:03 -07:00
Wurstnase
073e4af7e2
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver.
2015-05-07 18:55:47 +02:00
brupje
b7fcb11580
Added example configuration for Megatronics
2015-05-07 13:18:05 +02:00
brupje
8f8174dc93
Revert "Default configuration for megatronics."
...
This reverts commit 22e0d2afcb
.
2015-05-07 13:12:17 +02:00
Scott Lahteine
79633a74ab
Fix MBL compile error
2015-05-06 14:25:13 -07:00
brupje
ba9741139e
Clean up pins file for megatronics
2015-05-05 14:01:52 +02:00
brupje
22e0d2afcb
Default configuration for megatronics.
2015-05-05 14:01:20 +02:00
brupje
816aa19861
Up/down buttons were reversed, swapped the assignments
2015-05-05 13:04:46 +02:00
brupje
df4d50579a
This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway.
2015-05-05 12:47:24 +02:00
brupje
8f8bf3a897
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
2015-05-05 11:03:20 +02:00
Scott Lahteine
777f2d3820
Merge pull request #2018 from fmalpartida/bugFixing
...
Bug corrected: persistent HOMING message when HOME button pressed for homing.
2015-05-05 00:12:32 -07:00
Scott Lahteine
ecb46de349
Merge pull request #2013 from bq/Fix_lowercase
...
Fixed lowercase change missing on commit a22a228b
.
2015-05-04 23:50:56 -07:00
fmalpartida
150a35eff8
Bug corrected:
...
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
2015-05-04 19:48:49 +02:00
Gina Häußge
ab246ab032
Reverting changes to error messages on serial console
...
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
2015-05-04 15:03:00 +02:00
Ivan Galvez Junquera
59529b755d
Fixed lowercase change missing on commit a22a228b
.
...
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
2015-05-04 09:44:34 +02:00
Scott Lahteine
df4c104637
Merge pull request #2012 from BrianGilbert/Development
...
Add example configuration for Boots Industries V2.5 Delta Printer
2015-05-03 20:42:32 -07:00
Scott Lahteine
1f039cde61
Merge pull request #1992 from thinkyhead/too_many_probes
...
Stow Z probe on M402 without extra raise
2015-05-03 20:40:26 -07:00
Brian Gilbert
1285784a49
Add Boots Industries V2.5 example configuration
2015-05-04 09:10:42 +10:00
Scott Lahteine
35493e1af9
Tweak to planner.cpp position.debug
2015-05-03 16:03:05 -07:00
paclema
26015b02d8
Fixed typo and updated Configuration.h of configurator
2015-05-03 02:39:34 +02:00
paclema
aedd580911
Updated all configuration.h examples
2015-05-03 02:28:43 +02:00
Scott Lahteine
2c892fca6a
Cleanup of language.h
2015-05-01 21:38:32 -07:00
Scott Lahteine
2db384a21d
Fix compile error in configuration_store.cpp
2015-05-01 21:15:26 -07:00
Scott Lahteine
ca8cec8e8a
Merge pull request #1998 from paclema/Filament_runout_fix
...
Fixed sintaxis error of filament runout
2015-04-29 19:53:25 -07:00
Scott Lahteine
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
2015-04-29 19:44:50 -07:00
Scott Lahteine
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
2015-04-29 19:05:48 -07:00
Scott Lahteine
d065d37822
Add M428 to set home_offset logically
2015-04-29 18:26:16 -07:00
paclema
013a09dbe6
Added configurable script for filrunout form configuration.h
2015-04-29 21:38:40 +02:00
paclema
4dcc0fd55a
Fixed sintaxis error of filament runout
2015-04-29 21:32:27 +02:00
AnHardt
514d8ac460
Enable TRP for the bed
...
in all Configurations.
2015-04-29 08:47:01 +02:00
Scott Lahteine
ce3caf447b
Tweak how homeaxis deploys and stows
2015-04-28 19:17:48 -07:00
Scott Lahteine
a235dca79c
Stow z on M402 without extra raise
2015-04-28 19:10:07 -07:00