From 09e5676009dbfd06323687ec642d20378b85d2c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 23 Jan 2015 12:30:02 +0100 Subject: [PATCH 1/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf41b053..10bb4e92 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,13 @@ Issues, Tickets, however you may call them ------------------------------------------ -Read the following short instructions **fully** and **follow them** if you want your ticket to be taken care of and not closed again directly! +Read the following short instructions **fully** and **follow them** if you want your ticket to be taken care of and not closed again directly! They are linked on top of every new issue form, so don't say nobody warned you afterwards. - Always create **one ticket for one purpose**. So don't mix two or more feature requests, support requests, bugs etc into one ticket. If you do, your ticket will be treated as if only describing the first purpose, the others will be ignored! -- If you want to report a bug, **READ AND FOLLOW [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there (**and really EVERYTHING that is written in there!**) you don't have to do anything special with your ticket. +- If you want to report a bug, **READ AND FOLLOW [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there (**and really EVERYTHING that is written in there!**) you don't have to do anything special with your ticket. Listen to what GitIssueBot might have to say to you! - If you want to post a **request** of any kind (feature request, documentation request, ...), **add [Request] to your issue's title!** -- If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work), **add [Support] to your issue's title!**. Note that for problems like these, the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) will probably get you help faster! -- If you have a general **question**, **add [Question] to your issue's title!**. Note that for problems like these, the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) will probably get you help faster! +- If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work) or have a general **question**, the issue tracker is not the right place. Consult the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) instead! +- If you are a developer that wants to brainstorm a pull request or possible changes to the plugin system, **add [Brainstorming] to your issue's title!** (see below). - If you have another reason for creating a ticket that doesn't fit any of the above categories, think hard if it might not be something better suited for the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741). If you are sure it needs to be reported here, **add [Misc] to your issue's title!** Following these guidelines (**especially EVERYTHING mentioned in ["How to file a bug report"](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)**) is necessary so the tickets stay manageable - you are not the only one with an open issue, so please respect that you have to **play by the rules** so that your problem can be taken care of. Tickets not playing by the rules **will be closed without further investigation!**. @@ -15,8 +15,33 @@ Following these guidelines (**especially EVERYTHING mentioned in ["How to file a Pull Requests ------------- -1. Please create all pull requests against the `devel` branch. -2. Create **one pull request per feature/bug fix**. -3. Create a custom branch for your feature/bug fix and use that as base for your pull request. Pull requests directly against your version of `devel` will be closed. -4. In your pull request's description, state what your pull request is doing, as in, what feature does it implement, what bug does it fix. +1. If you want to add a new feature to OctoPrint, **please always first consider if it wouldn't be better suited for a + plugin.** As a general rule of thumb, any feature that is only of interest to a small sub group should be moved into a + plugin. If the current plugin system doesn't allow you to implement your feature as a plugin, create a "Brainstorming" + ticket to get the discussion going how best to solve *this* in OctoPrint's plugin system - maybe that's the actual PR + you have been waiting for to contribute :) +2. If you plan to make **any large changes to the code or appearance, please open a "Brainstorming" ticket first** so that + we can determine if it's a good time for your specific pull request. It might be that I'm currently in the process of + making heavy changes to the code locations you'd target as well, or your approach doesn't fit the general "project + vision", and that would just cause unnecessary work and frustration for everyone or possibly get the PR rejected. +3. When adding code to OctoPrint, make sure you **follow the current coding style**. That means tabs instead of spaces in the + python files (yes, I know that this goes against PEP-8, I don't care) and space instead of tabs in the Javascript sources, + english language (that means code, variables, comments!), comments where necessary (tell why the code does something like + it does it, structure your code), following the general architecture. If your PR needs to make changes to the Stylesheets, + change the ``.less`` files from which the CSS is compiled. PRs that contain direct changes to the compiled + CSS will be closed. +4. **Test your changes thoroughly**. That also means testing with usage scenarios you don't normally use, e.g. if you only + use access control, test without and vice versa. If you only test with your printer, test with the virtual printer and + vice versa. State in your pull request how your tested your changes. +5. Please create all pull requests **against the `devel` branch**. +6. Create **one pull request per feature/bug fix**. +7. Create a **custom branch** for your feature/bug fix and use that as base for your pull request. Pull requests directly + against your version of `devel` will be closed. +7. In your pull request's description, **state what your pull request is doing**, as in, what feature does it implement, what + bug does it fix. The more thoroughly you explain your intent behind the PR here, the higher the chances it will get merged + fast. +History +------- + + * 2015-01-23: More guidelines for creating pull requests, support/questions redirected to Mailinglist/G+ community From 2de863c5db688d81443385f80792a88771864ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 23 Jan 2015 12:50:34 +0100 Subject: [PATCH 2/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 10bb4e92..698ab810 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ Read the following short instructions **fully** and **follow them** if you want - If you want to post a **request** of any kind (feature request, documentation request, ...), **add [Request] to your issue's title!** - If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work) or have a general **question**, the issue tracker is not the right place. Consult the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) instead! - If you are a developer that wants to brainstorm a pull request or possible changes to the plugin system, **add [Brainstorming] to your issue's title!** (see below). -- If you have another reason for creating a ticket that doesn't fit any of the above categories, think hard if it might not be something better suited for the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741). If you are sure it needs to be reported here, **add [Misc] to your issue's title!** +- If you have another reason for creating a ticket that doesn't fit any of the above categories, it's something better suited for the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741). Following these guidelines (**especially EVERYTHING mentioned in ["How to file a bug report"](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)**) is necessary so the tickets stay manageable - you are not the only one with an open issue, so please respect that you have to **play by the rules** so that your problem can be taken care of. Tickets not playing by the rules **will be closed without further investigation!**. From f32c977381d33084ba08cdeab6b619b75e59d020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 27 Jan 2015 09:53:09 +0100 Subject: [PATCH 3/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 698ab810..4f4c46cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,8 @@ Issues, Tickets, however you may call them Read the following short instructions **fully** and **follow them** if you want your ticket to be taken care of and not closed again directly! They are linked on top of every new issue form, so don't say nobody warned you afterwards. -- Always create **one ticket for one purpose**. So don't mix two or more feature requests, support requests, bugs etc into one ticket. If you do, your ticket will be treated as if only describing the first purpose, the others will be ignored! +- **Read the [FAQ](https://github.com/foosel/OctoPrint/wiki/FAQ)** +- Always create **one ticket for one purpose**. So don't mix two or more feature requests, support requests, bugs etc into one ticket. If you do, your ticket will be closed! - If you want to report a bug, **READ AND FOLLOW [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there (**and really EVERYTHING that is written in there!**) you don't have to do anything special with your ticket. Listen to what GitIssueBot might have to say to you! - If you want to post a **request** of any kind (feature request, documentation request, ...), **add [Request] to your issue's title!** - If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work) or have a general **question**, the issue tracker is not the right place. Consult the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) instead! @@ -45,3 +46,4 @@ History ------- * 2015-01-23: More guidelines for creating pull requests, support/questions redirected to Mailinglist/G+ community + * 2015-01-27: Added another explicit link to the FAQ From 8a61e4517f7ede2d9a244481c0e79bbd520b95be Mon Sep 17 00:00:00 2001 From: Antoine Bertin Date: Sun, 1 Feb 2015 11:05:37 +0100 Subject: [PATCH 4/7] Fix logger call for gcode multi commands events --- src/octoprint/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/events.py b/src/octoprint/events.py index 6b332454..cf7baaa1 100644 --- a/src/octoprint/events.py +++ b/src/octoprint/events.py @@ -293,7 +293,7 @@ class CommandTrigger(GenericEventListener): def _executeGcodeCommand(self, command): commands = [command] if isinstance(command, (list, tuple, set)): - self.logger.debug("Executing GCode commands: %r" % command) + self._logger.debug("Executing GCode commands: %r" % command) commands = list(command) else: self._logger.debug("Executing GCode command: %s" % command) From 7971bc91b226bf28a54e069bab3b2893d2643939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 5 Jun 2014 21:23:07 +0200 Subject: [PATCH 5/7] Always send commands with checksum when printing (cherry picked from commit 3ee745d) --- src/octoprint/util/comm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index cf8b3ec7..00473b42 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -892,7 +892,7 @@ class MachineCom(object): if self._resendDelta is not None: self._resendNextCommand() elif not self._commandQueue.empty() and not self.isStreaming(): - self._sendCommand(self._commandQueue.get()) + self._sendCommand(self._commandQueue.get(), True) else: self._sendNext() elif line.lower().startswith("resend") or line.lower().startswith("rs"): From 89d972ff40e059909d86d79bbbb564fe0fa3cb93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 22 Feb 2015 15:15:45 +0100 Subject: [PATCH 6/7] Always make sure to (re)set file position to the beginning when starting SD card prints Closes #780 (cherry picked from commit 5c35a28) --- src/octoprint/util/comm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 00473b42..67539cb0 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -390,9 +390,8 @@ class MachineCom(object): }) if self.isSdFileSelected(): - if wasPaused: - self.sendCommand("M26 S0") - self._currentFile.setFilepos(0) + self.sendCommand("M26 S0") + self._currentFile.setFilepos(0) self.sendCommand("M24") else: self._sendNext() From d974ab0979656290c1d40fcf31c88bc10044cd5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 22 Feb 2015 15:37:37 +0100 Subject: [PATCH 7/7] Forgot a changelog entry (again) (cherry picked from commit 2111a06) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4eab5f..307e7ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ * [#679](https://github.com/foosel/OctoPrint/issues/679) - Fix error where API state is requested and printer is offline (backport of [619fe9a](https://github.com/foosel/OctoPrint/commit/619fe9a0e78826bd1524b235a910156439bcb6d7)). * [#719](https://github.com/foosel/OctoPrint/issues/719) - Properly center print bed in GCODE viewer +* [#780](https://github.com/foosel/OctoPrint/issues/780) - Always (re)set file position in SD files to 0 so that reprints + work correctly (backported from ``devel``) * [IRC] - Don't hiccup on slic3r ``filament_diameter`` comments generated for multi extruder setups * [ML] - Fixed relative URL to SockJS endpoint, wasn't yet using the proper base url * [unreported] & [#698](https://github.com/foosel/OctoPrint/issues/698) - Generated URLs now take X-Forwarded-Host header