Compare commits

...

116 Commits

Author SHA1 Message Date
Scott Lahteine
dd00f8b1a8 🔖 Marlin 1.1.9.2 2023-07-18 20:31:39 -05:00
Scott Lahteine
b0a091e632 🔨 PlatformIO 6 compatibility 2023-07-18 20:30:54 -05:00
Jason Pepas
4dd14704dc 📌 Fixed versions for library, toolchain (#24784) 2022-09-26 16:22:12 -05:00
Scott Lahteine
02dcc0b80e 🔨 Update TMC26XStepper link
See #23874
2022-04-26 03:43:50 -05:00
Scott Lahteine
1314b31d97 Update Version.h 2020-06-20 23:02:29 -05:00
Scott Lahteine
fcbf55eb6d Add missing thermistor names
Fixes #17903

Co-Authored-By: SantinoDnepr <santinodnepr@users.noreply.github.com>
2020-05-10 05:04:20 -05:00
Scott Lahteine
9b555f2fee Merge bugfix-1.1.x into 1.1.x 2020-03-18 15:43:28 -05:00
Scott Lahteine
957f707629 Disable integration testing 2020-01-08 16:19:56 -06:00
Scott Lahteine
f4bf94f7b2 Links for the "New Issue" page 2019-11-30 09:19:33 -06:00
Chris Pepper
014ec3e81c Update bug_report.md
Make the configs zip file requirement more prominent
2019-11-03 21:04:33 +00:00
Scott Lahteine
0110faa717 Fix Creality bed thermistor
Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
2019-09-02 05:38:25 -05:00
David Souza
909c01554a Fix PT-BR strings (#15023) 2019-09-02 05:38:25 -05:00
David Souza
f3faaed243 Fix #else extra tokens (#15013) 2019-09-02 05:38:25 -05:00
Bob Kuhn
e5a4f19e5b [1.1.x] Autobuild formatting (#14858) 2019-09-02 05:38:25 -05:00
InsanityAutomation
37bfc5ab9f [1.1.x] BLTouch 3.0 - 3.1 (#14839) 2019-09-02 05:38:25 -05:00
Bob-the-Kuhn
1ab59d6cd9 Revert "move PR #14857 Autobuild update into bugfix 1.1.x"
This reverts commit 73f4027e39.
2019-09-02 05:38:25 -05:00
Bob-the-Kuhn
fb276f677f move PR #14857 Autobuild update into bugfix 1.1.x
see PR #14857 for details
2019-09-02 05:38:25 -05:00
InsanityAutomation
65ff80411f [1.1.x] BLTOUCH_V3 parity with 2.0.x (#13682)
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
2019-09-02 05:38:25 -05:00
Scott Lahteine
a5fe0ed158 Reduce XY homing feedrate in Creality configs
Counterpart to #13595

Co-Authored-By: swilkens <stefanwilkens@gmail.com>
2019-09-02 05:38:25 -05:00
Damien Martin-Guillerez
f73829318f Add support for the V3 of the BlTouch (#13596)
V3 of the BLTouch has an [Alarm Release & Touch mode](https://docs.wixstatic.com/ugd/f5a1c8_77037f55e5d542309d9fc178165c9f3f.pdf) to activate after the probe is deployed. If this mode isn't activated, the BLTouch keeps deploying, ends up detecting a collision and gets itself in error mode.

Tested on a Creality Ender-3.
2019-09-02 05:38:25 -05:00
Ludy
5f783b4fe9 [1.1.x] Fix German language (#13438) 2019-09-02 05:38:25 -05:00
Ludy
8d9380be71 Fix missing quotation marks (#13424) 2019-09-02 05:38:25 -05:00
mbm60
cc6d7812c9 Fix pin assignment to KILL_PIN in MKS_MINI_12864 (#13397) 2019-09-02 05:38:25 -05:00
Scott Lahteine
9180235ad2 German patch
Followup to #13136 by @Ludy87
2019-09-02 05:38:24 -05:00
Scott Lahteine
6a45d52bb4 Remove dead code in get_pid_output, consolidate
See #12981
2019-09-02 05:38:24 -05:00
Kit Adams
2ecd75c14a UBL G29 T current position fix (#12845) 2019-09-02 05:38:24 -05:00
FernandoVelcic
9ede2cfe00 Fix spanish translations (#13235) 2019-09-02 05:38:24 -05:00
AnHardt
8899b5804f [1.1.x] Fix autotemp_factor menu setting (#13227) 2019-09-02 05:38:24 -05:00
Scott Lahteine
951ed3fd64 Fix PSU pin initialization 2019-09-02 05:38:24 -05:00
7eggert
7aedf18fd9 Optional ADC_KEYPAD pin with ANET_10 (#13158) 2019-09-02 05:38:24 -05:00
7eggert
dea37780ca Fix LCD button / newbutton issue (#13157) 2019-09-02 05:38:24 -05:00
Ludy
1f0fe23c50 [1.1.x] Update German language (#13149) 2019-09-02 05:38:24 -05:00
Ludy
93c3d4b33e [1.1.x] Update German language (#13136) 2019-09-02 05:38:24 -05:00
Giuliano Zaro
9c5eebf65d [1.1.x] Fix TEMP_STAT_LED startup init (#13121) 2019-09-02 05:38:24 -05:00
David Souza
ffc424f556 Fix language_pt-br warnings due to extra tokens at end of #else directive (#13084) 2019-09-02 05:38:24 -05:00
Roxy-3D
46daed8b0e Fix probe location bug.... 2019-09-02 05:38:24 -05:00
Scott Lahteine
6960cd8e28 Apply lowercase to some common methods 2019-09-02 05:38:24 -05:00
Nathan
ca36be46de Fix the delta homing issue (#13001) 2019-09-02 05:38:24 -05:00
Ondřej Nový
a659f55cf1 [1.1.x] Level bed corners Z-hop height option (#12859) 2019-09-02 05:38:24 -05:00
swilkens
658f62e8b3 [1.1.x] Correct Ender 3 bed size (#12768) 2019-09-02 05:38:24 -05:00
Roman Moravčík
544990604e [1.1.x] Limit PID autotune target to maxtemp-15 (#12703) 2019-09-02 05:38:24 -05:00
Roman Moravčík
3e459a071a [1.1.x] Limit hotend / bed temperature to maxtemp-15. (#12702) 2019-09-02 05:38:24 -05:00
Ondřej Nový
2a2c6c2d6f [1.1.x] Update Czech translation (#12684) 2019-09-02 05:38:24 -05:00
Ondřej Nový
ef2f09fd23 [1.1.x] Set DEFAULT_NOMINAL_FILAMENT_DIA to 1.75 in Anet A6 config (#12663) 2019-09-02 05:38:24 -05:00
Ondřej Nový
e99a1fb46f [1.1.x] Enable PIDTEMPBED in Anet A8 example config (#12654) 2019-09-02 05:38:24 -05:00
Luc Van Daele
eddb785bee [1.1.x] G33 clean up (#12649)
Remove obsolete workarounds in G33 for the now fixed zprobe_zoffset bug
2019-09-02 05:38:24 -05:00
Scott Lahteine
d7e82b9b81 Fix MBL error messages 2019-09-02 05:38:24 -05:00
Scott Lahteine
97da93fbb8 Fix kill with MSG_POWER_LOSS_RECOVERY 2019-09-02 05:38:24 -05:00
Scott Lahteine
eb0b685c55 Fix MBL XY parameter error messages 2019-09-02 05:38:24 -05:00
Scott Lahteine
d1cf029deb Rename to match case 2019-09-02 05:38:23 -05:00
I-am-me
c63d466fd0 Update French language (#12246) 2019-09-02 05:38:23 -05:00
Scott Lahteine
c7ed706f43 Fix endstops.monitor_flag 2019-09-02 05:38:23 -05:00
tobbelobb
9ea9fde491 Init Hangprinter D-axis, count D-axis advance_dividend, delta_offsets (#12181) 2019-09-02 05:38:23 -05:00
Scott Lahteine
83fe07d80a One more IS_SD_PRINTING 2019-09-02 05:38:23 -05:00
Zach Welch
6110a54635 Add M524 to abort SD printing (#11386) 2019-09-02 05:38:23 -05:00
Scott Lahteine
cee63a1688 Add parentheses to card macros 2019-09-02 05:38:23 -05:00
Paul
68464005cf Fix hole to hole rod length for Plus model (#12157) 2019-09-02 05:38:23 -05:00
Scott Lahteine
e443ebb988 Don't use ENABLED with *INVERTING 2019-09-02 05:38:23 -05:00
MrDiba
3dbe53283f Anycubic Kossel Z probe invert fix (#12101) 2019-09-02 05:38:23 -05:00
swilkens
1a5f2fa2c9 [1.1.x] Reduce HOMING_FEEDRATE_XY for Ender 3 (#12104)
Homing on the Ender 3 with `HOMING_FEEDRATE_XY` set to 50*60 was shown (#12074) to cause the end-stop micro-switches to bottom out, causing the carriage for both X and Y axis to physically crash into the micro switch. Reducing the homing speed prevents the switches from bottoming out.
2019-09-02 05:38:23 -05:00
Scott Lahteine
9959a91eca Fix lite status screen SD % 2019-09-02 05:38:23 -05:00
Scott Lahteine
0c74e47a37 EINSY_RETRO uses same delays as EINSY_RAMBO
Co-Authored-By: marcio-ao <marcio@alephobjects.com>
2019-09-02 05:38:23 -05:00
Scott Lahteine
1321941d03 Safer delays for EINSY_RAMBO + RRDFGSC 2019-09-02 05:38:23 -05:00
Scott Lahteine
aa9e4687d7 Fix Anycubic Kossel config 2019-09-02 05:38:23 -05:00
Scott Lahteine
c32d2e3ae8 Fix lightweight UI hotends display 2019-09-02 05:38:23 -05:00
Scott Lahteine
f94c3210b6 Create FUNDING.yml 2019-08-08 06:10:54 -05:00
Scott Lahteine
340fb15d2a Fix flattr link
Co-Authored-By: MarcelMo <marcelmo@users.noreply.github.com>
2019-07-19 00:12:05 -05:00
Scott Lahteine
5d96a6d983 No Support Requests 2019-04-04 00:12:36 -05:00
Scott Lahteine
5befb30701 Update issue templates 2019-03-03 10:14:15 -06:00
Scott Lahteine
24b7070bbb CR10mini E steps of 95
See https://www.patreon.com/posts/creality-cr10-24602624
2019-03-03 10:14:15 -06:00
Scott Lahteine
3a70028d5c Update README.md 2019-03-03 10:14:15 -06:00
Scott Lahteine
5cf6c44f47 Version 1.1.9 2018-09-29 19:29:54 -05:00
Scott Lahteine
624fd8c9ff Merge bugfix-1.1.x 2018-09-29 19:29:48 -05:00
Scott Lahteine
0640bd0282 Version 1.1.8 2017-12-31 01:50:08 -06:00
Scott Lahteine
21ba70d587 Fixups for 1.1.8 2017-12-31 01:50:00 -06:00
Scott Lahteine
dcd405275c Merge remote-tracking branch 'upstream/bugfix-1.1.x' into release_version_118 2017-12-25 09:50:57 -06:00
Scott Lahteine
20f6a4582d Version 1.1.7 2017-12-21 17:05:52 -06:00
Scott Lahteine
e0dba46271 Merge latest bugfix-1.1.x 2017-12-21 17:05:20 -06:00
Scott Lahteine
8dc10fb4c2 Version 1.1.6 2017-10-14 16:04:53 -05:00
Scott Lahteine
3571dd0ad6 Fix Emergency Parser
Followup to #7459
2017-10-14 16:04:53 -05:00
Scott Lahteine
22c968ee32 Merge remote-tracking branch 'upstream/bugfix-1.1.x' into 1.1.x 2017-10-10 02:47:02 -05:00
Scott Lahteine
9c00cff898 Version 1.1.5 2017-08-28 18:46:39 -05:00
Scott Lahteine
f9b9df2497 Merge branch 'bugfix-1.1.x' into new_release_115 2017-08-28 18:42:13 -05:00
Scott Lahteine
d3bc877007 Version 1.1.4 2017-07-05 17:17:10 -05:00
Scott Lahteine
700549ee5d Merging from bugfix 2017-07-05 17:16:39 -05:00
Scott Lahteine
b2c20a8c0f Version 1.1.3 2017-06-04 17:30:24 -05:00
Scott Lahteine
ece7a2bf36 Unused var in Stepper 2017-06-04 17:30:24 -05:00
Scott Lahteine
d87845052d Ensure safe temperature for M600 2017-06-04 17:30:23 -05:00
Scott Lahteine
ea74ceb791 Maintain message scroll rate 2017-06-04 17:30:22 -05:00
Scott Lahteine
87b591bf53 Merge remote-tracking branch 'upstream/bugfix-1.1.x' into release_113 2017-06-04 12:38:19 -05:00
Scott Lahteine
515f05093f Version 1.1.2 2017-05-30 17:55:55 -05:00
Scott Lahteine
b6d5886dce Patch M24 / M125 for delta 2017-05-30 17:55:55 -05:00
Scott Lahteine
17f8a494bf Merge latest bugfix 2017-05-30 16:03:17 -05:00
Scott Lahteine
5996c3a907 1.1.1 Readme / Version 2017-05-12 05:37:35 -05:00
Scott Lahteine
bb7e3f1d07 Patch configuration temp units 2017-05-07 23:09:40 -05:00
Scott Lahteine
c9bfe7004c Adjust spacing of "spaces" 2017-05-07 23:09:40 -05:00
Scott Lahteine
fa9e54146a Patch redundant lcd settings 2017-05-07 23:09:40 -05:00
Scott Lahteine
0079166388 Spacing adjustment, ubl_G29 2017-05-07 23:09:40 -05:00
Scott Lahteine
232f5d235d Patch mfqp for use directly with MarlinDocumentation 2017-05-07 23:09:40 -05:00
Scott Lahteine
41cf1c9e6a Note 5 extruders in config comments 2017-05-07 23:09:40 -05:00
Scott Lahteine
2e61c1fb37 Patch missing const in temp_abs 2017-05-07 23:09:39 -05:00
Brian
a68084f417 Improve BLTOUCH_HEATERS_OFF functionality
- rename to PROBING_HEATERS_OFF
 - move heater pausing functionality into thermalManager
   - add variables, pause(), ispaused(), other functions
 - add fan pausing functionality -> PROBING_FANS_OFF
 - add probing_pause() wrapper
 - move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
 - example configs
2017-05-07 23:09:39 -05:00
Scott Lahteine
d5346a0689 Adjust spacing in LSF 2017-05-07 23:09:39 -05:00
Roxy-3D
c45b668142 More misc UBL fixes and update gMax examples (#6632)
I think I forgot to Sync before I committed last time.   Some UBL
changes did not stick.

Also, update the gMax configuaration.h file so other than unique numbers
and settings, it exactly matches the default configuration.h file.
2017-05-07 23:09:39 -05:00
Roxy-3D
ad0e5928f5 misc. UBL fixes (#6631)
* Restore LSF functionality

Some of the typo's persisted...   Hopefully this gets them all fixed.

* Restore user's expectations of how G28 should behave

* Allow Nozzle size control with ornery host programs
2017-05-07 23:09:39 -05:00
lrpirlet
06ca56a13c G29 P1 stops reporting Invalid location with this patch 2017-05-07 23:09:39 -05:00
Scott Lahteine
fbd021a756 Support temperature units in M503 2017-05-07 23:09:38 -05:00
bgort
d99794f11d Various improvements - mostly UBL-related (#6607)
UBL Clean up.
2017-05-07 23:09:38 -05:00
Scott Lahteine
c0f1052efb Fix mfrb and mfpub 2017-05-07 23:09:38 -05:00
Scott Lahteine
bf7ecc761f Edit configuration comments 2017-05-07 23:09:38 -05:00
Scott Lahteine
d0480c15ef Tweak git helper scripts 2017-05-07 23:09:38 -05:00
Scott Lahteine
771f42744a Tweak command index increment 2017-05-07 23:09:38 -05:00
Scott Lahteine
3a44157ee8 Minor fix in K8200 readme 2017-05-07 23:09:38 -05:00
Max Matveev
a666ff1255 Fixed USE_CONTROLLER_FAN #define usage 2017-05-07 23:09:37 -05:00
bgort
264f0960f7 fix error in M105 output -- use SERIAL_PROTOCOL for ints instead of SERIAL_PROTOCOL_F (#6584)
also removed wayward 'address of' ampersand in setTargetHotend and setTargetBed parameters
2017-05-07 23:09:37 -05:00
Scott Lahteine
03f94a7a18 1.1.0 ReadMe, Version, helper scripts 2017-05-07 23:09:37 -05:00
10 changed files with 169 additions and 69 deletions

1
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1 @@
custom: http://www.thinkyhead.com/donate-to-marlin

43
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,43 @@
---
name: Bug report
about: Report a bug in Marlin
title: "[BUG] (short description)"
labels: ''
assignees: ''
---
<!--
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
-->
### Bug Description
<!-- Description of the bug -->
### My Configurations
**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
### Steps to Reproduce
<!-- Please describe the steps needed to reproduce the issue -->
1. [First Step]
2. [Second Step]
3. [and so on...]
**Expected behavior:** [What you expect to happen]
**Actual behavior:** [What actually happens]
#### Additional Information
* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

17
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@@ -0,0 +1,17 @@
blank_issues_enabled: false
contact_links:
- name: Marlin Documentation
url: http://marlinfw.org/
about: Lots of documentation on installing and using Marlin.
- name: MarlinFirmware Facebook group
url: https://www.facebook.com/groups/1049718498464482
about: Please ask and answer questions here.
- name: Marlin on Discord
url: https://discord.gg/n5NJ59y
about: Join the Discord server for support and discussion.
- name: Marlin Discussion Forum
url: http://forums.reprap.org/list.php?415
about: A searchable web forum hosted by RepRap dot org.
- name: Marlin Videos on YouTube
url: https://www.youtube.com/results?search_query=marlin+firmware
about: Tutorials and more from Marlin users all around the world. Great for new users!

View File

@@ -0,0 +1,35 @@
---
name: Feature request
about: Request a Feature
title: "[FR] (feature request title)"
labels: ''
assignees: ''
---
<!--
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
-->
### Description
<!-- Description of the requested feature -->
### Feature Workflow
<!-- Please describe the feature's behavior, user interaction, etc. -->
1. [First Action]
2. [Second Action]
3. [and so on...]
#### Additional Information
* Provide pictures or links that demonstrate a similar feature or concept.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

View File

@@ -1,31 +1,16 @@
<!-- # NO SUPPORT REQUESTS PLEASE
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/code_of_conduct.md Support Requests posted here will be automatically closed!
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/. This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. See https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#i-dont-want-to-read-this-whole-thing-i-just-have-a-question.
Before filing an issue be sure to test the 1.1 and/or 2.0 "bugfix" branches to see whether the issue is already addressed. For best results getting help with configuration and troubleshooting, please use the following resources:
--> - RepRap.org Marlin Forum http://forums.reprap.org/list.php?415
- Tom's 3D Forums https://discuss.toms3d.org/
- Facebook Group "Marlin Firmware" https://www.facebook.com/groups/1049718498464482/
- Facebook Group "Marlin Firmware for 3D Printers" https://www.facebook.com/groups/3Dtechtalk/
- Marlin Configuration https://www.youtube.com/results?search_query=marlin+configuration on YouTube
- Marlin Discord server. Join link: https://discord.gg/n5NJ59y
### Description After seeking help from the community, if the consensus points to to a bug in Marlin, then you should post a Bug Report at https://github.com/MarlinFirmware/Marlin/issues/new/choose).
<!-- Description of the bug or requested feature -->
### Steps to Reproduce
<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->
1. [First Step]
2. [Second Step]
3. [and so on...]
**Expected behavior:** [What you expect to happen]
**Actual behavior:** [What actually happens]
#### Additional Information
* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#how-can-i-contribute) for additional guidelines.

View File

@@ -2279,7 +2279,7 @@ void clean_up_after_endstop_or_probe_move() {
#else #else
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("last_written_mode - ", int(bltouch_last_written_mode)); SERIAL_ECHOLNPAIR("last_written_mode - ", int(bltouch_last_written_mode));
SERIAL_ECHOLNPGM("config mode - " SERIAL_ECHOLNPGM("config mode - "
#if ENABLED(BLTOUCH_SET_5V_MODE) #if ENABLED(BLTOUCH_SET_5V_MODE)
"BLTOUCH_SET_5V_MODE" "BLTOUCH_SET_5V_MODE"

View File

@@ -35,7 +35,7 @@
/** /**
* Marlin release version identifier * Marlin release version identifier
*/ */
#define SHORT_BUILD_VERSION "bugfix-1.1.x" #define SHORT_BUILD_VERSION "1.1.9.2"
/** /**
* Verbose version identifier which should contain a reference to the location * Verbose version identifier which should contain a reference to the location
@@ -48,7 +48,7 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define STRING_DISTRIBUTION_DATE "2018-07-31" #define STRING_DISTRIBUTION_DATE "2023-07-18"
/** /**
* Required minimum Configuration.h and Configuration_adv.h file versions. * Required minimum Configuration.h and Configuration_adv.h file versions.

View File

@@ -61,10 +61,14 @@
#define THERMISTOR_NAME "Unknown" #define THERMISTOR_NAME "Unknown"
#elif THERMISTOR_ID == 13 #elif THERMISTOR_ID == 13
#define THERMISTOR_NAME "Hisens" #define THERMISTOR_NAME "Hisens"
#elif THERMISTOR_ID == 15
#define THERMISTOR_NAME "Hisens +"
#elif THERMISTOR_ID == 20 #elif THERMISTOR_ID == 20
#define THERMISTOR_NAME "PT100 UltiMB" #define THERMISTOR_NAME "PT100 UltiMB"
#elif THERMISTOR_ID == 60 #elif THERMISTOR_ID == 60
#define THERMISTOR_NAME "Makers Tool" #define THERMISTOR_NAME "Makers Tool"
#elif THERMISTOR_ID == 66
#define THERMISTOR_NAME "Makers Tool +"
#elif THERMISTOR_ID == 70 #elif THERMISTOR_ID == 70
#define THERMISTOR_NAME "Hephestos 2" #define THERMISTOR_NAME "Hephestos 2"
#elif THERMISTOR_ID == 75 #elif THERMISTOR_ID == 75

View File

@@ -1,60 +1,69 @@
# Marlin 3D Printer Firmware # Marlin 3D Printer Firmware
<img align="right" src="../../raw/1.1.x/buildroot/share/pixmaps/logo/marlin-250.png" />
[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin) Marlin is the world's most popular open source firmware for Replicating Rapid Prototyper (RepRap) machines, commonly referred to as "3D printers." Marlin Firmware is highly efficient, running even on modest 16MHz embedded AVR processors. While Marlin 1.1 only supports ATmega AVR (Arduino, etc.) and AT90USB (Teensy++ 2.0), [Marlin 2.0](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) also adds support for several ARM processors, including the SAM3X8E (Arduino Due), NXP LPC1768/LPC1769 ARM Cortex-M3 (Re-Arm, MKS SBASE, Smoothieboard), and ARM Cortex-M4 (Teensy 3.5/3.6, STM32F1/4/7).
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
<img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" /> A monumental amount of talent and effort goes into Marlin production, and thanks are due to many volunteers around the world. We work closely with the community, contributors, vendors, host and library developers, etc. to improve the quality, configurability, and compatibility of Marlin Firmware with a [huge variety](http://marlinfw.org/docs/configuration/configuration.html#motherboard) of boards. For the final 1.1 release we focused on code quality, performance, stability, and overall user experience. Several new features were added, many of which require no extra hardware.
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/). ## Documentation
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
## Bugfix Branch - Visit [marlinfw.org](http://marlinfw.org/) for complete documentation on [configuration](http://marlinfw.org/docs/configuration/configuration.html), [installation](http://marlinfw.org/docs/basics/install.html), [features](http://marlinfw.org/meta/features/), and the many [G-codes](http://marlinfw.org/meta/gcode/) that Marlin supports. We will continue to expand the site to include in-depth articles, tutorials, and how-to videos on all of Marlin's features.
- See the [Releases](https://github.com/MarlinFirmware/Marlin/releases) page for Release Notes on all current and previous versions of Marlin.
- Check out the [RepRap.org Marlin Page](http://reprap.org/wiki/Marlin) for an overview of Marlin and its role in the RepRap project.
__Not for production use. Use with caution!__ ## Marlin 1.1.x
This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release. The 1.1.x branch is home to all tagged releases of Marlin 1.1.
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.9.) Marlin 1.1.9 is the final release of the AVR-only flat version of Marlin Firmware, so there will be no further 1.1.x releases. However [`bugfix-1.1.x`](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x) will continue to receive patches for critical bugs, so be sure to test it (or [`bugfix-2.0.x`](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) before reporting any bugs you find in 1.1.9.
## Recent Changes ## Marlin 2.0.x
- Internally always use native machine space
- Initial UBL LCD Menu
- New optimized G-code parser singleton
- Initial `M3`/`M4`/`M5` Spindle and Laser support
- Added `M421 Q` to offset a mesh point
- Refinements to `G26` and `G33`
- Added `M80 S` to query the power state
- "Cancel Print" now shuts off heaters
- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling
## Submitting Patches [Marlin 2.0](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) is the future, featuring a much-improved hierarchical file structure and full [32-bit support](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) via a Hardware Access Layer (HAL). Marlin 2.0 continues to work with [Arduino IDE](https://www.arduino.cc/en/Main/Software) for the platforms it supports, and the excellent [PlatformIO IDE](https://platformio.org/platformio-ide) is recommended for the next generation of ARM-based boards. If you're looking for the very best that Marlin has to offer and aren't bothered by a few rough edges, give version 2.0 a try!
Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)). ## Contributing to Marlin
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 2.0 and beyond should improve on separation of bug fixes and cutting-edge development. Click on the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues) and [Pull Requests](https://github.com/MarlinFirmware/Marlin/pulls) links above at any time to see what we're currently working on.
- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information.
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask.
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) To submit patches and new features for Marlin 2.0 check out the [bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) branch, add your commits, and submit a Pull Request back to the `bugfix-2.0.x` branch. Once 2.0.x has been certified for a critical mass of common 32-bit boards, it will become the next major release and will be the basis for all future major and minor releases.
Note that our "bugfix" branches always contain the latest patches and new code. These patches may not be widely tested. As always, when using "nightly" builds of Marlin, proceed with full caution.
## Marlin Resources
- [Marlin Home Page](http://marlinfw.org/) - The Marlin Documentation Project. [Help us](https://github.com/MarlinFirmware/MarlinDocumentation) expand this site!
- [@MarlinFirmware](https://twitter.com/MarlinFirmware) on Twitter - Follow for news, release alerts, and tips & tricks. (Maintained by [@thinkyhead](https://github.com/thinkyhead).)
## Marlin User Support
Looking for help? Our GitHub Issue Queue is only for development-related issues, feature requests, and bug reports. But there are several places where you can get help from experienced users:
- [RepRap.org Marlin Forum](http://forums.reprap.org/list.php?415)
- ["Marlin Firmware" Facebook Group](https://www.facebook.com/groups/1049718498464482/)
- [Tom's 3D Forums](https://discuss.toms3d.org/)
- [Marlin on Discord](https://discord.gg/n5NJ59y)
## Credits ## Credits
The current Marlin dev team consists of: Marlin Admins:
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)]
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)]
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)]
Notable contributors include: Notable contributors:
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)] - Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)]
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)] - Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)]
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)] - Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
- Bob Cousins [[@bobc](https://github.com/bobc)] - Bob Cousins [[@bobc](https://github.com/bobc)]
- Chris Palmer [[@nophead](https://github.com/nophead)] - Chris Palmer [[@nophead](https://github.com/nophead)]
- Chris Pepper [[@p3p](https://github.com/p3p)]
- David Braam [[@daid](https://github.com/daid)] - David Braam [[@daid](https://github.com/daid)]
- Éduardo Tagle [[@ejtagle](https://github.com/ejtagle)]
- Edward Patel [[@epatel](https://github.com/epatel)] - Edward Patel [[@epatel](https://github.com/epatel)]
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
- Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)] - Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
- F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)] - F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)]
- Giuliano Zaro [[@GMagician](https://github.com/GMagician)]
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)] - Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)]
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - João Brazio [[@jbrazio](https://github.com/jbrazio)]
- Kai [[@Kaibob2](https://github.com/Kaibob2)] - Kai [[@Kaibob2](https://github.com/Kaibob2)]
@@ -76,10 +85,17 @@ Notable contributors include:
- [[@psavva](https://github.com/psavva)] - [[@psavva](https://github.com/psavva)]
- [[@Tannoo](https://github.com/Tannoo)] - [[@Tannoo](https://github.com/Tannoo)]
- [[@teemuatlut](https://github.com/teemuatlut)] - [[@teemuatlut](https://github.com/teemuatlut)]
- ...and many others - ...and you!
## License ## License
Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. Marlin is published under the [GPL license](https://github.com/COPYING.md) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
---
<!-- [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) -->
- [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin)
- [![Flattr Scott Lahteine](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - Flattr Scott Lahteine
- [![Flattr Erik van der Zalm](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - Flattr Erik van der Zalm

View File

@@ -16,16 +16,11 @@
# #
[platformio] [platformio]
src_dir = Marlin src_dir = Marlin
build_dir = .pioenvs default_envs = megaatmega2560
lib_dir = .piolib
libdeps_dir = .piolibdeps
env_default = megaatmega2560
[common] [common]
build_flags = -fmax-errors=5 build_flags = -fmax-errors=5 -g -fmerge-all-constants
-g
-ggdb
lib_deps = lib_deps =
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
LiquidCrystal_I2C@1.1.2 LiquidCrystal_I2C@1.1.2
@@ -34,7 +29,7 @@ lib_deps =
Adafruit NeoPixel@1.1.3 Adafruit NeoPixel@1.1.3
https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip https://github.com/lincomatic/LiquidTWI2/archive/30aa480.zip
https://github.com/ameyer/Arduino-L6470/archive/master.zip https://github.com/ameyer/Arduino-L6470/archive/master.zip
https://github.com/trinamic/TMC26XStepper/archive/c1921b4.zip https://github.com/MarlinFirmware/TMC26XStepper/archive/0.1.1.zip
################################# #################################
# # # #
@@ -112,6 +107,7 @@ build_flags = ${common.build_flags}
upload_speed = 57600 upload_speed = 57600
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
monitor_speed = 250000 monitor_speed = 250000
platform_packages = toolchain-atmelavr@1.50400.190710
# #
# Melzi and clones (Optiboot bootloader) # Melzi and clones (Optiboot bootloader)
@@ -124,6 +120,7 @@ build_flags = ${common.build_flags}
upload_speed = 115200 upload_speed = 115200
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
monitor_speed = 250000 monitor_speed = 250000
platform_packages = toolchain-atmelavr@1.50400.190710
# #
# RAMBo # RAMBo
@@ -147,6 +144,7 @@ board = sanguino_atmega644p
build_flags = ${common.build_flags} build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
monitor_speed = 250000 monitor_speed = 250000
platform_packages = toolchain-atmelavr@1.50400.190710
# #
# Sanguinololu (ATmega1284p) # Sanguinololu (ATmega1284p)
@@ -158,6 +156,7 @@ board = sanguino_atmega1284p
build_flags = ${common.build_flags} build_flags = ${common.build_flags}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
monitor_speed = 250000 monitor_speed = 250000
platform_packages = toolchain-atmelavr@1.50400.190710
# #
# Teensy++ 2.0 # Teensy++ 2.0