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

110 commits

Author SHA1 Message Date
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
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
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
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
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
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
chrono 08bc723a3c Enable PIDBED 2015-03-02 10:26:42 +00:00
chrono e487bd642b Updated PR to streamline integration 2015-03-02 09:49:45 +00:00