zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
3487 commits 1 branch 0 tags 156 MiB
Commit graph

212 commits

Author SHA1 Message Date
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
Scott Lahteine 7717e1ce33 Fix bad insert in configuration 2015-03-22 21:48:46 -07:00
Scott Lahteine 146501215f Fix mangled probe_pt calls 
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
 2015-03-22 21:45:20 -07:00
Scott Lahteine 88e81a4804 Latest upstream commits, plus fixes 
- Also add Manual Bed Leveling to the rest of the configs
 2015-03-21 16:12:57 -07:00
Scott Lahteine 2c9bd15625 Move LCD items to Conditionals.h 
- `Conditionals.h` is included twice, setting LCD values the first time
 2015-03-21 15:24:57 -07:00
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
 2015-03-20 13:35:47 +01:00
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing 
Latest upstream changes
 2015-03-20 04:15:18 -07:00
Scott Lahteine b6d381f863 Divide up Conditionals to get LCD items early 2015-03-20 02:50:28 -07:00
AnHardt e85061d20d Added changes to the 'new' Configuration.h s 2015-03-20 10:36:29 +01:00
Scott Lahteine 8ade04b78e Felix and Hephestos configs 
- Not sure why these are showing as all new
 2015-03-19 22:25:05 -07:00
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
 2015-03-19 22:22:23 -07:00
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>
 2015-03-20 00:07:36 +01:00
CONSULitAS 9c1f6e7ac7 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-19 18:49:34 +01:00
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.
 2015-03-19 12:35:43 +01:00
CONSULitAS 2b1ddc0413 Merge remote-tracking branch 'upstream/Development' into Development 2015-03-16 22:12:17 +01:00
maverikou e93eb3e8d3 Update test 2015-03-16 09:16:00 +02:00
maverikou b8ae3feb9e Update test 2015-03-16 09:03:15 +02:00
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level 
Conflicts:
	Marlin/Marlin_main.cpp
 2015-03-16 08:24:26 +02:00
Scott Lahteine a686c9878f Move TOPO_ORIGIN define to Configuration.h 
- Addressing issue #1608
 2015-03-15 15:49:36 -07:00
CONSULitAS a8c1bdabd2 Update: readme.md for K8200 example 
* readme.md: updated typo and URLs
 2015-03-15 17:25:31 +01:00
chrono 4d878b9bac Fixed path typos in README 2015-03-14 10:18:12 +00:00
chrono 12ec557a75 Added DEFAULT_TRAVEL_ACCELERATION 2015-03-14 10:14:13 +00:00
chrono 1d25d510bc Upstream Merge Fixes 2015-03-14 09:48:30 +00:00
chrono a89d690b77 Merge remote-tracking branch 'upstream/Development' into pr-felix 2015-03-14 09:25:43 +00:00
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.
 2015-03-11 13:19:02 -03:00
alexborro 60ceca1bc1 Add speed configuration for home-bumping movement 2015-03-10 14:08:32 -03:00
Greg Alexander 4fba7b084f fix typo in delta example config introduced in 
commit 697ee2dc50
 2015-03-07 16:43:41 -05:00
maverikou e6862700af Add Z_RAISE_AFTER_PROBING to all config files 2015-03-07 20:55:30 +02:00
maverikou 39d255608d Test an extra delta configuration with auto bed leveling code paths 2015-03-07 20:53:23 +02:00
maverikou 7c24b97958 Ported over Johann Rocholl's improvements for delta printers: 
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
 2015-03-07 20:36:21 +02:00
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
 2015-03-06 22:14:34 -08:00
chrono 0a7d85c20e Minor fixes 2015-03-04 12:35:32 +00:00
chrono d8eeddfb93 Updated DUAL Extruder config, added README and enabled NEWPANEL by default 2015-03-04 09:59:58 +00:00
chrono b423b90c77 Added Configuration_adv.h to examples for LCD/SD Support 2015-03-03 19:09:25 +01:00
chrono 7540a81106 Minor fixes 2015-03-02 22:55:00 +01:00