From 3d2b471c1aa55bd8c008e45302e3683ac58053d9 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Wed, 7 Jan 2015 21:05:28 +0100 Subject: [PATCH 1/3] added link to google hangout --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4fdc50c191..97d0161849 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ IRC channel on freenode: #marlin-firmware (baaaah, #marlin was taken) +If a google hangout is needed then use this link: + +https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +It's valid for the next 10 years, must remember to renew then :-P + Developer Notes =================== From 269ec9f87f6a968dafa210a0dc9749f03e75e102 Mon Sep 17 00:00:00 2001 From: andrewsil1 Date: Wed, 7 Jan 2015 12:41:09 -0800 Subject: [PATCH 2/3] Fix grammar/typos in new Configuration.h option (For the SLOW_PWM_HEATERS option) --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6a8fd36789..aacd69295e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -148,7 +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 SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a 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 From 3a30d45c2ec3ea997e69294092351a5eb8c5c987 Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Wed, 7 Jan 2015 23:40:17 +0100 Subject: [PATCH 3/3] Revert "issue 968 for dev branch" --- Marlin/Marlin_main.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b8ab94fa88..e3e5ef3588 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -376,7 +376,6 @@ const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 //Inactivity shutdown variables static unsigned long previous_millis_cmd = 0; -static unsigned long previous_millis_ok = 0; static unsigned long max_inactive_time = 0; static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; @@ -646,7 +645,6 @@ void loop() else { SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } } else @@ -3157,13 +3155,12 @@ Sigma_Exit: } } else if (servo_index >= 0) { - SERIAL_PROTOCOL(MSG_OK); + SERIAL_PROTOCOL(MSG_OK); SERIAL_PROTOCOL(" Servo "); SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); SERIAL_PROTOCOL(servos[servo_index].read()); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } } break; @@ -3238,7 +3235,6 @@ Sigma_Exit: SERIAL_PROTOCOL(" d:"); SERIAL_PROTOCOL(unscalePID_d(bedKd)); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } break; #endif //PIDTEMP @@ -3529,7 +3525,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp SERIAL_ECHO_START; SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } else { @@ -3916,7 +3911,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp ClearToSend(); } - void FlushSerialRequestResend() { //char cmdbuffer[bufindr][100]="Resend:"; @@ -3934,7 +3928,6 @@ void ClearToSend() return; #endif //SDSUPPORT SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } void get_coordinates() @@ -4359,14 +4352,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s if( (millis() - previous_millis_cmd) > max_inactive_time ) if(max_inactive_time) kill(); - - // If 'OK' is garbled on sending PC won't receive it. Both machines will wait on each other forever. - // This resends OK if nothing is heard from PC for a while to avoid this bad case. - if( (millis() - previous_millis_ok) > max_inactive_time/4 ) { - SERIAL_PROTOCOL(MSG_OK); - previous_millis_ok=millis(); - } - if(stepper_inactive_time) { if( (millis() - previous_millis_cmd) > stepper_inactive_time ) {