From 74441ce3a13d90b19e1b23dc90761b83caa32331 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 29 Nov 2017 14:05:47 +0100 Subject: [PATCH 01/19] power panic in absolute mode fixed, but some e steps are probably missing --- Firmware/Marlin_main.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 58d5aacd2..0af6c973a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7108,7 +7108,8 @@ void uvlo_() planner_abort_hard(); // Store the current extruder position. - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); + // eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3]?0:1); // Clean the input command queue. @@ -7259,16 +7260,6 @@ void recover_print(uint8_t automatic) { enquecommand_P(PSTR("G1 E5 F120")); //Extrude some filament to stabilize pessure } enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) - { - float extruder_abs_pos = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - enquecommand_P(PSTR("M82")); //E axis abslute mode -// current_position[E_AXIS] = extruder_abs_pos; -// plan_set_e_position(extruder_abs_pos); - sprintf_P(cmd, PSTR("G92 E")); - dtostrf(extruder_abs_pos, 6, 3, cmd + strlen(cmd)); - enquecommand(cmd); - } // Mark the power panic status as inactive. eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); @@ -7389,9 +7380,9 @@ void restore_print_from_eeprom() { uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); MYSERIAL.println(position); - + // E axis relative mode. - enquecommand_P(PSTR("M83")); + enquecommand_P(PSTR("M83")); // Move to the XY print position in logical coordinates, where the print has been killed. strcpy_P(cmd, PSTR("G1 X")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)))); strcat_P(cmd, PSTR(" Y")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)))); @@ -7405,6 +7396,16 @@ void restore_print_from_eeprom() { // Set the feedrate saved at the power panic. sprintf_P(cmd, PSTR("G1 F%d"), feedrate_rec); enquecommand(cmd); + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) + { + float extruder_abs_pos = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); + enquecommand_P(PSTR("M82")); //E axis abslute mode + // current_position[E_AXIS] = extruder_abs_pos; + // plan_set_e_position(extruder_abs_pos); + sprintf_P(cmd, PSTR("G92 E")); + dtostrf(extruder_abs_pos, 6, 3, cmd + strlen(cmd)); + enquecommand(cmd); + } // Set the fan speed saved at the power panic. strcpy_P(cmd, PSTR("M106 S")); strcat(cmd, itostr3(int(fan_speed_rec))); From 06f7439dc117b53b94e9b340e5099d51cc6cadad Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 29 Nov 2017 14:11:31 +0100 Subject: [PATCH 02/19] changed version --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 25ad10906..f94c11556 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_version "3.1.1-RC1" -#define FW_build 121 +#define FW_build 122 //#define FW_build --BUILD-NUMBER-- #define FW_version_build FW_version " b" STR(FW_build) From 707e9cb396a0bee7c03309f0095110d7ecc7b6e1 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 1 Dec 2017 14:26:08 +0100 Subject: [PATCH 03/19] chages in power panic absolute mode --- Firmware/Marlin_main.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0af6c973a..ce07d4e3b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7107,11 +7107,6 @@ void uvlo_() // are in action. planner_abort_hard(); - // Store the current extruder position. - // eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3]?0:1); - // Clean the input command queue. cmdqueue_reset(); card.sdprinting = false; @@ -7150,6 +7145,10 @@ void uvlo_() // for reaching the zero full step before powering off. eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); // Store the current position. + // Store the current extruder position. + // eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3] ? 0 : 1); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z), current_position[Z_AXIS]); @@ -7259,7 +7258,7 @@ void recover_print(uint8_t automatic) { if(automatic == 0){ enquecommand_P(PSTR("G1 E5 F120")); //Extrude some filament to stabilize pessure } - enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); + //enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); // Mark the power panic status as inactive. eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); @@ -7283,6 +7282,7 @@ void recover_print(uint8_t automatic) { void recover_machine_state_after_power_panic() { + char cmd[30]; // 1) Recover the logical cordinates at the time of the power panic. // The logical XY coordinates are needed to recover the machine Z coordinate corrected by the mesh bed leveling. current_position[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)); @@ -7291,6 +7291,12 @@ void recover_machine_state_after_power_panic() // The current position after power panic is moved to the next closest 0th full step. current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { + current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); + sprintf_P(cmd, PSTR("G92 E")); + dtostrf(current_position[E_AXIS], 6, 3, cmd + strlen(cmd)); + enquecommand(cmd); + } memcpy(destination, current_position, sizeof(destination)); SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); @@ -7400,11 +7406,6 @@ void restore_print_from_eeprom() { { float extruder_abs_pos = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); enquecommand_P(PSTR("M82")); //E axis abslute mode - // current_position[E_AXIS] = extruder_abs_pos; - // plan_set_e_position(extruder_abs_pos); - sprintf_P(cmd, PSTR("G92 E")); - dtostrf(extruder_abs_pos, 6, 3, cmd + strlen(cmd)); - enquecommand(cmd); } // Set the fan speed saved at the power panic. strcpy_P(cmd, PSTR("M106 S")); From 5f4bed8d7225a7cac2321a3bf109662b7ec05e4e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 29 Nov 2018 13:35:57 +0100 Subject: [PATCH 04/19] add gitignore --- .gitignore | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..4bd53cdc5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +################################################################################ +# This .gitignore file was automatically created by Microsoft(R) Visual Studio. +################################################################################ + +/Firmware/Configuration_prusa.h +/Firmware/Firmware.vcxproj.filters +/Firmware/Firmware.vcxproj +/Firmware/Firmware.sln +/Firmware/__vm +/Firmware/Debug +/Firmware/.vs/Firmware/v14 +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/libraries/U8glib/utility +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/libraries/Wire +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/variants +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/platform.txt +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/platform.local.txt +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/boards.txt +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/libraries/U8glib +/ArduinoAddons/Arduino_1.6.x/hardware/marlin/avr_/libraries/SPI +/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h +/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h +/Firmware/variants/1_75mm_MK2-EINY01-E3Dv6full.h.bak +/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h +/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h +*.bak +/Firmware/Configuration_prusa_backup.h +/Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full From 72accdc5bb83c02594e14e7a9e8dd19cae24c6fe Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 29 Nov 2018 13:51:24 +0100 Subject: [PATCH 05/19] gitignore update --- .gitignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.gitignore b/.gitignore index 834c746da..3a64286e1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,22 @@ Firmware/Doc /html /latex /Doxyfile +/Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full +/Firmware/Configuration_prusa.h.bak +/Firmware/Configuration_prusa_backup.h +/Firmware/ultralcd_implementation_hitachi_HD44780.h.bak +/Firmware/ultralcd.cpp.bak +/Firmware/temperature.cpp.bak +/Firmware/pins.h.bak +/Firmware/Marlin_main.cpp.bak +/Firmware/language_pl.h.bak +/Firmware/language_it.h.bak +/Firmware/language_es.h.bak +/Firmware/language_en.h.bak +/Firmware/language_de.h.bak +/Firmware/language_cz.h.bak +/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h +/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h +/Firmware/variants/1_75mm_MK2-EINY01-E3Dv6full.h.bak +/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h +/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h From 839de141a37e47c7611c1acc9895161fa0061114 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 29 Nov 2018 16:26:49 +0100 Subject: [PATCH 06/19] resolving conflicts --- Firmware/Marlin_main.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5b2794579..fa93facb8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8267,6 +8267,10 @@ void uvlo_() // are in action. planner_abort_hard(); + // Store the current extruder position. + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3]?0:1); + // Clean the input command queue. cmdqueue_reset(); card.sdprinting = false; @@ -8322,10 +8326,6 @@ void uvlo_() // for reaching the zero full step before powering off. eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); // Store the current position. - // Store the current extruder position. - // eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3] ? 0 : 1); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z), current_position[Z_AXIS]); @@ -8624,10 +8624,9 @@ void restore_print_from_eeprom() { enquecommand(cmd); uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); - MYSERIAL.println(position); - + MYSERIAL.println(position); // E axis relative mode. - enquecommand_P(PSTR("M83")); + enquecommand_P(PSTR("M83")); // Move to the XY print position in logical coordinates, where the print has been killed. strcpy_P(cmd, PSTR("G1 X")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)))); strcat_P(cmd, PSTR(" Y")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)))); From cb334238cc872cbcf634c91441b8ac0a180540af Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 6 Dec 2018 15:18:07 +0100 Subject: [PATCH 07/19] Slow PWM fan @ 62.5Hz --- Firmware/Configuration.h | 3 ++- Firmware/temperature.cpp | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3bed653b7..0ca8f601d 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -477,7 +477,8 @@ your extruder heater takes 2 minutes to hit the target on heating. // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency // which is not ass annoying as with the hardware PWM. On the other hand, if this frequency // is too low, you should also increment SOFT_PWM_SCALE. -//#define FAN_SOFT_PWM +#define FAN_SOFT_PWM +#define FAN_SOFT_PWM_BITS 4 //PWM bit resolution = 4bits, freq = 62.5Hz // Incrementing this by 1 will double the software PWM frequency, // affecting heaters, and the fan if FAN_SOFT_PWM is enabled. diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index cae3fada7..98e8aee37 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1024,7 +1024,7 @@ void tp_init() setPwmFrequency(FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8 #endif #ifdef FAN_SOFT_PWM - soft_pwm_fan = fanSpeedSoftPwm / 2; + soft_pwm_fan = fanSpeedSoftPwm / (1 << (8 - FAN_SOFT_PWM_BITS)); #endif #endif @@ -1599,12 +1599,15 @@ ISR(TIMER0_COMPB_vect) #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 soft_pwm_b = soft_pwm_bed; if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0); -#endif -#ifdef FAN_SOFT_PWM - soft_pwm_fan = fanSpeedSoftPwm / 2; - if(soft_pwm_fan > 0) WRITE(FAN_PIN,1); else WRITE(FAN_PIN,0); #endif } +#ifdef FAN_SOFT_PWM + if ((pwm_count & ((1 << FAN_SOFT_PWM_BITS) - 1)) == 0) + { + soft_pwm_fan = fanSpeedSoftPwm / (1 << (8 - FAN_SOFT_PWM_BITS)); + if(soft_pwm_fan > 0) WRITE(FAN_PIN,1); else WRITE(FAN_PIN,0); + } +#endif if(soft_pwm_0 < pwm_count) { WRITE(HEATER_0_PIN,0); @@ -1623,7 +1626,7 @@ ISR(TIMER0_COMPB_vect) if(soft_pwm_b < pwm_count) WRITE(HEATER_BED_PIN,0); #endif #ifdef FAN_SOFT_PWM - if(soft_pwm_fan < pwm_count) WRITE(FAN_PIN,0); + if (soft_pwm_fan < (pwm_count & ((1 << FAN_SOFT_PWM_BITS) - 1))) WRITE(FAN_PIN,0); #endif pwm_count += (1 << SOFT_PWM_SCALE); @@ -1810,8 +1813,8 @@ ISR(TIMER0_COMPB_vect) #endif #ifdef FAN_SOFT_PWM - if (pwm_count == 0){ - soft_pwm_fan = fanSpeedSoftPwm / 2; + if ((pwm_count & ((1 << FAN_SOFT_PWM_BITS) - 1)) == 0) + soft_pwm_fan = fanSpeedSoftPwm / (1 << (8 - FAN_SOFT_PWM_BITS)); if (soft_pwm_fan > 0) WRITE(FAN_PIN,1); else WRITE(FAN_PIN,0); } if (soft_pwm_fan < pwm_count) WRITE(FAN_PIN,0); From 41b78187ca96f55f679cb7a0cff8e499b5749dbd Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 6 Dec 2018 15:27:05 +0100 Subject: [PATCH 08/19] LCD backlight - full brightnes at start --- Firmware/Marlin_main.cpp | 4 ++++ Firmware/pins_Einsy_1_0.h | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fa93facb8..4cd27ce6d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -974,6 +974,10 @@ void setup() ultralcd_init(); +#if (LCD_BL_PIN != -1) + analogWrite(LCD_BL_PIN, 255); //set full brightnes +#endif //(LCD_BL_PIN != -1) + spi_init(); lcd_splash(); diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index eabdb4abb..35f7ced26 100644 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -99,10 +99,7 @@ //#define KILL_PIN 32 - -//#define LCD_PWM_PIN -1//32 // lcd backlight brightnes pwm control pin -//#define LCD_PWM_MAX 0x0f // lcd pwm maximum value (0x07=64Hz, 0x0f=32Hz, 0x1f=16Hz) - +#define LCD_BL_PIN 5 //backlight control pin #define BEEPER 84 // Beeper on AUX-4 #define LCD_PINS_RS 82 #define LCD_PINS_ENABLE 61 // !!! changed from 18 (EINY03) From 6157c3ab3247815414209bcdb9fc6cc8e6af83af Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 6 Dec 2018 15:41:53 +0100 Subject: [PATCH 09/19] New filament sensor --- Firmware/Marlin_main.cpp | 9 +++++++++ Firmware/fsensor.cpp | 13 +++++++++++++ Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 + 3 files changed, 23 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4cd27ce6d..5e4d54875 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1813,6 +1813,15 @@ void loop() isPrintPaused ? manage_inactivity(true) : manage_inactivity(false); checkHitEndstops(); lcd_update(0); +#ifdef NEW_FILAMENT_SENSOR + if (mcode_in_progress != 600 && !mmu_enabled) //M600 not in progress + { + if (IS_SD_PRINTING) + { + fsensor_update(); + } + } +#endif //NEW_FILAMENT_SENSOR #ifdef TMC2130 tmc2130_check_overtemp(); if (tmc2130_sg_crash) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 8eef5a4fe..cddd40819 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -477,6 +477,18 @@ void fsensor_st_block_chunk(block_t* bl, int cnt) //! If there is still no plausible signal from filament sensor plans M600 (Filament change). void fsensor_update(void) { +#ifdef NEW_FILAMENT_SENSOR + if (digitalRead(A8) == 1) + { + fsensor_stop_and_save_print(); + printf_P(PSTR("fsensor_update - M600\n")); + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P(PSTR("FSENSOR_RECOVER")); + enquecommand_front_P((PSTR("M600"))); + fsensor_watch_runout = false; + } +#else //NEW_FILAMENT_SENSOR if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX)) { bool autoload_enabled_tmp = fsensor_autoload_enabled; @@ -527,6 +539,7 @@ void fsensor_update(void) fsensor_autoload_enabled = autoload_enabled_tmp; fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; } +#endif //NEW_FILAMENT_SENSOR } void fsensor_setup_interrupt(void) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 4655107c0..9bc491fc8 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -134,6 +134,7 @@ // Filament sensor #define PAT9125 #define FILAMENT_SENSOR +//#define NEW_FILAMENT_SENSOR // Backlash - //#define BACKLASH_X From e0c1e4a02d45c2d8e81c94833164ace070c6e4fa Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 24 Jan 2019 01:12:30 +0100 Subject: [PATCH 10/19] version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 15 +- Firmware/fsensor.cpp | 131 +++++++++++------- Firmware/mmu.cpp | 71 +++++----- Firmware/mmu.h | 4 +- Firmware/pins_Einsy_1_0.h | 2 +- Firmware/pins_Rambo_1_0.h | 2 +- Firmware/pins_Rambo_1_3.h | 2 +- Firmware/ultralcd.cpp | 6 +- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 4 +- .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 4 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 6 +- 12 files changed, 134 insertions(+), 114 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 6d965a99e..33703708b 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -372,6 +372,7 @@ extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff #define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CUSTOM_MSG_TYPE_TEMCAL) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused || mmu_print_saved) +#define CHECK_FSENSOR ((IS_SD_PRINTING || is_usb_printing) && (mcode_in_progress != 600) && !saved_printing && e_active()) extern void calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 306d76903..c3ae614c9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1615,7 +1615,6 @@ void setup() } #endif //UVLO_SUPPORT - KEEPALIVE_STATE(NOT_BUSY); #ifdef WATCHDOG wdt_enable(WDTO_4S); @@ -1835,15 +1834,6 @@ void loop() isPrintPaused ? manage_inactivity(true) : manage_inactivity(false); checkHitEndstops(); lcd_update(0); -#ifdef NEW_FILAMENT_SENSOR - if (mcode_in_progress != 600 && !mmu_enabled) //M600 not in progress - { - if (IS_SD_PRINTING) - { - fsensor_update(); - } - } -#endif //NEW_FILAMENT_SENSOR #ifdef TMC2130 tmc2130_check_overtemp(); if (tmc2130_sg_crash) @@ -3462,11 +3452,11 @@ void process_commands() } #endif //BACKLASH_Y #endif //TMC2130 -#ifdef PAT9125 +#ifdef FILAMENT_SENSOR else if (code_seen("FSENSOR_RECOVER")) { //! FSENSOR_RECOVER fsensor_restore_print_and_continue(); } -#endif //PAT9125 +#endif //FILAMENT_SENSOR else if(code_seen("PRUSA")){ if (code_seen("Ping")) { //! PRUSA Ping if (farm_mode) { @@ -7113,7 +7103,6 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) dcode_8(); break; case 9: //! D9 - Read/Write ADC dcode_9(); break; - case 10: //! D10 - XYZ calibration = OK dcode_10(); break; diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index cddd40819..0c511a827 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -13,6 +13,7 @@ #include "ultralcd.h" #include "ConfigurationStore.h" #include "mmu.h" +#include "cardreader.h" //! @name Basic parameters //! @{ @@ -120,17 +121,20 @@ void fsensor_stop_and_save_print(void) void fsensor_restore_print_and_continue(void) { printf_P(PSTR("fsensor_restore_print_and_continue\n")); - fsensor_watch_runout = true; - fsensor_err_cnt = 0; + fsensor_watch_runout = true; + fsensor_err_cnt = 0; restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change } void fsensor_init(void) { +#ifdef PAT9125 uint8_t pat9125 = pat9125_init(); printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125); +#endif //PAT9125 uint8_t fsensor = eeprom_read_byte((uint8_t*)EEPROM_FSENSOR); fsensor_autoload_enabled=eeprom_read_byte((uint8_t*)EEPROM_FSENS_AUTOLOAD_ENABLED); +#ifdef PAT9125 uint8_t oq_meassure_enabled = eeprom_read_byte((uint8_t*)EEPROM_FSENS_OQ_MEASS_ENABLED); fsensor_oq_meassure_enabled = (oq_meassure_enabled == 1)?true:false; fsensor_chunk_len = (int16_t)(FSENSOR_CHUNK_LEN * cs.axis_steps_per_unit[E_AXIS]); @@ -142,15 +146,19 @@ void fsensor_init(void) } else fsensor_not_responding = false; +#endif //PAT9125 if (fsensor) fsensor_enable(); else fsensor_disable(); printf_P(PSTR("FSensor %S\n"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED\n"))); + if (check_for_ir_sensor()) ir_sensor_detected = true; + } bool fsensor_enable(void) { +#ifdef PAT9125 if (mmu_enabled == false) { //filament sensor is pat9125, enable only if it is working uint8_t pat9125 = pat9125_init(); printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125); @@ -172,6 +180,11 @@ bool fsensor_enable(void) eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, 0x01); FSensorStateMenu = 1; } +#else + fsensor_enabled = true; + eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, 0x01); + FSensorStateMenu = 1; +#endif return fsensor_enabled; } @@ -223,6 +236,7 @@ void fsensor_autoload_check_start(void) void fsensor_autoload_check_stop(void) { +#ifdef PAT9125 // puts_P(_N("fsensor_autoload_check_stop\n")); if (!fsensor_enabled) return; // puts_P(_N("fsensor_autoload_check_stop 1\n")); @@ -234,12 +248,23 @@ void fsensor_autoload_check_stop(void) fsensor_watch_autoload = false; fsensor_watch_runout = true; fsensor_err_cnt = 0; +#endif //PAT9125 } bool fsensor_check_autoload(void) { if (!fsensor_enabled) return false; if (!fsensor_autoload_enabled) return false; + if (ir_sensor_detected) { + if (digitalRead(IR_SENSOR_PIN) == 1) { + fsensor_watch_autoload = true; + } + else if (fsensor_watch_autoload == true) { + fsensor_watch_autoload = false; + return true; + } + } +#ifdef PAT9125 if (!fsensor_watch_autoload) { fsensor_autoload_check_start(); @@ -283,6 +308,7 @@ bool fsensor_check_autoload(void) // puts_P(_N("fsensor_check_autoload = true !!!\n")); return true; } +#endif //PAT9125 return false; } @@ -362,7 +388,7 @@ bool fsensor_oq_result(void) ISR(FSENSOR_INT_PIN_VECT) { - if (mmu_enabled) return; + if (mmu_enabled || ir_sensor_detected) return; if (!((fsensor_int_pin_old ^ FSENSOR_INT_PIN_PIN_REG) & FSENSOR_INT_PIN_MASK)) return; fsensor_int_pin_old = FSENSOR_INT_PIN_PIN_REG; static bool _lock = false; @@ -477,29 +503,18 @@ void fsensor_st_block_chunk(block_t* bl, int cnt) //! If there is still no plausible signal from filament sensor plans M600 (Filament change). void fsensor_update(void) { -#ifdef NEW_FILAMENT_SENSOR - if (digitalRead(A8) == 1) - { - fsensor_stop_and_save_print(); - printf_P(PSTR("fsensor_update - M600\n")); - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("FSENSOR_RECOVER")); - enquecommand_front_P((PSTR("M600"))); - fsensor_watch_runout = false; - } -#else //NEW_FILAMENT_SENSOR - if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX)) - { - bool autoload_enabled_tmp = fsensor_autoload_enabled; - fsensor_autoload_enabled = false; - bool oq_meassure_enabled_tmp = fsensor_oq_meassure_enabled; - fsensor_oq_meassure_enabled = true; +#ifdef PAT9125 + if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX)) + { + bool autoload_enabled_tmp = fsensor_autoload_enabled; + fsensor_autoload_enabled = false; + bool oq_meassure_enabled_tmp = fsensor_oq_meassure_enabled; + fsensor_oq_meassure_enabled = true; - fsensor_stop_and_save_print(); + fsensor_stop_and_save_print(); - fsensor_err_cnt = 0; - fsensor_oq_meassure_start(0); + fsensor_err_cnt = 0; + fsensor_oq_meassure_start(0); enquecommand_front_P((PSTR("G1 E-3 F200"))); process_commands(); @@ -507,39 +522,49 @@ void fsensor_update(void) cmdqueue_pop_front(); st_synchronize(); - enquecommand_front_P((PSTR("G1 E3 F200"))); - process_commands(); - KEEPALIVE_STATE(IN_HANDLER); - cmdqueue_pop_front(); - st_synchronize(); + enquecommand_front_P((PSTR("G1 E3 F200"))); + process_commands(); + KEEPALIVE_STATE(IN_HANDLER); + cmdqueue_pop_front(); + st_synchronize(); - uint8_t err_cnt = fsensor_err_cnt; - fsensor_oq_meassure_stop(); + uint8_t err_cnt = fsensor_err_cnt; + fsensor_oq_meassure_stop(); - bool err = false; - err |= (err_cnt > 1); + bool err = false; + err |= (err_cnt > 1); - err |= (fsensor_oq_er_sum > 2); - err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD)); + err |= (fsensor_oq_er_sum > 2); + err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD)); - if (!err) - { - printf_P(PSTR("fsensor_err_cnt = 0\n")); - fsensor_restore_print_and_continue(); - } - else - { - printf_P(PSTR("fsensor_update - M600\n")); - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("FSENSOR_RECOVER")); - enquecommand_front_P((PSTR("M600"))); - fsensor_watch_runout = false; - } - fsensor_autoload_enabled = autoload_enabled_tmp; - fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; - } -#endif //NEW_FILAMENT_SENSOR + if (!err) + { + printf_P(PSTR("fsensor_err_cnt = 0\n")); + fsensor_restore_print_and_continue(); + } + else + { + printf_P(PSTR("fsensor_update - M600\n")); + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P(PSTR("FSENSOR_RECOVER")); + enquecommand_front_P((PSTR("M600"))); + fsensor_watch_runout = false; + } + fsensor_autoload_enabled = autoload_enabled_tmp; + fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; + } +#else //PAT9125 + if ((digitalRead(IR_SENSOR_PIN) == 1) && CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected) + { + fsensor_stop_and_save_print(); + printf_P(PSTR("fsensor_update - M600\n")); + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P(PSTR("FSENSOR_RECOVER")); + enquecommand_front_P((PSTR("M600"))); + } +#endif //PAT9125 } void fsensor_setup_interrupt(void) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 6433eafb5..2b5bd3ca5 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -19,8 +19,6 @@ #include "tmc2130.h" #endif //TMC2130 -#define CHECK_FINDA ((IS_SD_PRINTING || is_usb_printing) && (mcode_in_progress != 600) && !saved_printing && e_active()) - #define MMU_TODELAY 100 #define MMU_TIMEOUT 10 #define MMU_CMD_TIMEOUT 45000ul //5min timeout for mmu commands (except P0) @@ -41,7 +39,7 @@ uint8_t mmu_cmd = 0; //idler ir sensor uint8_t mmu_idl_sens = 0; -bool mmu_idler_sensor_detected = false; +bool ir_sensor_detected = false; bool mmu_loading_flag = false; uint8_t mmu_extruder = MMU_FILAMENT_UNKNOWN; @@ -116,23 +114,31 @@ void mmu_init(void) _delay_ms(10); //wait 10ms for sure mmu_reset(); //reset mmu (HW or SW), do not wait for response mmu_state = -1; - PIN_INP(MMU_IDLER_SENSOR_PIN); //input mode - PIN_SET(MMU_IDLER_SENSOR_PIN); //pullup + PIN_INP(IR_SENSOR_PIN); //input mode + PIN_SET(IR_SENSOR_PIN); //pullup } //returns true if idler IR sensor was detected, otherwise returns false -bool check_for_idler_sensor() +bool check_for_ir_sensor() { +#ifdef IR_SENSOR + return true; +#endif //IR_SENSOR + bool detected = false; - //if MMU_IDLER_SENSOR_PIN input is low and pat9125sensor is not present we detected idler sensor - if ((PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) && fsensor_not_responding) - { - detected = true; - //printf_P(PSTR("Idler IR sensor detected\n")); + //if IR_SENSOR_PIN input is low and pat9125sensor is not present we detected idler sensor + if ((PIN_GET(IR_SENSOR_PIN) == 0) +#ifdef PAT9125 + && fsensor_not_responding +#endif //PAT9125 + ) + { + detected = true; + //printf_P(PSTR("Idler IR sensor detected\n")); } else { - //printf_P(PSTR("Idler IR sensor not detected\n")); + //printf_P(PSTR("Idler IR sensor not detected\n")); } return detected; } @@ -224,8 +230,6 @@ void mmu_loop(void) #endif //MMU_DEBUG && MMU_FINDA_DEBUG puts_P(PSTR("MMU - ENABLED")); mmu_enabled = true; - //if we have filament loaded into the nozzle, we can decide if printer has idler sensor right now; otherwise we will will wait till start of T-code so it will be detected on beginning of second T-code - if(check_for_idler_sensor()) mmu_idler_sensor_detected = true; mmu_state = 1; } return; @@ -241,7 +245,7 @@ void mmu_loop(void) mmu_printf_P(PSTR("T%d\n"), filament); mmu_state = 3; // wait for response mmu_fil_loaded = true; - if(mmu_idler_sensor_detected) mmu_idl_sens = 1; //if idler sensor detected, use it for T-code + if(ir_sensor_detected) mmu_idl_sens = 1; //if idler sensor detected, use it for T-code } else if ((mmu_cmd >= MMU_CMD_L0) && (mmu_cmd <= MMU_CMD_L4)) { @@ -259,7 +263,7 @@ void mmu_loop(void) #endif //MMU_DEBUG mmu_puts_P(PSTR("C0\n")); //send 'continue loading' mmu_state = 3; - if(mmu_idler_sensor_detected) mmu_idl_sens = 1; //if idler sensor detected use it for C0 code + if(ir_sensor_detected) mmu_idl_sens = 1; //if idler sensor detected use it for C0 code } else if (mmu_cmd == MMU_CMD_U0) { @@ -301,7 +305,9 @@ void mmu_loop(void) } else if ((mmu_last_response + 300) < millis()) //request every 300ms { - if(check_for_idler_sensor()) mmu_idler_sensor_detected = true; +#ifndef IR_SENSOR + if(check_for_ir_sensor()) ir_sensor_detected = true; +#endif //IR_SENSOR not defined #if defined MMU_DEBUG && defined MMU_FINDA_DEBUG puts_P(PSTR("MMU <= 'P0'")); #endif //MMU_DEBUG && MMU_FINDA_DEBUG @@ -317,7 +323,7 @@ void mmu_loop(void) printf_P(PSTR("MMU => '%dok'\n"), mmu_finda); #endif //MMU_DEBUG && MMU_FINDA_DEBUG //printf_P(PSTR("Eact: %d\n"), int(e_active())); - if (!mmu_finda && CHECK_FINDA && fsensor_enabled) { + if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) { fsensor_stop_and_save_print(); enquecommand_front_P(PSTR("FSENSOR_RECOVER")); //then recover if (lcd_autoDepleteEnabled()) enquecommand_front_P(PSTR("M600 AUTO")); //save print and run M600 command @@ -333,21 +339,18 @@ void mmu_loop(void) } return; case 3: //response to mmu commands - if (mmu_idler_sensor_detected) { - if (mmu_idl_sens) + if (mmu_idl_sens && ir_sensor_detected) { + if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0 && mmu_loading_flag) - { #ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'A'\n")); #endif //MMU_DEBUG mmu_puts_P(PSTR("A\n")); //send 'abort' request mmu_idl_sens = 0; //printf_P(PSTR("MMU IDLER_SENSOR = 0 - ABORT\n")); - } - //else - //printf_P(PSTR("MMU IDLER_SENSOR = 1 - WAIT\n")); } + //else + //printf_P(PSTR("MMU IDLER_SENSOR = 1 - WAIT\n")); } if (mmu_rx_ok() > 0) { @@ -441,7 +444,7 @@ void mmu_load_step() { bool mmu_get_response(uint8_t move) { mmu_loading_flag = false; - if (!mmu_idler_sensor_detected) move = MMU_NO_MOVE; + if (!ir_sensor_detected) move = MMU_NO_MOVE; printf_P(PSTR("mmu_get_response - begin move:%d\n"), move); KEEPALIVE_STATE(IN_PROCESS); @@ -471,10 +474,10 @@ bool mmu_get_response(uint8_t move) mmu_loading_flag = true; mmu_load_step(); //don't rely on "ok" signal from mmu unit; if filament detected by idler sensor during loading stop loading movements to prevent infinite loading - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) move = MMU_NO_MOVE; + if (PIN_GET(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; break; case MMU_UNLOAD_MOVE: - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading + if (PIN_GET(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading { printf_P(PSTR("Unload 1\n")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; @@ -489,7 +492,7 @@ bool mmu_get_response(uint8_t move) } break; case MMU_TCODE_MOVE: //first do unload and then continue with infinite loading movements - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first + if (PIN_GET(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first { printf_P(PSTR("Unload 2\n")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; @@ -674,7 +677,7 @@ void mmu_load_to_nozzle() bool saved_e_relative_mode = axis_relative_modes[E_AXIS]; if (!saved_e_relative_mode) axis_relative_modes[E_AXIS] = true; - if (mmu_idler_sensor_detected) + if (ir_sensor_detected) { current_position[E_AXIS] += 3.0f; } @@ -1330,16 +1333,16 @@ void mmu_eject_filament(uint8_t filament, bool recover) void mmu_continue_loading() { - if (mmu_idler_sensor_detected) { + if (ir_sensor_detected) { for (uint8_t i = 0; i < MMU_IDLER_SENSOR_ATTEMPTS_NR; i++) { - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) return; + if (PIN_GET(IR_SENSOR_PIN) == 0) return; #ifdef MMU_DEBUG printf_P(PSTR("Additional load attempt nr. %d\n"), i); #endif // MMU_DEBUG mmu_command(MMU_CMD_C0); manage_response(true, true, MMU_LOAD_MOVE); } - if (PIN_GET(MMU_IDLER_SENSOR_PIN) != 0) { + if (PIN_GET(IR_SENSOR_PIN) != 0) { uint8_t mmu_load_fail = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); uint16_t mmu_load_fail_tot = eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT); if(mmu_load_fail < 255) eeprom_update_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL, mmu_load_fail + 1); @@ -1365,7 +1368,7 @@ void mmu_continue_loading() mmu_fil_loaded = false; //so we can retry same T-code again } } - else { //mmu_idler_sensor_detected == false + else { //mmu_ir_sensor_detected == false mmu_command(MMU_CMD_C0); } } diff --git a/Firmware/mmu.h b/Firmware/mmu.h index 30f35599f..6e7704d64 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -11,7 +11,7 @@ extern uint8_t mmu_extruder; extern uint8_t tmp_extruder; extern int8_t mmu_finda; -extern bool mmu_idler_sensor_detected; +extern bool ir_sensor_detected; extern bool mmu_loading_flag; extern int16_t mmu_version; @@ -56,7 +56,7 @@ extern int mmu_printf_P(const char* format, ...); extern int8_t mmu_rx_ok(void); -extern bool check_for_idler_sensor(); +extern bool check_for_ir_sensor(); extern void mmu_init(void); diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 769f61629..005683c01 100644 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -118,7 +118,7 @@ #define TACH_0 79 // !!! changed from 81 (EINY03) #define TACH_1 80 -#define MMU_IDLER_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) +#define IR_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) // Support for an 8 bit logic analyzer, for example the Saleae. // Channels 0-2 are fast, they could generate 2.667Mhz waveform with a software loop. diff --git a/Firmware/pins_Rambo_1_0.h b/Firmware/pins_Rambo_1_0.h index b37ab641d..b973fd302 100644 --- a/Firmware/pins_Rambo_1_0.h +++ b/Firmware/pins_Rambo_1_0.h @@ -102,7 +102,7 @@ #define SDCARDDETECT 72 -#define MMU_IDLER_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) +#define IR_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) // Support for an 8 bit logic analyzer, for example the Saleae. // Channels 0-2 are fast, they could generate 2.667Mhz waveform with a software loop. diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h index 297735c18..d684519e2 100644 --- a/Firmware/pins_Rambo_1_3.h +++ b/Firmware/pins_Rambo_1_3.h @@ -102,7 +102,7 @@ #define SDCARDDETECT 15 -#define MMU_IDLER_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) +#define IR_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) // Support for an 8 bit logic analyzer, for example the Saleae. // Channels 0-2 are fast, they could generate 2.667Mhz waveform with a software loop. diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 937ccd5a1..371faec4f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3656,8 +3656,8 @@ static void lcd_show_sensors_state() if (mmu_enabled) { finda_state = mmu_finda; } - if (mmu_idler_sensor_detected) { - idler_state = !PIN_GET(MMU_IDLER_SENSOR_PIN); + if (ir_sensor_detected) { + idler_state = !PIN_GET(IR_SENSOR_PIN); } lcd_puts_at_P(0, 0, _i("Sensor state")); lcd_puts_at_P(1, 1, _i("PINDA:")); @@ -6418,7 +6418,7 @@ bool lcd_selftest() if (_result) { _progress = lcd_selftest_screen(8, _progress, 3, true, 2000); //bed ok -#ifdef FILAMENT_SENSOR +#ifdef PAT9125 if (mmu_enabled == false) { _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor _result = lcd_selftest_fsensor(); diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 0472a1082..a0323213c 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -110,8 +110,10 @@ #define DEFAULT_SAFETYTIMER_TIME_MINS 30 // Filament sensor -#define PAT9125 #define FILAMENT_SENSOR +#define PAT9125 +#define IR_SENSOR + #define DEBUG_DCODE3 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 615d34826..ba3de9104 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -111,8 +111,10 @@ #define DEFAULT_SAFETYTIMER_TIME_MINS 30 // Filament sensor -#define PAT9125 #define FILAMENT_SENSOR +#define PAT9125 +#define IR_SENSOR + #define DEBUG_DCODE3 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index a59d78990..e1ff0036c 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -132,10 +132,9 @@ #define DEFAULT_SAFETYTIMER_TIME_MINS 30 // Filament sensor -#define PAT9125 #define FILAMENT_SENSOR -//#define NEW_FILAMENT_SENSOR - +//#define PAT9125 +#define IR_SENSOR // Backlash - //#define BACKLASH_X //#define BACKLASH_Y @@ -615,7 +614,6 @@ #define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial - #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H From ad650241470214fb9aa72a059959b72567f999fd Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 24 Jan 2019 13:57:52 +0100 Subject: [PATCH 11/19] selftest: filament sensor check change --- Firmware/ultralcd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 371faec4f..26b6ee760 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6423,16 +6423,14 @@ bool lcd_selftest() _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor _result = lcd_selftest_fsensor(); } -#endif // FILAMENT_SENSOR } if (_result) { -#ifdef FILAMENT_SENSOR if (mmu_enabled == false) { _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK } -#endif // FILAMENT_SENSOR +#endif // PAT9125 _progress = lcd_selftest_screen(11, _progress, 3, true, 5000); //all correct } else From da2c9638930bc181318e7a822460f7b523e759ed Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 24 Jan 2019 16:00:52 +0100 Subject: [PATCH 12/19] conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed --- Firmware/Marlin_main.cpp | 12 ++++++++---- Firmware/fsensor.cpp | 7 +++++-- Firmware/fsensor.h | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c3ae614c9..066eef27f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7471,7 +7471,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s { if (fsensor_check_autoload()) { +#ifdef PAT9125 fsensor_autoload_check_stop(); +#endif //PAT9125 if (degHotend0() > EXTRUDE_MINTEMP) { if ((eSoundMode == e_SOUND_MODE_LOUD) || (eSoundMode == e_SOUND_MODE_ONCE)) @@ -7491,7 +7493,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s } else { +#ifdef PAT9125 fsensor_autoload_check_stop(); +#endif //PAT9125 fsensor_update(); } } @@ -9183,9 +9187,9 @@ void M600_load_filament() { //load_filament_time = millis(); KEEPALIVE_STATE(PAUSED_FOR_USER); -#ifdef FILAMENT_SENSOR +#ifdef PAT9125 fsensor_autoload_check_start(); -#endif //FILAMENT_SENSOR +#endif //PAT9125 while(!lcd_clicked()) { manage_heater(); @@ -9201,9 +9205,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } #endif //FILAMENT_SENSOR } -#ifdef FILAMENT_SENSOR +#ifdef PAT9125 fsensor_autoload_check_stop(); -#endif //FILAMENT_SENSOR +#endif //PAT9125 KEEPALIVE_STATE(IN_HANDLER); #ifdef FSENSOR_QUALITY diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 0c511a827..c5f8ee40b 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -197,7 +197,9 @@ void fsensor_disable(void) void fsensor_autoload_set(bool State) { +#ifdef PAT9125 if (!State) fsensor_autoload_check_stop(); +#endif //PAT9125 fsensor_autoload_enabled = State; eeprom_update_byte((unsigned char *)EEPROM_FSENS_AUTOLOAD_ENABLED, fsensor_autoload_enabled); } @@ -210,6 +212,7 @@ void pciSetup(byte pin) PCICR |= bit (digitalPinToPCICRbit(pin)); // enable interrupt for the group } +#ifdef PAT9125 void fsensor_autoload_check_start(void) { // puts_P(_N("fsensor_autoload_check_start\n")); @@ -236,7 +239,7 @@ void fsensor_autoload_check_start(void) void fsensor_autoload_check_stop(void) { -#ifdef PAT9125 + // puts_P(_N("fsensor_autoload_check_stop\n")); if (!fsensor_enabled) return; // puts_P(_N("fsensor_autoload_check_stop 1\n")); @@ -248,8 +251,8 @@ void fsensor_autoload_check_stop(void) fsensor_watch_autoload = false; fsensor_watch_runout = true; fsensor_err_cnt = 0; -#endif //PAT9125 } +#endif //PAT9125 bool fsensor_check_autoload(void) { diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index b60522d58..3237b5a70 100644 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -41,8 +41,10 @@ extern void fsensor_setup_interrupt(void); //! @name autoload support //! @{ +#ifdef PAT9125 extern void fsensor_autoload_check_start(void); extern void fsensor_autoload_check_stop(void); +#endif //PAT9125 extern bool fsensor_check_autoload(void); //! @} From 6b1cf99066fdd4a104ff0b8378480fb34d707462 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 24 Jan 2019 16:14:02 +0100 Subject: [PATCH 13/19] conditional compilation updated --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/fsensor.cpp | 34 ++++++++++++++++++---------------- Firmware/fsensor.h | 4 ++-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 066eef27f..ee1ee55ae 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1481,9 +1481,9 @@ void setup() setup_fan_interrupt(); #endif //DEBUG_DISABLE_FANCHECK -#ifdef FILAMENT_SENSOR +#ifdef PAT9125 fsensor_setup_interrupt(); -#endif //FILAMENT_SENSOR +#endif //PAT9125 for (int i = 0; i<4; i++) EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); #ifndef DEBUG_DISABLE_STARTMSGS diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index c5f8ee40b..c0654ee2f 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -388,7 +388,7 @@ bool fsensor_oq_result(void) printf_P(_N("fsensor_oq_result %S\n"), (res?_OK:_NG)); return res; } - +#ifdef PAT9125 ISR(FSENSOR_INT_PIN_VECT) { if (mmu_enabled || ir_sensor_detected) return; @@ -475,6 +475,23 @@ ISR(FSENSOR_INT_PIN_VECT) return; } +void fsensor_setup_interrupt(void) +{ + + pinMode(FSENSOR_INT_PIN, OUTPUT); + digitalWrite(FSENSOR_INT_PIN, LOW); + fsensor_int_pin_old = 0; + + //pciSetup(FSENSOR_INT_PIN); +// !!! "pciSetup()" does not provide the correct results for some MCU pins +// so interrupt registers settings: + FSENSOR_INT_PIN_PCMSK_REG |= bit(FSENSOR_INT_PIN_PCMSK_BIT); // enable corresponding PinChangeInterrupt (individual pin) + PCIFR |= bit(FSENSOR_INT_PIN_PCICR_BIT); // clear previous occasional interrupt (set of pins) + PCICR |= bit(FSENSOR_INT_PIN_PCICR_BIT); // enable corresponding PinChangeInterrupt (set of pins) +} + +#endif //PAT9125 + void fsensor_st_block_begin(block_t* bl) { if (!fsensor_enabled) return; @@ -569,18 +586,3 @@ void fsensor_update(void) } #endif //PAT9125 } - -void fsensor_setup_interrupt(void) -{ - - pinMode(FSENSOR_INT_PIN, OUTPUT); - digitalWrite(FSENSOR_INT_PIN, LOW); - fsensor_int_pin_old = 0; - - //pciSetup(FSENSOR_INT_PIN); -// !!! "pciSetup()" does not provide the correct results for some MCU pins -// so interrupt registers settings: - FSENSOR_INT_PIN_PCMSK_REG |= bit(FSENSOR_INT_PIN_PCMSK_BIT); // enable corresponding PinChangeInterrupt (individual pin) - PCIFR |= bit(FSENSOR_INT_PIN_PCICR_BIT); // clear previous occasional interrupt (set of pins) - PCICR |= bit(FSENSOR_INT_PIN_PCICR_BIT); // enable corresponding PinChangeInterrupt (set of pins) -} diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index 3237b5a70..71922fbfc 100644 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -35,13 +35,13 @@ extern bool fsensor_autoload_enabled; extern void fsensor_autoload_set(bool State); extern void fsensor_update(void); - +#ifdef PAT9125 //! setup pin-change interrupt extern void fsensor_setup_interrupt(void); //! @name autoload support //! @{ -#ifdef PAT9125 + extern void fsensor_autoload_check_start(void); extern void fsensor_autoload_check_stop(void); #endif //PAT9125 From 6b6a3d7d5fb6ccca998877aec5b2111b332392a7 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 25 Jan 2019 18:01:17 +0100 Subject: [PATCH 14/19] MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN --- Firmware/mmu.cpp | 6 +++--- Firmware/ultralcd.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index c901fa21d..4a208ee9c 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -349,7 +349,7 @@ void mmu_loop(void) case 3: //response to mmu commands if (mmu_idl_sens) { - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0 && mmu_loading_flag) + if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { #ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'A'\n")); @@ -510,7 +510,7 @@ bool mmu_get_response(uint8_t move) if (PIN_GET(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; break; case MMU_UNLOAD_MOVE: - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading + if (PIN_GET(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading { if (can_extrude()) { @@ -528,7 +528,7 @@ bool mmu_get_response(uint8_t move) } break; case MMU_TCODE_MOVE: //first do unload and then continue with infinite loading movements - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first + if (PIN_GET(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first { if (can_extrude()) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 80d03e68f..97f18fb94 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7023,7 +7023,7 @@ static bool lcd_selftest_fsensor(void) //! * Pre-heat to PLA extrude temperature. //! * Unload filament possibly present. //! * Move extruder idler same way as during filament load -//! and sample MMU_IDLER_SENSOR_PIN. +//! and sample IR_SENSOR_PIN. //! * Check that pin doesn't go low. //! //! @retval true passed @@ -7060,7 +7060,7 @@ static bool selftest_irsensor() mmu_load_step(false); while (blocks_queued()) { - if (PIN_GET(MMU_IDLER_SENSOR_PIN) == 0) return false; + if (PIN_GET(IR_SENSOR_PIN) == 0) return false; #ifdef TMC2130 manage_heater(); // Vojtech: Don't disable motors inside the planner! From fc1491670f75f2ad5dcbcfc1622e66e894042156 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 25 Jan 2019 18:03:05 +0100 Subject: [PATCH 15/19] mmu_idler_sensor_detected -> ir_sensor_detected --- Firmware/mmu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 4a208ee9c..790823493 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -477,7 +477,7 @@ void mmu_load_step(bool synchronize) //! off E-stepper to prevent over-heating and allow filament pull-out if necessary bool can_extrude() { - if ((degHotend(active_extruder) < EXTRUDE_MINTEMP) || !mmu_idler_sensor_detected) + if ((degHotend(active_extruder) < EXTRUDE_MINTEMP) || !ir_sensor_detected) { disable_e0(); delay_keep_alive(100); From 76db58605b19288f944fc13d42085ae3fcac0ad4 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 25 Jan 2019 18:37:23 +0100 Subject: [PATCH 16/19] Revert "Fast PWM for bed - timer2 used as system timer" This reverts commit 0963c889f065b60c9e42b524483dc94d260ba549. --- Firmware/temperature.cpp | 17 ++----- Firmware/temperature.h | 4 +- Firmware/timer02.c | 103 --------------------------------------- 3 files changed, 7 insertions(+), 117 deletions(-) delete mode 100644 Firmware/timer02.c diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 41b8a0779..92d1a3392 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -45,12 +45,6 @@ #include "Configuration_prusa.h" -extern "C" { -extern void timer02_init(void); -extern void timer02_set_pwm0(uint8_t pwm0); -} - - //=========================================================================== //=============================public variables============================ //=========================================================================== @@ -1017,6 +1011,7 @@ static void updateTemperaturesFromRawValues() CRITICAL_SECTION_END; } + void tp_init() { #if MB(RUMBA) && ((TEMP_SENSOR_0==-1)||(TEMP_SENSOR_1==-1)||(TEMP_SENSOR_2==-1)||(TEMP_SENSOR_BED==-1)) @@ -1083,12 +1078,10 @@ void tp_init() adc_init(); - timer02_init(); - // Use timer0 for temperature measurement // Interleave temperature interrupt with millies interrupt - OCR2B = 128; - TIMSK2 |= (1< -#include -#include - - -uint8_t timer02_pwm0 = 0; - -void timer02_set_pwm0(uint8_t pwm0) -{ - if (timer02_pwm0 == pwm0) return; - if (pwm0) - { - TCCR0A |= (2 << COM0B0); - OCR0B = pwm0 - 1; - } - else - { - TCCR0A &= ~(2 << COM0B0); - OCR0B = 0; - } -} - -void timer02_init(void) -{ - //save sreg - uint8_t _sreg = SREG; - //disable interrupts for sure - cli(); - //mask timer0 interrupts - disable all - TIMSK0 &= ~(1<> 3) -#define FRACT_MAX (1000 >> 3) - -extern volatile unsigned long timer0_overflow_count; -extern volatile unsigned long timer0_millis; -unsigned char timer0_fract = 0; - -ISR(TIMER2_OVF_vect) -{ - // copy these to local variables so they can be stored in registers - // (volatile variables must be read from memory on every access) - unsigned long m = timer0_millis; - unsigned char f = timer0_fract; - - m += MILLIS_INC; - f += FRACT_INC; - if (f >= FRACT_MAX) - { - f -= FRACT_MAX; - m += 1; - } - - timer0_fract = f; - timer0_millis = m; - timer0_overflow_count++; -} - From 31236e411ea121308a18b5062caee3364d49e3bf Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 25 Jan 2019 18:38:36 +0100 Subject: [PATCH 17/19] Revert "Fast PWM for bed - set pwm value from soft_pwm_bed variable." This reverts commit e612eb2a172c7911e484337c380f96702e53907c. --- Firmware/temperature.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 92d1a3392..070f9ad91 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -257,7 +257,6 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); if (extruder<0) { soft_pwm_bed = (MAX_BED_POWER)/2; - timer02_set_pwm0(soft_pwm_bed << 1); bias = d = (MAX_BED_POWER)/2; } else @@ -294,10 +293,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); if(millis() - t2 > 5000) { heating=false; if (extruder<0) - { soft_pwm_bed = (bias - d) >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); - } else soft_pwm[extruder] = (bias - d) >> 1; t1=millis(); @@ -351,10 +347,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); } } if (extruder<0) - { soft_pwm_bed = (bias + d) >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); - } else soft_pwm[extruder] = (bias + d) >> 1; pid_cycle++; @@ -788,11 +781,9 @@ void manage_heater() if(current_temperature_bed < BED_MAXTEMP) { soft_pwm_bed = (int)pid_output >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } #elif !defined(BED_LIMIT_SWITCHING) @@ -802,18 +793,15 @@ void manage_heater() if(current_temperature_bed >= target_temperature_bed) { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } else { soft_pwm_bed = MAX_BED_POWER>>1; - timer02_set_pwm0(soft_pwm_bed << 1); } } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); WRITE(HEATER_BED_PIN,LOW); } #else //#ifdef BED_LIMIT_SWITCHING @@ -823,18 +811,15 @@ void manage_heater() if(current_temperature_bed > target_temperature_bed + BED_HYSTERESIS) { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } else if(current_temperature_bed <= target_temperature_bed - BED_HYSTERESIS) { soft_pwm_bed = MAX_BED_POWER>>1; - timer02_set_pwm0(soft_pwm_bed << 1); } } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); WRITE(HEATER_BED_PIN,LOW); } #endif @@ -1389,7 +1374,6 @@ void disable_heater() #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 target_temperature_bed=0; soft_pwm_bed=0; - timer02_set_pwm0(soft_pwm_bed << 1); #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 WRITE(HEATER_BED_PIN,LOW); #endif From ab2a25cd3f26cbd068015a9003eb19e2ad5ec454 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 25 Jan 2019 18:38:46 +0100 Subject: [PATCH 18/19] Revert "Fast PWM for bed - newer set HEATER_BED_PIN to 1" This reverts commit 50bcfae1838e94ba570440342a3637ab5e49d9b7. --- Firmware/temperature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 070f9ad91..9b1e5e642 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1606,7 +1606,7 @@ ISR(TIMER0_COMPB_vect) #endif #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 soft_pwm_b = soft_pwm_bed; - //if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0); + if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0); #endif } #ifdef FAN_SOFT_PWM @@ -1743,7 +1743,7 @@ ISR(TIMER0_COMPB_vect) state_timer_heater_b = MIN_STATE_TIME; } state_heater_b = 1; - //WRITE(HEATER_BED_PIN, 1); + WRITE(HEATER_BED_PIN, 1); } } else { // turn OFF heather only if the minimum time is up From 0514306bed74f94019cd8c249ded22bad8c5bc2e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 28 Jan 2019 11:09:41 +0100 Subject: [PATCH 19/19] selftest fixed --- Firmware/Configuration.h | 2 +- Firmware/ultralcd.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 37b7f6be9..f32df0f62 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -13,7 +13,7 @@ // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_REPOSITORY "Unknown" -#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) +#define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) "a" // Debug version has debugging enabled (the symbol DEBUG_BUILD is set). // The debug build may be a bit slower than the non-debug build, therefore the debug build should diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 24cc11f62..2d86f68d2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6456,20 +6456,20 @@ bool lcd_selftest() if (mmu_enabled) { - _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor + _progress = lcd_selftest_screen(testScreen::fsensor, _progress, 3, true, 2000); //check filaments sensor _result = selftest_irsensor(); if (_result) { - _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK + _progress = lcd_selftest_screen(testScreen::fsensorOk, _progress, 3, true, 2000); //fil sensor OK } } else { #ifdef PAT9125 - _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor + _progress = lcd_selftest_screen(testScreen::fsensor, _progress, 3, true, 2000); //check filaments sensor _result = lcd_selftest_fsensor(); if (_result) { - _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK + _progress = lcd_selftest_screen(testScreen::fsensorOk, _progress, 3, true, 2000); //fil sensor OK } #endif //PAT9125 }