Richard Wackerbarth
329acc852e
Canonize Option flag USE_AUTOMATIC_VERSION
10 years ago
AnHardt
09571b7753
Boot-screen for the character displays
...
Uses about 488 byte of progmem and 32 byte of RAM.
For that configurable.
10 years ago
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.
10 years ago
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`
10 years ago
Scott Lahteine
37d1879386
Apply overridables to Configuration files
10 years ago
Scott Lahteine
edaaead7e0
Fix comment about SERVO_ENDSTOP_ANGLES
10 years ago
Scott Lahteine
0af2a80e06
Make SERVO_ENDSTOP_ANGLES 2-dimensional
10 years ago
Richard Wackerbarth
ae00fad75b
Rename as M100
10 years ago
Richard Wackerbarth
ed7d45e8f5
Memory watcher
10 years ago
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.
10 years ago
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.
10 years ago
AndySze
00dbf69b6d
add MINIPANEL defines
10 years ago
AnHardt
4e14e152fa
Add Travis tests for CORXY and COREXZ
10 years ago
Scott Lahteine
d85861d296
Move macros, add ENABLED/DISABLED, add includes
10 years ago
Scott Lahteine
129f986ccf
Add COREXZ option to configurations
10 years ago
Scott Lahteine
391386dd94
Update configs for new servo deactivation
10 years ago
AnHardt
5243d8b523
Deactivate DEACTIVATE_SERVOS_AFTER_MOVE by default
10 years ago
AnHardt
49609f6c14
Activate the new servo.move() function
...
by replacing the sequences (attach, write, delay, detach), and their conditions with the new function in Marlin.main.cpp
and removing the old configuration in the ABL part of Configuration.h
10 years ago
AnHardt
40b6edcad7
Introduce DEACTIVATE_SERVOS_AFTER_MOVE in Configuration.h
...
DEACTIVATE_SERVOS_AFTER_MOVE is ought to replace PROBE_SERVO_DEACTIVATION_DELAY.
But it will work on all servo moves, not only the probe servo moves.
10 years ago
Scott Lahteine
c3c605c658
Move note about LiquidTWI2 to Configuration.h (PR#2406)
10 years ago
Scott Lahteine
dc40a5f6e0
Patch up more outdated config lines
10 years ago
Scott Lahteine
a274769f4f
Clean up spacing and comments
...
Also clean up some trailing spaces in a few other sources
10 years ago
Scott Lahteine
d3bce05d54
Fix up spacing for filament sensor values
10 years ago
Scott Lahteine
b4b10a57fe
Fix configurator section directives and values lists
10 years ago
Scott Lahteine
bba14dcbe6
Move Z Safe Homing point to the middle of the movement range
10 years ago
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.
10 years ago
Ed Boston
b94a0e1501
Added ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
...
The new define allows the sd card detect to be inverted or not from
Configuration.h
10 years ago
AnHardt
d1f4471000
Merge pull request #2146 from Wackerbarth/Versioning
...
Versioning
10 years ago
fmalpartida
11e3f3375d
Merge commit '764e61708b8e73410c7819d59c4970d7089ca6f5' into bugFixing
...
Updated LCD wiki location.
10 years ago
fmalpartida
93da52d011
Added support for OLED SSD1306 I2C based LCDs.
10 years ago
Jonathan Bastien-Filiatrault
e86f2342c0
Separate the maximum integral power for the bed from PID_INTEGRAL_DRIVE_MAX / PID_MAX.
...
My PID_INTEGRAL_DRIVE_MAX was at 96, which was insufficient for my bed
to reach its intended temperature. The head requires a low maximum power since
I run on 24 volts and it has a somewhat low thermal mass.
10 years ago
Richard Wackerbarth
5ea139fd79
Revised Versioning mechanism
10 years ago
Scott Lahteine
38cc0b93c6
Merge pull request #1874 from AnHardt/Bulgarian
...
Introduction of Bulgarian - language_bg.h
10 years ago
Ed Boston
152b681bb5
Added link to controller github
...
Added the link to the github information about the
ELB_FULL_GRAPHIC_CONTROLLER
10 years ago
AnHardt
e353d27430
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Bulgarian
10 years ago
Ed Boston
ca8d1756d5
Define fixes
...
Fixed a couple defines that were not changed or commented out.
10 years ago
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
10 years ago
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.
10 years ago
Ed Boston
1999ac415c
Formatting Changes
...
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
10 years ago
Ed Boston
41f8cdb3a6
ADAFRUIT_ST7565
...
Added support for new display type
10 years ago
Scott Lahteine
78beef2d73
Use Mendel default for INVERT_Y_DIR
10 years ago
Scott Lahteine
f65833931d
Formatting tweaks
10 years ago
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
10 years ago
Scott Lahteine
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
10 years ago
Scott Lahteine
181ccc884c
Edit thermal runaway description
10 years ago
paclema
26015b02d8
Fixed typo and updated Configuration.h of configurator
10 years ago
paclema
aedd580911
Updated all configuration.h examples
10 years ago
Scott Lahteine
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
10 years ago
paclema
013a09dbe6
Added configurable script for filrunout form configuration.h
10 years ago
AnHardt
514d8ac460
Enable TRP for the bed
...
in all Configurations.
10 years ago
Scott Lahteine
2610b8d047
Enable thermal runaway protection by default
10 years ago
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.
10 years ago
Scott Lahteine
0970102950
Remove obsolete STRING_URL
10 years ago
AnHardt
6b1b71837c
Intit. commit for Chinese
...
Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
Added Chinese font to make_fonts.bat
Created 'dogm_font_data_ISO10646_CN.h'
Added Chinese to 'language.h'
Added 'language_cn.h' with some minor edits.
Added Chinese font in 'language_en.h' to not fall back to European font.
Added cn to 'Configuration.h'
Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.
In 'dogm_lcd_implementation.h'
Added Chinese Font
Made 1 pixel more room for the larger Chinese font on the status line.
Changed geometry of the 'select bar' by one pixel.
Changed the way the position for values and postcars are set.
10 years ago
Scott Lahteine
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
AnHardt
3a27a78f9e
Commented REPRAP_DISCOUNT_SMART_CONTROLLER again
...
and removed some tabs.
10 years ago
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.
10 years ago
Scott Lahteine
74e4b42f7e
Default MACHINE_NAME to "3D Printer"
10 years ago
Scott Lahteine
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
10 years ago
AnHardt
56fc3a4835
bgr -> bg
...
+ update in documentation
10 years ago
AnHardt
6248c93f37
Introduction of Bulgarian - language_bgr.h
...
Thank you @Nprod!
10 years ago
Edward Patel
7dc64efe67
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
Scott Lahteine
4788b59300
Thermistor values for configurator
10 years ago
Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
Scott Lahteine
967db181d0
Latest upstream commits
10 years ago
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
Richard Wackerbarth
46474cf2f2
Incorporate @section headers from configurator
10 years ago
Edward Patel
d24ea7c03f
Added Comment in hope of github seeing these updates
10 years ago
Edward Patel
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
quillford
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
10 years ago
Scott Lahteine
c065da52ec
Spacing and spelling
10 years ago
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
10 years ago
Scott Lahteine
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
10 years ago
Edward Patel
6b91b7b411
Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
...
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
10 years ago
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
10 years ago
Chris Roadfeldt
a508d835db
Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
...
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
10 years ago
Chris Roadfeldt
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
10 years ago
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
10 years ago
Scott Lahteine
935592cf6a
offsets off by default
10 years ago
Scott Lahteine
2a45922afe
Restore extruder_offset, init more simply
10 years ago
Chris Roadfeldt
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
Scott Lahteine
ba2c7cb467
Update configs with all the latest
10 years ago
Chris Roadfeldt
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
Chris Roadfeldt
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
Scott Lahteine
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
Chris Roadfeldt
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
10 years ago
Chris Roadfeldt
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
10 years ago
Chris Roadfeldt
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
10 years ago
Chris Roadfeldt
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
Chris Roadfeldt
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
Chris Roadfeldt
44b88b41a2
Added credit for code.
10 years ago
Chris Roadfeldt
2979b40a7a
Fixed typo in Z Probe and Endstop section.
10 years ago
Chris Roadfeldt
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
10 years ago
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
Scott Lahteine
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
10 years ago
Scott Lahteine
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
Christian Bohn
eab5fad539
code formatting
10 years ago
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
Scott Lahteine
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
chris-bo
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
10 years ago
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'
10 years ago
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
10 years ago
Scott Lahteine
4fbb80567e
Get upstream commits
10 years ago
Scott Lahteine
7717e1ce33
Fix bad insert in configuration
10 years ago
Scott Lahteine
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
Scott Lahteine
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
Scott Lahteine
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
Edward Patel
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
AnHardt
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
10 years ago
Scott Lahteine
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
Scott Lahteine
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
Scott Lahteine
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
AnHardt
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
...
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
10 years ago
AnHardt
e917477fec
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/fonts/make_fonts.bat
Claerd conflicts with my own #1621 . (His was easy. :-) )
corrected typo in fonts/README.fonts
Applied changes to the new delta-configurations
and deletet there some extra whitespace at the line-endings.
10 years ago
Edward Patel
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
10 years ago
AnHardt
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
10 years ago
AnHardt
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
10 years ago
maverikou
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
Edward Patel
e983a5ab92
Disable option. Enable for use/test.
10 years ago
Edward Patel
f34b9c83d1
Added comment about MESH_NUM axis points.
10 years ago
Scott Lahteine
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 years ago
Edward Patel
8005d22c81
Added menu option for bed leveling.
10 years ago
Edward Patel
0e51e53813
WIP. Adding bed leveling code.
10 years ago
AnHardt
2f374f1465
Removed Kanji.
10 years ago
Scott Lahteine
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
AnHardt
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
10 years ago
Scott Lahteine
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
10 years ago
Mehmet Sutas
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
10 years ago
AnHardt
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
10 years ago
alexborro
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
10 years ago
AnHardt
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
10 years ago
alexborro
5bf42066fa
Fix typo in configuration.h
10 years ago
alexborro
8a4b62d081
Set more regular setup in configuration.h
10 years ago
alexborro
60ceca1bc1
Add speed configuration for home-bumping movement
10 years ago
Mehmet Sutas
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
10 years ago
maverikou
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
10 years ago
Scott Lahteine
0f3b7d5575
Update annotated configurations
...
- Also update base configs
10 years ago
Scott Lahteine
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
10 years ago
Scott Lahteine
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
10 years ago
Scott Lahteine
a99470fbb0
Merge pull request #1527 from maverikou/panel_one
...
Added support for PanelOne from T3P3.
10 years ago
maverikou
8742b6bd56
Merge branch 'Development' into panel_one
10 years ago
AnHardt
c6d2ebe452
Extend the idea of dummy temperature sensors.
...
Added a second sensor and made them configurable.
10 years ago