Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Before creating a suggestion, please check [this list](#before-submitting-a-sugg

#### Before Submitting a Feature Request

* **Check the [Marlin website](http://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](http://marlinfw.org/docs/configuration/configuration.html).
* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.

#### How Do I Submit A (Good) Feature Request?
Expand All @@ -117,12 +117,12 @@ Unsure where to begin contributing to Marlin? You can start by looking through t

### Pull Requests

Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.

* Fill in [the required template](pull_request_template.md).
* Don't include issue numbers in the PR title.
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
* Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Document new code with clear and concise comments.
* End all files with a newline.

Expand All @@ -137,7 +137,7 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x

### C++ Coding Standards

* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.

### Documentation

Expand Down
4 changes: 2 additions & 2 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@
// @section probes

//
// See http://marlinfw.org/docs/configuration/probes.html
// See https://marlinfw.org/docs/configuration/probes.html
//

/**
Expand Down Expand Up @@ -1636,7 +1636,7 @@
* - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text
*
* See http://marlinfw.org/docs/development/lcd_language.html
* See https://marlinfw.org/docs/development/lcd_language.html
*
* :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@
* If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk)
* print acceleration will be reduced during the affected moves to keep within the limit.
*
* See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
* See https://marlinfw.org/docs/features/lin_advance.html for full instructions.
* Mention @Sebastianv650 on GitHub to alert the author of any issues.
*/
//#define LIN_ADVANCE
Expand Down Expand Up @@ -2643,7 +2643,7 @@
* You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V
* hardware PWM pin for the speed control and a pin for the rotation direction.
*
* See http://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
* See https://marlinfw.org/docs/configuration/laser_spindle.html for more config details.
*/
//#define SPINDLE_FEATURE
//#define LASER_FEATURE
Expand Down
8 changes: 4 additions & 4 deletions Marlin/Marlin.ino
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Before diving in, we recommend the following essential links:

Marlin Firmware Official Website

- http://marlinfw.org/
- https://marlinfw.org/
The official Marlin Firmware website contains the most up-to-date
documentation. Contributions are always welcome!

Expand All @@ -30,7 +30,7 @@ Configuration
(Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.)
Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin

- http://marlinfw.org/docs/configuration/configuration.html
- https://marlinfw.org/docs/configuration/configuration.html
Marlin's configuration options are explained in more detail here.

Getting Help
Expand All @@ -45,9 +45,9 @@ Getting Help

Contributing

- http://marlinfw.org/docs/development/contributing.html
- https://marlinfw.org/docs/development/contributing.html
If you'd like to contribute to Marlin, read this first!

- http://marlinfw.org/docs/development/coding_standards.html
- https://marlinfw.org/docs/development/coding_standards.html
Before submitting code get to know the Coding Standards.
*/
2 changes: 1 addition & 1 deletion Marlin/src/core/language.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
//
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRA_LCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
// See also http://marlinfw.org/docs/development/lcd_language.html
// See also https://marlinfw.org/docs/development/lcd_language.html

// Languages
// an Aragonese
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/powerloss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void PrintJobRecovery::changed() {
* If a saved state exists send 'M1000 S' to initiate job recovery.
*/
void PrintJobRecovery::check() {
//if (!card.isMounted()) card.mount();
if (!card.isMounted()) card.mount();
if (card.isMounted()) {
load();
if (!valid()) return purge();
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/feature/twibus.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ typedef void (*twiRequestFunc_t)();
* for the host to interpret.
*
* For more information see
* - http://marlinfw.org/docs/gcode/M260.html
* - http://marlinfw.org/docs/gcode/M261.html
* - https://marlinfw.org/docs/gcode/M260.html
* - https://marlinfw.org/docs/gcode/M261.html
*
*/
class TWIBus {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/calibrate/G28.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ void GcodeSuite::G28() {
? (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT)
: 0;

if (z_homing_height && (doX || doY)) {
if (z_homing_height && (doX || doY || ENABLED(Z_SAFE_HOMING))) {
// Raise Z before homing any other axes and z is not already high enough (never lower z)
destination.z = z_homing_height + (TEST(axis_known_position, Z_AXIS) ? 0.0f : current_position.z);
if (destination.z > current_position.z) {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/gcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* -----------------
*
* Helpful G-code references:
* - http://marlinfw.org/meta/gcode
* - https://marlinfw.org/meta/gcode
* - https://reprap.org/wiki/G-code
* - http://linuxcnc.org/docs/html/gcode.html
*
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/dogm_Bootscreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Standard Marlin Boot Screen bitmaps
*
* Use the Marlin Bitmap Converter to make your own:
* http://marlinfw.org/tools/u8glib/converter.html
* https://marlinfw.org/tools/u8glib/converter.html
*/

#include "../../inc/MarlinConfig.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/dogm_Statusscreen.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Standard Marlin Status Screen bitmaps
*
* Use the Marlin Bitmap Converter to make your own:
* http://marlinfw.org/tools/u8glib/converter.html
* https://marlinfw.org/tools/u8glib/converter.html
*/

#include "../../inc/MarlinConfig.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

/**
* Include all needed font files
* (See http://marlinfw.org/docs/development/fonts.html)
* (See https://marlinfw.org/docs/development/fonts.html)
*/
#include "fontdata/fontdata_ISO10646_1.h"
#if ENABLED(USE_SMALL_INFOFONT)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_an.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Aragonese
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_bg.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Bulgarian
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ca.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Catalan
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/
namespace Language_ca {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* UTF-8 for Graphical Display
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
* Translated by Petr Zahradnik, Computer Laboratory
* Blog and video blog Zahradnik se bavi
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_da.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Danish
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* German
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_el.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Greek
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_el_gr.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Greek (Greece)
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* English
*
* LCD Menu Messages
* See also http://marlinfw.org/docs/development/lcd_language.html
* See also https://marlinfw.org/docs/development/lcd_language.html
*
*/

Expand Down
Loading