From 028fe129a54488eeb27f32b4576d86d058525702 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Tue, 6 Jan 2015 17:09:19 +0100 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c67e9e4b1f..3d652c562f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Current Status: Bug Fixing =================== -What bugs are we working on: https://github.com/MarlinFirmware/Development/milestones/Bug%20Fixing%20Round%201 +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 IRC channel on freenode: #marlin-firmware From 80afded132cf13b3951ef6945253f76c2f427c9e Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Tue, 6 Jan 2015 17:10:05 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d652c562f..78f020795a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ IRC channel on freenode: #marlin-firmware Developer Notes =================== -- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Development/issues/1209 +- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Marlin/issues/1209 - Before you submit any pull request, we ask that you _PLEASE_ test your code before submission, even if the change seems innocuous. When creating the pull request, please include the hardware you used for testing and a short synopsis of your testing procedure. Untested pull requests are less likely to be merged, as even slight changes create the risk of breaking the main branch. From 1a57644b0c62f5a8efde40f2b45915b65155d00e Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Tue, 6 Jan 2015 17:12:17 +0100 Subject: [PATCH 3/4] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 78f020795a..f0213b8a0b 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,13 @@ IRC channel on freenode: #marlin-firmware Developer Notes =================== +- There are now 2 branches: The __development__ branch is where new features and code changes will be sorted out. This branch may have untested code in it, so please let us know if you find any bugs. When the __development__ branch has reached a state where it is stable, it will be moved to the __stable__ branch. + - We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Marlin/issues/1209 - Before you submit any pull request, we ask that you _PLEASE_ test your code before submission, even if the change seems innocuous. When creating the pull request, please include the hardware you used for testing and a short synopsis of your testing procedure. Untested pull requests are less likely to be merged, as even slight changes create the risk of breaking the main branch. -- If you have a fix don't open an issue telling about it, but test the code and submit a pull request. +- If you have a fix don't open an issue telling about it, but test the code and submit a pull request. Use the __development__ branch when you submit. ========================== Marlin 3D Printer Firmware From 673033565787032dc6e1c830b7ab2daf5fd69fc2 Mon Sep 17 00:00:00 2001 From: DinoMesina Date: Tue, 6 Jan 2015 18:06:02 +0100 Subject: [PATCH 4/4] Update Configuration.h --- Marlin/Configuration.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index fe6e371c5c..347e8c0950 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -148,6 +148,7 @@ #ifdef PIDTEMP //#define PID_DEBUG // Sends debug data to the serial port. //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX + //#define SLOW_PWM_HEATERS // PWM with very low frequency (circa 0.125Hz=8s) and miminum state time of circa 1s usefoul for heater drived by relay #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term