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

242 commits

Author SHA1 Message Date
Scott Lahteine
9bf87aac6a Merge pull request #3127 from thinkyhead/rc_core_babystepping 
Implement BABYSTEPPING for COREXY and COREXZ
 2016-03-18 23:25:26 -07:00
Scott Lahteine
7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc 
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
 2016-03-18 22:38:35 -07:00
Scott Lahteine
e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine
d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine
b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine
cc9968f893 Patch spacing in #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
Scott Lahteine
c16c47954c Merge pull request #3141 from esenapaj2/RCBugFix 
follow-up the PR #3131
 2016-03-13 03:37:39 -07:00
Scott Lahteine
30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine
2179f598bf Merge pull request #3122 from thinkyhead/rc_group_filament_change 2016-03-13 03:25:38 -07:00
esenapaj2
236a44c83b follow-up the PR #3131 
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
 2016-03-13 19:12:39 +09:00
Scott Lahteine
f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
Scott Lahteine
0c48eaf3de Expose motor current in more configs, disable by default 2016-03-11 02:25:36 -08:00
Scott Lahteine
27f244ba2c Support MAX31855 as Temperature Sensor -3 2016-03-10 02:49:54 -08:00
Scott Lahteine
ce639b8b03 Group FILAMENT_SENSOR options together 2016-03-10 02:41:37 -08:00
AnHardt
fd5414c6ea Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING 
rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
 2016-03-08 17:50:23 +01:00
esenapaj2
29e09c7c3e update example configurations 
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
 2016-03-07 22:03:33 +09:00
Scott Lahteine
13ef12ad3f Fix power calculations 
As suggested by @max-pau in #3073 - #3074
 2016-03-06 05:51:59 -08:00
Scott Lahteine
5cba0210f2 Small patch to Z_SAFE_HOMING comment 2016-03-06 05:51:58 -08:00
jbrazio
143ad74db7 Update PROBE_OFFSET_FROM_EXTRUDER comment section in all example config 
files.
 2016-03-06 05:51:58 -08:00
Scott Lahteine
e7cf85b922 Merge pull request #3013 from thinkyhead/esenapaj-patch-1 
Enhanced #3010 - formal Mesh/Manual dependency
 2016-03-06 00:30:02 -08:00
Scott Lahteine
eb85342fd9 Merge pull request #2989 from AnHardt/fix2661 
Pre home display - Stepper release
 2016-03-05 21:30:17 -08:00
Scott Lahteine
772460a7b8 Various minor spelling corrections 
Redo of #2939 rebased against RCBugFix
 2016-03-05 20:41:15 -08: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
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
4b02f33e69 Distribute config-changes to the other configurations 2016-02-28 23:20:04 +01:00
Scott Lahteine
1093c780c8 Remove obsolete STEPS_MM_E setting 2016-02-23 01:11:58 -08: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
fbfbc5e330 Enable USE_WATCHDOG by default 2016-02-17 17:14:57 -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
b19b272172 Update configurations with SPI_SPEED 
- Include aligned comment about new SDSUPPORT behavior
 2016-02-17 14:54:09 -08:00
esenapaj
27d918d836 Merge pull request #4 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-02-08 05:35:32 +09:00
Scott Lahteine
159ff94afd Remove obsolete HEATER_BED_DUTY_CYCLE_DIVIDER #2977 2016-02-07 08:02:11 -06:00
Ruwan J Egoda Gamage
b58083b0fa Getting rid of SDEXTRASLOW, SDSLOW variables. 2016-02-07 07:58:52 -06:00
Ruwan J Egoda Gamage
1b7c443628 Adding SDULTRASLOW variable. 
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
 2016-02-07 07:58:52 -06:00
esenapaj
d7272e3f36 Merge pull request #3 from MarlinFirmware/RCBugFix 
Rc bug fix
 2016-01-29 05:43:22 +09:00
esenapaj
0de5fcad0a Update Configuration_adv.h 2015-12-23 08:16:06 +09:00
Ruwan J Egoda Gamage
2c9e0415c7 Getting rid of SDEXTRASLOW, SDSLOW variables. 2015-12-13 23:23:01 -05:00
Ruwan J Egoda Gamage
e6cc232184 Adding SDULTRASLOW variable. 
Instead of changing SDEXTRASLOW variable to a slower speed,  the new
SDULTRASLOW is used for rigidbot panel.
 2015-12-13 15:47:10 -05:00
Richard Wackerbarth
0b429461d5 Back port Cosmetic changes 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
0cebe85e65 Clean up spacing and duplicate entries 
• Removing trailing whitespace
• Adjusting indention for better readability
• Removing duplicated entries
 2015-12-10 07:20:52 -06:00
Richard Wackerbarth
e7b40bbe98 Change link to U8glib source 2015-12-10 06:33:29 -06:00
AnHardt
c956b52c4a Babystep Multiplier 
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA

Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
 2015-11-30 05:43:10 -06:00
Scott Lahteine
9b23490f01 Clean up spacing in configs 2015-11-12 00:03:21 -06:00
Richard Wackerbarth
e01f5e1ef7 Cleanup 2015-09-17 10:44:23 -05:00
Mike Cochrane
5e36b64635 SDEXTRASLOW for some SD card readers (PR#176) 
Add SDEXTRASLOW which runs the SD card at SPI_QUARTER_SPEED. Quarter speed is needed for RIGIDBOT_PANEL
 2015-09-14 07:58:08 -05:00
Scott Lahteine
db27e67580 Apply PID_ADD_EXTRUSION_RATE to extras 2015-09-12 07:53:20 -05:00
Scott Lahteine
28599c51c7 Wrap Dual Y options in a conditional 2015-09-07 09:41:05 -05:00
Scott Lahteine
11a065c0ca Remove Z2 pins overrides from Configuration_adv.h 2015-09-07 09:41:05 -05:00
Richard Wackerbarth
6292d9e815 Rename ENABLE_AUTO_BED_LEVELING 
With the introduction of the #if ENABLED(…)

reads better than
 2015-08-27 20:52:08 -05:00
Christian Lefrançois
9897a9147c Update ABL comments (PR#95) 
* Updates the auto bed leveling comments ONLY.
* Renames "Z probe" word usage in //comments and #errors properly.
 2015-08-26 05:51:38 -05:00
Christian Lefrançois
a7822e3ff7 Some renaming of Z_PROBE to Z_MIN_PROBE (PR#91) 
* Fix a couple of renames omission and macro expansion errors.
 2015-08-20 06:04:46 -05:00
AnHardt
e2d69f66b2 Make Z_PROBE a Z_MIN_PROBE (PR#65) 
Currently we use the probe exclusively as a device to find the build platform(bed).
For the currently supported setups this means, we use it as a additional min-endstop.
A triggered when not deployed probe disturbs the homing process for max-endstops.

Rename ENDSTOPPULLUP_ZPROBE to ENDSTOPPULLUP_ZMIN_PROBE
Rename Z_PROBE_ENDSTOP_INVERTING to Z_MIN_PROBE_ENDSTOP_INVERTING
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Rename DISABLE_Z_PROBE_ENDSTOP to DISABLE_Z_MIN_PROBE_ENDSTOP
Rename Z_PROBE_REPEATABILITY_TEST to Z_MIN_PROBE_REPEATABILITY_TEST
Rename Z_PROBE_ENDSTOP to Z_MIN_PROBE_ENDSTOP
Adjust comments accordingly
Remove Z_MAX  check for the probe in update_endstops().

Using an delta related idea of @clefranc from #61,
extended to the general change for all setups.

Tested with Prusa i3, max-z-endstop and permanently triggered z-probe.
Worked for @clefranc's delta.
 2015-08-11 14:41:36 -05:00
Scott Lahteine
46453905d6 Apply remaining ENABLED/DISABLED conditionals 2015-08-03 16:04:48 -05:00
Richard Wackerbarth
b227d8c128 Supply a VERSION in a short form for displays 
The long descriptor will still be available in M115
 2015-08-03 08:21:09 -05:00
Richard Wackerbarth
329acc852e Canonize Option flag USE_AUTOMATIC_VERSION 2015-08-03 08:08:37 -05:00
AnHardt
80f2a20842 Enable bootscreen in all Configurations 2015-08-03 07:13:00 -05:00
Scott Lahteine
1e2deff4fd Rename BTENABLED to BLUETOOTH 
- For some reason it’s easy to forget what BT stands for, but it
doesn’t need an abbreviation.
 2015-08-02 22:56:50 -05:00
Scott Lahteine
270c766de2 SDCARDDETECT -> SD_DETECT, added docs 
- `SD_DETECT_PIN` replaces `SDCARDDETECT`
- `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED`
- Revise the description of `SD_DETECT_INVERTED`
- Add a note about the override of `SD_DETECT_INVERTED` in
`Conditionals.h`
 2015-08-02 21:59:41 -05:00
Scott Lahteine
37d1879386 Apply overridables to Configuration files 2015-07-31 00:03:36 -05:00
Scott Lahteine
edaaead7e0 Fix comment about SERVO_ENDSTOP_ANGLES 2015-07-30 23:35:57 -05:00
Scott Lahteine
0af2a80e06 Make SERVO_ENDSTOP_ANGLES 2-dimensional 2015-07-30 16:38:56 -05:00
Scott Lahteine
ab6f1fdf8b Move & document ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED (PR#2528) 
As suggested in #2521
- Move `ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED` because `SDSUPPORT` is
also required.
- Add a note that endstops must be enabled for the feature to have any
effect
 2015-07-26 20:36:37 -05:00
AnHardt
fd0e81b0c7 Distinguish between BUZZER and SPEAKER (PR#2513) 
A speaker needs a AC or a pulsed DC to make a sound, a buzzer only needs a DC.
A buzzer has it's own resonator. It works in most cases to feed the buzzer with a pulsed DC, but the sound will not be as loud as with pure DC.

There seem to be boards where the BEEPER-pin is not able to handle a PWM. Obviously intended for a buzzer.
To make these board able to handle a speaker

* replace the PWM based tone()-function again with a on-delay-off-delay loop.

Hopefully the last time I touch the beeper code.
 2015-07-24 22:10:04 -05:00
AnHardt
8b876241bd Some more servo code tweaks 
Just set up the pin. Don't move to a random position.

Simplify servo::move()
* servo::move() does not need the pin parameter - The pin is set during servo_init() with attach().
* servo::move() does not need a return value.

SERVO_LEVELING is the wrong condition to deactivate the servos.

Remove some temporary (Servo *) variables.
SanityCheck for the servo indexes.
 2015-07-24 22:04:49 -05:00
Scott Lahteine
90f8ddfc1e Apply MINIPANEL to other configs 2015-07-23 22:51:41 -05:00
Scott Lahteine
d85861d296 Move macros, add ENABLED/DISABLED, add includes 2015-07-22 18:16:05 -05:00
Scott Lahteine
129f986ccf Add COREXZ option to configurations 2015-07-19 16:17:03 -05:00
Scott Lahteine
391386dd94 Update configs for new servo deactivation 2015-07-15 19:13:40 -05:00
Scott Lahteine
c3c605c658 Move note about LiquidTWI2 to Configuration.h (PR#2406) 2015-07-09 05:33:17 -05:00
Scott Lahteine
dc40a5f6e0 Patch up more outdated config lines 2015-06-15 20:20:32 -05:00
Scott Lahteine
a274769f4f Clean up spacing and comments 
Also clean up some trailing spaces in a few other sources
 2015-06-15 20:20:31 -05:00
Scott Lahteine
d3bce05d54 Fix up spacing for filament sensor values 2015-06-15 20:20:31 -05:00
Scott Lahteine
b4b10a57fe Fix configurator section directives and values lists 2015-06-15 20:20:31 -05:00
Scott Lahteine
bba14dcbe6 Move Z Safe Homing point to the middle of the movement range 2015-06-15 20:20:31 -05:00
wurstnase
c85a486445 make the dual z-endstop optional (PR#2277) 
it's disabled by default
 2015-06-10 15:45:59 -05:00
Richard Wackerbarth
58941e543e ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed 
#defining something just to define something else doesn’t
make sense

If you want SDCARDDETECTINVERTED, just define it yourself.

If the previous code was intended to define, undefined and then again define the term, that code is improper.
 2015-06-06 21:44:59 -05:00
CONSULitAS
3a5963c0e7 Configuration_adv.h: Add FAN_MIN_PWM for slow fan stopping issue … 
* all Configuration_adv.h: Add #define FAN_MIN_PWM for slow fan stopping
issue
* for K8200: uncommented with tested (and working) values
 2015-06-06 20:13:56 -05:00
Ed Boston
08968c29bb Adding ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED to Examples 2015-06-06 16:40:32 -05:00
AnHardt
d1f4471000 Merge pull request #2146 from Wackerbarth/Versioning 
Versioning
 2015-06-02 18:31:21 +02:00
Jonathan Bastien-Filiatrault
d46d9d998e Add maximum bed integral term in example configurations. 2015-05-28 12:51:37 -04:00
Richard Wackerbarth
5ea139fd79 Revised Versioning mechanism 2015-05-25 15:53:14 -05:00
Scott Lahteine
38cc0b93c6 Merge pull request #1874 from AnHardt/Bulgarian 
Introduction of Bulgarian - language_bg.h
 2015-05-22 13:59:50 -07:00
Scott Lahteine
50bd7493cc Merge pull request #2108 from thinkyhead/m33_long_filename_host_support 
M33 LONG_FILENAME_HOST_SUPPORT
 2015-05-21 16:22:47 -07: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
AnHardt
e353d27430 Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian 2015-05-18 23:56:53 +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
Scott Lahteine
0f2c9bacfd M33 LONG_FILENAME_HOST_SUPPORT 2015-05-17 17:36:32 -07:00
Scott Lahteine
76438195f0 NO_TIMEOUTS and ADVANCED_OK off by default 2015-05-16 02:47:20 -07:00
Scott Lahteine
78beef2d73 Use Mendel default for INVERT_Y_DIR 2015-05-14 00:25:47 -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
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
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
Wurstnase
526ad82d20 activate advanced_ok and no_timeout 2015-05-11 08:01:51 +02: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
79106638a8 Fix documentation of heating sanity check 2015-05-08 22:50:08 -07:00