Scott Lahteine
be08eb6153
Merge pull request #3194 from jbrazio/feature/add-pt_pt-utf8
...
Add pt_pt-utf8 language pack and fix some minor compiler warnings
2016-03-20 17:42:45 -07:00
Scott Lahteine
d1ff7959b7
Merge pull request #3188 from esenapaj/patch-1
...
follow-up the commit b82d91e
2016-03-20 17:39:52 -07:00
Scott Lahteine
1cc316f1fd
Merge pull request #3082 from thinkyhead/updated_2820
...
This is quite comprehensive. If probes are disabled in any case when they shouldn't be, I'm sure we will hear about it soon.
2016-03-20 17:10:38 -07:00
jbrazio
1aa531a3db
Missing coma comment correction for all config files
2016-03-20 23:21:45 +00:00
jbrazio
68dda08fff
Added pt_pt-utf8 language pack; Fixed some minor compiler warnings; Harmonize file suffix for the current existing UTF8 language packs; Updated all configuration files to reflect the new language packs
2016-03-20 23:14:24 +00:00
esenapaj
468df96b0f
follow-up the commit b82d91e
...
follow-up the commit b82d91eca6
2016-03-20 20:57:14 +09:00
Scott Lahteine
32f75749e4
Merge pull request #3117 from Blue-Marlin/thermal-protection
...
Improve the descriptions for THERMAL_PROTECTION
2016-03-19 23:41:05 -07:00
esenapaj
37eaa1406b
follow-up the PR #3180
2016-03-20 15:33:02 +09:00
esenapaj
198d5d56fd
follow-up the PR #3183
2016-03-20 13:58:05 +09:00
Blue-Marlin
3166aed087
Improve the descriptions for THERMAL_PROTECTION
2016-03-19 14:08:59 +01:00
AnHardt
3f45a1acf9
Check probes only when deployed
...
Aim: Test probes in update_endstops only when activated
Changes:
Configurations
Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
Add some comments
Shift some entries to have related things together.
Conditionals.h
We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.
SanityCheck.h
Add some tests if the probe is connected and if we have defined a probe.
stepper.cpp
Changes to test the probe only when it is deployed (z_probe_is_active).
Test update_endstops() when the probe is deployed.
MarlinMain.cpp
a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.
To do: In another PR. handle all probes in deploy/stow_z_probe.
Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
2016-03-19 02:00:08 -07:00
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
4ae03df5c2
Merge pull request #3109 from thinkyhead/rc_host_keepalive
...
Provide feedback to hosts when busy
2016-03-18 23:22:29 -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
esenapaj
8d580ea7e8
follow-up the PR #3114
...
follow-up the commit d56c6af24e
2016-03-19 13:17:34 +09: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
cf792fd8d8
Update configurations to use RAMPS 1.4
2016-03-06 05:52:01 -08: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
e2b022cce2
Include #3053
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
Scott Lahteine
6165fd41a5
Fix Hephestos 2 and other configs
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
jbrazio
02b131b552
Replaced stock BQ PID values with fine tuned ones generated using M303
2016-03-06 05:51:57 -08:00
jbrazio
45dc8a51f3
Added readme file for bqh2 and disabled the SLOWDOWN config flag
2016-03-06 05:51:57 -08:00
jbrazio
b18816fcbf
Fine tuned XYJERK.
...
Disallowed the Z_PROBE_OFFSET_RANGE_MAX to be greater than zero.
2016-03-06 05:51:57 -08:00
jbrazio
be83036212
Applying suggestions by @thinkyhead at MarlinFirmware/Marlin#3049 .
...
- Remove the forced activation of SDSUPPORT, I guess people may use the ZUM
3D board and not the LCD module.
- Fixed the tab issue within boards.h file.
2016-03-06 05:51:56 -08:00
jbrazio
b82d91eca6
Added configuration example for the BQ Hephestos 2 3D printer.
...
Added support for BQ ZUM Mega 3D board and stock Hephestos 2 thermistor.
2016-03-06 05:51:56 -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
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
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
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
8dccd5a7ea
Merge pull request #3018 from CONSULitAS/RCBugFix_K8200_backinsync
...
K8200: sample config back in sync
2016-02-27 05:22:12 -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
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
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
Ruwan J Egoda Gamage
becbfe1065
Fixing Rigidbot LCD Panel Support
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
Scott Lahteine
62bad1b60f
Merge pull request #2848 from japzi/RCBugFix
...
Fixing Rigidbot LCD Panel Support
2016-01-26 17:30:12 -08:00
esenapaj
59d345a3dd
Update Configuration.h
2016-01-22 07:27:11 -06:00
esenapaj
b8f0c8a4c7
Update Configuration.h
2016-01-22 07:27:11 -06:00
esenapaj
df0d599c79
Update Configuration.h
2016-01-22 07:27:11 -06:00
esenapaj
a366697649
Update Configuration.h
2016-01-22 07:27:11 -06:00
esenapaj
8d2aa2368d
Update Configuration_adv.h
2015-12-23 08:16:36 +09:00
esenapaj
0de5fcad0a
Update Configuration_adv.h
2015-12-23 08:16:06 +09:00
esenapaj
1403b9acc0
Update Configuration_adv.h
2015-12-23 08:15:20 +09:00
esenapaj
5cf1c38ea1
Update Configuration_adv.h
2015-12-23 08:12:54 +09:00
esenapaj
04ab61bf40
Update Configuration_adv.h
2015-12-23 08:12:28 +09:00
esenapaj
39c62fbd6f
Update Configuration_adv.h
2015-12-23 08:12:04 +09:00
esenapaj
efcb769003
Update Configuration_adv.h
2015-12-23 08:09:57 +09:00
esenapaj
992fbb831d
Update Configuration_adv.h
2015-12-23 08:08:45 +09:00
esenapaj
5ee6fe6385
Update Configuration_adv.h
2015-12-23 08:07:12 +09:00
esenapaj
056daf00fc
Update Configuration_adv.h
2015-12-23 08:06:15 +09:00
esenapaj
71aafb79a0
Update Configuration_adv.h
2015-12-23 08:03:54 +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
Ruwan J Egoda Gamage
5eeea2f611
Fixing Rigidbot LCD Panel Support
2015-12-13 15:28:40 -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
Richard Wackerbarth
6bfcb74c25
The probe stowing coordinates have changed
2015-12-05 19:31:59 -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
AnHardt
33addc52a1
Suppress Z_MIN_PROBE_REPEATABILITY_TEST for DELTA and SCARA configurations (PR#2747)
...
For now Z_MIN_PROBE_REPEATABILITY_TEST is not possible for DELTA or SCARA
configurations.
This PR comments the feature out, where it is commented in by default.
2015-11-13 07:33:33 -06:00
Scott Lahteine
9b23490f01
Clean up spacing in configs
2015-11-12 00:03:21 -06:00
KiteLab
0ad25c6665
Hint for changed behaviour of SDSUPPORT
2015-09-28 11:07:33 -05: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
8b3d63c423
Unify Delta XYZ homing rates
...
As noted in #130 allen key probe stow rate is based on homing rates,
but homing rates were left out of most delta configs. This unifies the
XYZ homing rates and applies the unified rates to allen key movements.
2015-09-08 13:11:55 -05:00
Scott Lahteine
7c72b57313
Unify manual feedrate and Fix LCD MANUAL_FEEDRATE (PR#128)
...
As noted by @o-lampe at https://github.com/MarlinFirmware/MarlinDev/issues/114#issuecomment-136757614 the `MANUAL_FEEDRATE` for Delta Z should be the same as XY.
2015-09-08 13:11:55 -05:00
Scott Lahteine
a39fadf876
Update kossel-pro example config (again?)
2015-09-07 09:41:06 -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
Christian Lefrançois
8347a9d6e4
Fix HOMING_BUMP_DIVISOR for deltas configuration
...
* Re-bump speed divisor should be the same for delta printer.
2015-09-03 09:26:28 -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
Richard Marko
91fd66ffba
add Lulzbot TAZ4 example configuration (PR#104)
2015-08-27 08:36:43 -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
68055a5959
Include RIGIDBOT_PANEL in Conditionals
2015-08-02 22:26:41 -05:00
George Djabarov
f8ed3a835d
Added comment with the RigidBot Big bed size
2015-08-02 22:13:37 -05:00
George Djabarov
7deae6b6be
Updated RigidBot example configuration
...
- The default serial baud rate of 115200
- The regular RigitBot bed size 254mm/248mm/254mm
- Single stock extruder
- Stock termistors for extruder and hotbed
- Stock Min X/Y/Z stops. Max stops not connected
- Stock 32 teth tooleys (stock axis steps)
- No auto bed leveling
- No screen
2015-08-02 22:13:37 -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
AndySze
00dbf69b6d
add MINIPANEL defines
2015-07-23 22:51:40 -05:00
Scott Lahteine
d85861d296
Move macros, add ENABLED/DISABLED, add includes
2015-07-22 18:16:05 -05:00
Richard Wackerbarth
b80a6a8d31
Correct Kossel Pro Configuration_adv (PR#2473)
2015-07-22 16:32:08 -05:00
Scott Lahteine
129f986ccf
Add COREXZ option to configurations
2015-07-19 16:17:03 -05:00
Scott Lahteine
de25a48dec
Remove PID examples from preconfigured configs
2015-07-15 19:13:53 -05:00
Scott Lahteine
7456710a1f
Update configs formatting
2015-07-15 19:13:47 -05:00
Scott Lahteine
391386dd94
Update configs for new servo deactivation
2015-07-15 19:13:40 -05:00
Scott Lahteine
a0351bdb73
Remove STEPPER_RESET_FIX option
2015-07-11 16:04:11 -05:00
Scott Lahteine
8e61314323
Use RIGIDBOT_PANEL for consistency with online docs
2015-07-09 11:36:46 -05:00
Scott Lahteine
536f86e896
RigidBot CONTROLLERFAN_PIN in Configuration_adv.h
2015-07-09 11:36:46 -05:00
Scott Lahteine
9ebcae496d
RIGIDBOARD / RIGIDPANEL
2015-07-09 11:36:46 -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
98c9111a7d
Update delta configs with latest settings
2015-06-15 20:20:32 -05:00
Scott Lahteine
e6baf8afd9
Fix up allen key settings in delta configs
2015-06-15 20:20:31 -05:00
Scott Lahteine
3b293fc5d1
Move Delta settings lower in delta files
2015-06-15 20:20:31 -05:00
Scott Lahteine
df21857583
Move extruder offset settings next to extruders setting
2015-06-15 20:20:31 -05:00
Scott Lahteine
2dd1859247
Cleanup spaces and comments in configs and conditionals
2015-06-15 20:20:31 -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
Richard Wackerbarth
303d47228e
Define Probe Path in new format
2015-06-06 17:48:27 -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
b5743d6927
Use SOURCE_CODE_URL rather than FIRMWARE_URL
2015-05-25 15:53:34 -05: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
04a1622172
Merge pull request #2127 from Wackerbarth/Kossel_Pro
...
Kossel Pro
2015-05-21 18:43:26 -07:00
Scott Lahteine
81c2ca3e10
Merge pull request #2131 from thinkyhead/bq_is_ramps_13_efb
...
Witbox and Hephestos are RAMPS EFB
2015-05-21 18:39:02 -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
Richard Wackerbarth
b878bc5620
Introducing the Kossel Pro Build Configuration
2015-05-21 11:47:34 -05:00
Scott Lahteine
9d1961ebe3
Witbox and Hephestos are just RAMPS_13_EFB
2015-05-20 21:33:23 -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
b2bd9aae7c
SCARA_SEGMENTS_PER_SECOND
2015-05-12 04:18:15 -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
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
0e70511381
Merge pull request #2036 from brupje/mainline
...
Fixes for reprapworld's keypad
2015-05-08 18:19:31 -07: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
brupje
b7fcb11580
Added example configuration for Megatronics
2015-05-07 13:18:05 +02:00
Brian Gilbert
1285784a49
Add Boots Industries V2.5 example configuration
2015-05-04 09:10:42 +10:00
paclema
aedd580911
Updated all configuration.h examples
2015-05-03 02:28:43 +02: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
AnHardt
514d8ac460
Enable TRP for the bed
...
in all Configurations.
2015-04-29 08:47:01 +02:00
Scott Lahteine
2610b8d047
Enable thermal runaway protection by default
2015-04-28 17:40:29 -07:00
AnHardt
b4b19a6cbd
Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
...
Conflicts:
Marlin/Configuration.h
Marlin/configurator/config/Configuration.h
Marlin/example_configurations/Felix/Configuration.h
Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Conflicts with my Chinese implementation resolved.
2015-04-28 09:24:32 +02:00
Scott Lahteine
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
2015-04-27 22:35:41 -07:00
Scott Lahteine
c1fbef1722
Merge pull request #1988 from thinkyhead/bye_string_url
...
Remove obsolete STRING_URL
2015-04-27 22:12:05 -07:00
Scott Lahteine
185f8a0a66
Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config
...
Example Configuration for K8200: comments/URL/readme
2015-04-27 21:59:56 -07:00
Scott Lahteine
0970102950
Remove obsolete STRING_URL
2015-04-27 21:59:14 -07:00
Scott Lahteine
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
2015-04-27 21:47:47 -07:00
Scott Lahteine
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
...
Allow Y to home before X with option in Configuration_adv.h.
2015-04-27 21:41:14 -07:00
Scott Lahteine
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
...
We mark this historic day, when Marlin went to China.
2015-04-27 20:37:00 -07:00
Scott Lahteine
5b248757c7
Level Bed in Prepare submenu
...
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
2015-04-27 19:11:25 -07:00
CONSULitAS
6af40e9dc0
K8200 example Configuration.h: STRING_URL removed
...
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
2015-04-27 23:59:10 +02:00
CONSULitAS
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
...
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
2015-04-27 23:54:47 +02:00
Steve Kelly
98ca46006c
Allow Y to home before X with option in Configuration_adv.h.
...
This addresses comments in #1956 and #1079 . In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
2015-04-27 16:17:30 -04:00
AnHardt
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
2015-04-27 13:24:51 +02:00
Scott Lahteine
0fca084ea6
Make EEPROM reproducible in GCode
...
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.
- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
2015-04-26 20:56:33 -07:00
Scott Lahteine
5c29fda167
Add a warning for DISABLE_[XYZ] options
2015-04-25 00:46:33 -07:00
Scott Lahteine
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
2015-04-23 17:50:02 -07:00
AnHardt
064f2b37d0
More Beeper clean up.
...
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().
Enforced max. duration for M300 to 5 seconds.
Corrected description in 'Configuration.h'
LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
2015-04-20 11:11:13 +02:00
Ivan Galvez Junquera
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
and later spread to other files.
2015-04-17 16:10:58 +02:00
CONSULitAS
1de9b568db
Example Configuration for K8200: comments/URL/readme
...
Example Configuration for K8200 : comments/URL/readme
example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
2015-04-15 10:02:13 +02:00
CONSULitAS
0af5e3a04f
Example Configuration for K8200: comments/URL/readme
...
Example Configuration for K8200 : comments/URL/readme
example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
2015-04-15 10:00:41 +02:00
CONSULitAS
3851ac6226
Example Configuration for K8200 back in sync
...
example_configurations\K8200\Configuration.h:
* merge upstream changes from default Configuration.h manually
* add some machine specific comments
2015-04-14 17:12:42 +02:00
CONSULitAS
b447a4ffab
Merge remote-tracking branch 'upstream/Development' into Development
2015-04-14 15:35:08 +02:00
Scott Lahteine
ccddc280be
Apply three more commits
2015-04-12 22:47:44 -07:00
Scott Lahteine
74e4b42f7e
Default MACHINE_NAME to "3D Printer"
2015-04-12 17:17:41 -07:00
Scott Lahteine
c6bb98abad
machine name for hephestos too
2015-04-11 01:36:24 -07:00
Scott Lahteine
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
2015-04-10 21:29:42 -07:00
AnHardt
56fc3a4835
bgr -> bg
...
+ update in documentation
2015-04-09 13:09:18 +02:00
Natealus
585eee6549
Z Probe inverting not present in example configs, causes error
...
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
2015-04-08 18:57:30 -06:00
AnHardt
c5961892e3
Bulgarian for all the Configuration.h's
2015-04-09 01:52:13 +02:00
Scott Lahteine
4788b59300
Thermistor values for configurator
2015-04-08 03:12:21 -07:00
Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
2015-04-07 21:14:00 -07:00
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
2015-04-07 20:38:43 -07:00
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
2015-04-07 22:58:08 +02:00
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
2015-04-07 22:49:12 +02:00
Scott Lahteine
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
2015-04-06 23:16:01 -07:00
Scott Lahteine
967db181d0
Latest upstream commits
2015-04-06 21:46:18 -07:00
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
2015-04-06 23:03:06 +02:00
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
2015-04-06 19:38:59 +02:00
Edward Patel
61de6ecd54
Added change to example Configuration.h's
2015-04-05 04:26:35 +02:00
Scott Lahteine
c065da52ec
Spacing and spelling
2015-04-03 22:54:48 -07:00
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
2015-04-03 20:45:24 -07:00
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
2015-04-03 18:14:57 -07:00
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
2015-04-03 15:31:35 -07:00
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
2015-03-31 03:20:15 -07:00
Scott Lahteine
82794fa5f7
Add delta generic not renaming
2015-03-30 23:25:04 -07:00
Scott Lahteine
ba2c7cb467
Update configs with all the latest
2015-03-30 23:24:33 -07:00
Scott Lahteine
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
2015-03-28 14:13:25 -07:00
Scott Lahteine
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
2015-03-27 20:29:05 -07:00
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
2015-03-27 18:24:19 -07:00
AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
2015-03-26 10:05:00 +01:00
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
2015-03-25 21:24:38 -07:00
Scott Lahteine
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
2015-03-25 21:20:50 -07:00
AnHardt
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
2015-03-25 11:51:41 +01:00
CONSULitAS
045ea42cc8
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-24 22:52:02 +01:00
AnHardt
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
...
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
2015-03-24 16:59:15 +01:00
Scott Lahteine
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 22:08:50 -07:00
Scott Lahteine
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-23 21:13:04 -07:00
Scott Lahteine
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 21:12:36 -07:00
CONSULitAS
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-23 17:40:49 +01:00
wurstnase
e6f6c6e3a1
fix bad insertion config again
2015-03-23 08:32:48 +01:00
Scott Lahteine
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-22 23:40:29 -07:00
Scott Lahteine
4fbb80567e
Get upstream commits
2015-03-22 23:07:22 -07:00