From 144b83138c727a0f0fb7a03bcf7a0db9e5c93f44 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d-gussner@users.noreply.github.com> Date: Wed, 23 Aug 2017 17:26:27 +0200 Subject: [PATCH 1/6] Cleanup unused pins and connectors - removed E_MUX2_PIN and updated function - unmarked #define DISABLE_MAX_ENDSTOPS, Prusa i3 MK2(s) doesn't use these end stops ... M119 shows now just used end stops --- Firmware/Configuration.h | 2 +- Firmware/Marlin_main.cpp | 5 ----- Firmware/pins.h | 2 -- Firmware/ultralcd.cpp | 7 +------ 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index dac3ff9b3..1ea4091d0 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -252,7 +252,7 @@ your extruder heater takes 2 minutes to hit the target on heating. const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop. -//#define DISABLE_MAX_ENDSTOPS +#define DISABLE_MAX_ENDSTOPS //#define DISABLE_MIN_ENDSTOPS // Disable max endstops for compatibility with endstop checking routine diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 766ca97a2..847ddb985 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5629,7 +5629,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp pinMode(E_MUX0_PIN, OUTPUT); pinMode(E_MUX1_PIN, OUTPUT); - pinMode(E_MUX2_PIN, OUTPUT); delay(100); SERIAL_ECHO_START; @@ -5639,25 +5638,21 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp case 1: WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX1_PIN, LOW); - WRITE(E_MUX2_PIN, LOW); break; case 2: WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX1_PIN, HIGH); - WRITE(E_MUX2_PIN, LOW); break; case 3: WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX1_PIN, HIGH); - WRITE(E_MUX2_PIN, LOW); break; default: WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX1_PIN, LOW); - WRITE(E_MUX2_PIN, LOW); break; } diff --git a/Firmware/pins.h b/Firmware/pins.h index 9a979fdd3..68375db79 100644 --- a/Firmware/pins.h +++ b/Firmware/pins.h @@ -67,7 +67,6 @@ #define E_MUX0_PIN 17 #define E_MUX1_PIN 16 -#define E_MUX2_PIN 84 #endif @@ -229,7 +228,6 @@ #define E_MUX0_PIN 17 #define E_MUX1_PIN 16 -#define E_MUX2_PIN 84 #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 40e036741..06ccc5dea 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3264,31 +3264,26 @@ void change_extr(int extr) { //switches multiplexer for extruders pinMode(E_MUX0_PIN, OUTPUT); pinMode(E_MUX1_PIN, OUTPUT); - pinMode(E_MUX2_PIN, OUTPUT); switch (extr) { case 1: WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX1_PIN, LOW); - WRITE(E_MUX2_PIN, LOW); break; case 2: WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX1_PIN, HIGH); - WRITE(E_MUX2_PIN, LOW); break; case 3: WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX1_PIN, HIGH); - WRITE(E_MUX2_PIN, LOW); break; default: WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX1_PIN, LOW); - WRITE(E_MUX2_PIN, LOW); break; } @@ -3296,7 +3291,7 @@ void change_extr(int extr) { //switches multiplexer for extruders } static int get_ext_nr() { //reads multiplexer input pins and return current extruder number (counted from 0) - return(4 * READ(E_MUX2_PIN) + 2 * READ(E_MUX1_PIN) + READ(E_MUX0_PIN)); + return(2 * READ(E_MUX1_PIN) + READ(E_MUX0_PIN)); } From 436a79aa8df3eeaeae7ce3293e2a93825be3e2b1 Mon Sep 17 00:00:00 2001 From: Andre Sklenar Date: Fri, 25 Aug 2017 14:21:11 +0200 Subject: [PATCH 2/6] add a software reset GCODE --- Firmware/Marlin_main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 766ca97a2..1aaa892d2 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2096,11 +2096,18 @@ void process_commands() PingTime = millis(); //MYSERIAL.print(farm_no); MYSERIAL.println(": OK"); } - } - else if (code_seen("PRN")) { + } else if (code_seen("PRN")) { MYSERIAL.println(status_number); - }else if (code_seen("fn")) { + } else if (code_seen("RESET")) { + // careful! + if (farm_mode) { + asm volatile(" jmp 0x3E000"); + } + else { + MYSERIAL.println("Not in farm mode."); + } + } else if (code_seen("fn")) { if (farm_mode) { MYSERIAL.println(farm_no); } From 87cadb1f681868f8be78ddea5182aa9a3383f696 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 29 Aug 2017 15:52:53 +0200 Subject: [PATCH 3/6] statistics improved, initial version of function which forces user to connect printer to monitoring --- Firmware/Marlin.h | 4 ++ Firmware/Marlin_main.cpp | 10 +++ Firmware/ultralcd.cpp | 70 ++++++++++++++++--- Firmware/ultralcd.h | 3 + .../ultralcd_implementation_hitachi_HD44780.h | 60 ++++++++-------- 5 files changed, 109 insertions(+), 38 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 230eb2e55..73f4f4c7b 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -302,6 +302,10 @@ extern unsigned int custom_message_type; extern unsigned int custom_message_state; extern char snmm_filaments_used; extern unsigned long PingTime; +extern unsigned long NcTime; +extern bool no_response; +extern uint8_t important_status; +extern uint8_t saved_filament_type; // Handling multiple extruders pins diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 766ca97a2..a2204721b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -225,6 +225,8 @@ CardReader card; unsigned long TimeSent = millis(); unsigned long TimeNow = millis(); unsigned long PingTime = millis(); +unsigned long NcTime; + union Data { byte b[2]; @@ -385,6 +387,10 @@ bool cancel_heatup = false ; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; +bool no_response = false; +uint8_t important_status; +uint8_t saved_filament_type; + //=========================================================================== //=============================Private Variables============================= //=========================================================================== @@ -2058,6 +2064,7 @@ void ramming() { */ void process_commands() { + if (!buflen) return; //empty command #ifdef FILAMENT_RUNOUT_SUPPORT SET_INPUT(FR_SENS); #endif @@ -2108,6 +2115,9 @@ void process_commands() MYSERIAL.println("Not in farm mode."); } + } + else if (code_seen("thx")) { + no_response = false; }else if (code_seen("fv")) { // get file version #ifdef SDSUPPORT diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 40e036741..0676799d2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2133,14 +2133,14 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { farm_timer = 2; break; case 6: // print done - SERIAL_ECHOLN("{[PRN:8]"); + SERIAL_ECHO("{[PRN:8]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); status_number = 8; farm_timer = 2; break; case 7: // print done - stopped - SERIAL_ECHOLN("{[PRN:9]"); + SERIAL_ECHO("{[PRN:9]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); status_number = 9; @@ -2154,7 +2154,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { farm_timer = 2; break; case 20: // echo farm no - SERIAL_ECHOLN("{"); + SERIAL_ECHO("{"); prusa_stat_printerstatus(status_number); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); @@ -2168,19 +2168,19 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { SERIAL_ECHOLN("}"); break; case 22: // waiting for filament change - SERIAL_ECHOLN("{[PRN:5]"); + SERIAL_ECHO("{[PRN:5]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); status_number = 5; break; case 90: // Error - Thermal Runaway - SERIAL_ECHOLN("{[ERR:1]"); + SERIAL_ECHO("{[ERR:1]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); break; case 91: // Error - Thermal Runaway Preheat - SERIAL_ECHOLN("{[ERR:2]"); + SERIAL_ECHO("{[ERR:2]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); break; @@ -2190,7 +2190,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { SERIAL_ECHOLN("}"); break; case 93: // Error - Max temp - SERIAL_ECHOLN("{[ERR:4]"); + SERIAL_ECHO("{[ERR:4]"); prusa_stat_farm_number(); SERIAL_ECHOLN("}"); break; @@ -3773,12 +3773,20 @@ void lcd_confirm_print() _ret = 1; filament_type = lcd_choose_color(); prusa_statistics(4, filament_type); + no_response = true; //we need confirmation by recieving PRUSA thx + important_status = 4; + saved_filament_type = filament_type; + NcTime = millis(); } if (cursor_pos == 2) { _ret = 2; filament_type = lcd_choose_color(); prusa_statistics(5, filament_type); + no_response = true; //we need confirmation by recieving PRUSA thx + important_status = 5; + saved_filament_type = filament_type; + NcTime = millis(); } } @@ -3849,7 +3857,7 @@ static void lcd_main_menu() }*/ - + if ( ( IS_SD_PRINTING || is_usb_printing ) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);//8 @@ -4109,7 +4117,7 @@ void lcd_sdcard_stop() lcd_return_to_status(); lcd_ignore_click(true); lcd_commands_type = LCD_COMMAND_STOP_PRINT; - + if (farm_mode) prusa_statistics(7); // Turn off the print fan SET_OUTPUT(FAN_PIN); WRITE(FAN_PIN, 0); @@ -5202,12 +5210,56 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) } if (!SdFatUtil::test_stack_integrity()) stack_error(); lcd_ping(); //check that we have received ping command if we are in farm mode + lcd_send_status(); } void lcd_printer_connected() { printer_connected = true; } +static void lcd_send_status() { + if (farm_mode && no_response && ((millis() - NcTime) > (NC_TIME * 1000))) { + //send important status messages periodicaly + prusa_statistics(important_status, saved_filament_type); + NcTime = millis(); + lcd_connect_printer(); + } +}; + +static void lcd_connect_printer() { + lcd_update_enable(false); + lcd_implementation_clear(); + + bool pressed = false; + int i = 0; + int t = 0; + lcd_set_custom_characters_progress(); + lcd_implementation_print_at(0, 0, "Connect printer to"); + lcd_implementation_print_at(0, 1, "monitoring or hold"); + lcd_implementation_print_at(0, 2, "the knob to continue"); + while (no_response) { + i++; + t++; + delay_keep_alive(100); + process_commands(); + if (t == 10) { + prusa_statistics(important_status, saved_filament_type); + t = 0; + } + if (READ(BTN_ENC)) { //if button is not pressed + i = 0; + lcd_implementation_print_at(0, 3, " "); + } + if (i!=0) lcd_implementation_print_at((i * 20) / (NC_BUTTON_LONG_PRESS * 10), 3, "\x01"); + if (i == NC_BUTTON_LONG_PRESS * 10) { + no_response = false; + } + } + lcd_set_custom_characters_degree(); + lcd_update_enable(true); + lcd_update(2); +} + void lcd_ping() { //chceck if printer is connected to monitoring when in farm mode if (farm_mode) { bool empty = is_buffer_empty(); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 99b3c4485..c0c8d67f0 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -266,4 +266,7 @@ void lcd_set_arrows(); void lcd_set_progress(); #endif +static void lcd_send_status(); +static void lcd_connect_printer(); + #endif //ULTRALCD_H \ No newline at end of file diff --git a/Firmware/ultralcd_implementation_hitachi_HD44780.h b/Firmware/ultralcd_implementation_hitachi_HD44780.h index 3c7bbd009..c421140f7 100644 --- a/Firmware/ultralcd_implementation_hitachi_HD44780.h +++ b/Firmware/ultralcd_implementation_hitachi_HD44780.h @@ -831,7 +831,7 @@ static void lcd_implementation_status_screen() if (heating_status != 0) { custom_message = true; } // If printing from SD, show what we are printing - if ((IS_SD_PRINTING) && !custom_message) + if (IS_SD_PRINTING) { if(strcmp(longFilenameOLD, card.longFilename) != 0) @@ -840,38 +840,40 @@ static void lcd_implementation_status_screen() sprintf_P(longFilenameOLD, PSTR("%s"), card.longFilename); scrollstuff = 0; } + if (!custom_message) { - if(strlen(card.longFilename) > LCD_WIDTH) - { - - int inters = 0; - int gh = scrollstuff; - while( ((gh-scrollstuff) LCD_WIDTH) { - lcd.setCursor(gh-scrollstuff, 3); - lcd.print(card.longFilename[gh-1]); - scrollstuff = 0; - gh = scrollstuff; - inters = 1; - } + + int inters = 0; + int gh = scrollstuff; + while (((gh - scrollstuff) < LCD_WIDTH) && (inters == 0)) + { + + if (card.longFilename[gh] == '\0') + { + lcd.setCursor(gh - scrollstuff, 3); + lcd.print(card.longFilename[gh - 1]); + scrollstuff = 0; + gh = scrollstuff; + inters = 1; + } + else + { + lcd.setCursor(gh - scrollstuff, 3); + lcd.print(card.longFilename[gh - 1]); + gh++; + } + + + } + scrollstuff++; + } else { - lcd.setCursor(gh-scrollstuff, 3); - lcd.print(card.longFilename[gh-1]); - gh++; - } - - - } - scrollstuff++; - } - else - { - lcd.print(longFilenameOLD); - } + lcd.print(longFilenameOLD); + } + } } From 00569fea6a76a86f9fb6d434990340f7579baf4f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 29 Aug 2017 16:52:14 +0200 Subject: [PATCH 4/6] sorting files disabled in farm mode, start printer status needs reponse from monitoring --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 15 ++++++++++++++- Firmware/cardreader.cpp | 1 + Firmware/ultralcd.cpp | 16 +++++++++------- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 73f4f4c7b..61d7c2c75 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -355,3 +355,4 @@ void temp_compensation_apply(); void temp_compensation_start(); void wait_for_heater(long codenum); void serialecho_temperatures(); +void proc_commands(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a2204721b..5762fb110 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1016,6 +1016,8 @@ void setup() if (farm_mode) { prusa_statistics(8); + no_response = true; //we need confirmation by recieving PRUSA thx + important_status = 8; selectedSerialPort = 1; } else { selectedSerialPort = 0; @@ -1173,6 +1175,8 @@ void setup() if (farm_mode) { prusa_statistics(8); + no_response = true; //we need confirmation by recieving PRUSA thx + important_status = 8; } // Enable Toshiba FlashAir SD card / WiFi enahanced card. @@ -1391,6 +1395,16 @@ void loop() lcd_update(); } +void proc_commands() { + if (buflen) + { + process_commands(); + if (!cmdbuffer_front_already_processed) + cmdqueue_pop_front(); + cmdbuffer_front_already_processed = false; + } +} + void get_command() { // Test and reserve space for the new command string. @@ -2064,7 +2078,6 @@ void ramming() { */ void process_commands() { - if (!buflen) return; //empty command #ifdef FILAMENT_RUNOUT_SUPPORT SET_INPUT(FR_SENS); #endif diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 51c02d7d9..db20b6a86 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -706,6 +706,7 @@ void CardReader::getfilename_sorted(const uint16_t nr) { */ void CardReader::presort() { + if (farm_mode) return; //sorting is not used in farm mode uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT); if (sdSort == SD_SORT_NONE) return; //sd sort is turned off diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0676799d2..3b01ca4f9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4167,14 +4167,16 @@ void lcd_sdcard_menu() START_MENU(); MENU_ITEM(back, MSG_MAIN, lcd_main_menu); + if (!farm_mode) { #ifdef SDCARD_SORT_ALPHA - EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); - switch(sdSort){ - case SD_SORT_TIME: MENU_ITEM(function, MSG_SORT_TIME, lcd_sort_type_set); break; - case SD_SORT_ALPHA: MENU_ITEM(function, MSG_SORT_ALPHA, lcd_sort_type_set); break; - default: MENU_ITEM(function, MSG_SORT_NONE, lcd_sort_type_set); - } + EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); + switch (sdSort) { + case SD_SORT_TIME: MENU_ITEM(function, MSG_SORT_TIME, lcd_sort_type_set); break; + case SD_SORT_ALPHA: MENU_ITEM(function, MSG_SORT_ALPHA, lcd_sort_type_set); break; + default: MENU_ITEM(function, MSG_SORT_NONE, lcd_sort_type_set); + } #endif // SDCARD_SORT_ALPHA + } card.getWorkDirName(); if (card.filename[0] == '/') { @@ -5241,7 +5243,7 @@ static void lcd_connect_printer() { i++; t++; delay_keep_alive(100); - process_commands(); + process_command_small(); if (t == 10) { prusa_statistics(important_status, saved_filament_type); t = 0; From 864321fc4aff07b96f29ec162687998cf4867d8a Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 29 Aug 2017 17:13:55 +0200 Subject: [PATCH 5/6] removed "Printer disconnected" message --- Firmware/ultralcd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3b01ca4f9..ffeb1315f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -506,10 +506,10 @@ static void lcd_status_screen() feedmultiply = 999; #endif //ULTIPANEL - if (farm_mode && !printer_connected) { + /*if (farm_mode && !printer_connected) { lcd.setCursor(0, 3); lcd_printPGM(MSG_PRINTER_DISCONNECTED); - } + }*/ } @@ -5243,7 +5243,7 @@ static void lcd_connect_printer() { i++; t++; delay_keep_alive(100); - process_command_small(); + proc_commands(); if (t == 10) { prusa_statistics(important_status, saved_filament_type); t = 0; From 41ebb0384acd0541d99a714ece72cdf685e87522 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 29 Aug 2017 17:21:43 +0200 Subject: [PATCH 6/6] config files updated --- Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 ++ 6 files changed, 12 insertions(+) diff --git a/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h index ba9f55289..ac0463370 100644 --- a/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h @@ -391,6 +391,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release diff --git a/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h index 1822a9d73..bf748354b 100644 --- a/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h @@ -391,6 +391,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release diff --git a/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h index 06a7410c3..83917cb98 100644 --- a/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h @@ -386,6 +386,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release diff --git a/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h index a0afa5f7f..fb3329db6 100644 --- a/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h @@ -388,6 +388,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index d7019845f..d42400dcc 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -386,6 +386,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 720e74f5e..6c71bab92 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -388,6 +388,8 @@ THERMISTORS SETTINGS #define PING_TIME 60 //time in s #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s #define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release