3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PID cal. is not sending OK periodically, print fan error pauses print in octoprint (not disconnecting), initialize serial line when swithing in settings menu

Browse source
This commit is contained in:
PavelSindler 2018-01-25 15:23:11 +01:00
parent 17cadf463a
commit cbcfcee48f
3 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View file

@ -3852,15 +3852,7 @@ void process_commands()
lcd_update(2); lcd_update(2);
break; break;
default: default:
printf("Unknown G code: "); printf_P(PSTR("Unknown G code: %s \n"), cmdbuffer + bufindr + CMDHDRSIZE);
printf(cmdbuffer + bufindr + CMDHDRSIZE);
printf("\n");
} }
} // end if(code_seen('G')) } // end if(code_seen('G'))
@ -3871,9 +3863,7 @@ void process_commands()
/*for (++strchr_pointer; *strchr_pointer == ' ' || *strchr_pointer == '\t'; ++strchr_pointer);*/ /*for (++strchr_pointer; *strchr_pointer == ' ' || *strchr_pointer == '\t'; ++strchr_pointer);*/
if (*(strchr_pointer+index) < '0' || *(strchr_pointer+index) > '9') { if (*(strchr_pointer+index) < '0' || *(strchr_pointer+index) > '9') {
printf("Invalid M code: "); printf_P(PSTR("Invalid M code: %s \n"), cmdbuffer + bufindr + CMDHDRSIZE);
printf(cmdbuffer + bufindr + CMDHDRSIZE);
printf("\n");
} else } else
switch((int)code_value()) switch((int)code_value())
@ -6176,9 +6166,7 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
FlushSerialRequestResend(); FlushSerialRequestResend();
break; break;
default: default:
printf("Unknown M code: "); printf_P(PSTR("Unknown M code: %s \n"), cmdbuffer + bufindr + CMDHDRSIZE);
printf(cmdbuffer + bufindr + CMDHDRSIZE);
printf("\n");
} }
} // end if(code_seen('M')) (end of M codes) } // end if(code_seen('M')) (end of M codes)

12
Firmware/temperature.cpp
View file

@ -362,10 +362,10 @@ unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0);
int p; int p;
if (extruder<0){ if (extruder<0){
p=soft_pwm_bed; p=soft_pwm_bed;
SERIAL_PROTOCOLPGM("ok B:"); SERIAL_PROTOCOLPGM("B:");
}else{ }else{
p=soft_pwm[extruder]; p=soft_pwm[extruder];
SERIAL_PROTOCOLPGM("ok T:"); SERIAL_PROTOCOLPGM("T:");
} }
SERIAL_PROTOCOL(input); SERIAL_PROTOCOL(input);
@ -500,12 +500,12 @@ void fanSpeedError(unsigned char _fan) {
} }
} }
else { else {
setTargetHotend0(0); setTargetHotend0(0);
SERIAL_ECHOLNPGM("// action:pause"); //for octoprint
} }
SERIAL_ERROR_START;
switch (_fan) { switch (_fan) {
case 0: case 0:
SERIAL_ERRORLNPGM("ERROR: Extruder fan speed is lower then expected"); SERIAL_ECHOLNPGM("Extruder fan speed is lower then expected");
if (get_message_level() == 0) { if (get_message_level() == 0) {
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(200); delayMicroseconds(200);
@ -515,7 +515,7 @@ void fanSpeedError(unsigned char _fan) {
} }
break; break;
case 1: case 1:
SERIAL_ERRORLNPGM("ERROR: Print fan speed is lower then expected"); SERIAL_ECHOLNPGM("Print fan speed is lower then expected");
if (get_message_level() == 0) { if (get_message_level() == 0) {
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
delayMicroseconds(200); delayMicroseconds(200);

1
Firmware/ultralcd.cpp
View file

@ -3501,6 +3501,7 @@ void lcd_second_serial_set() {
if(selectedSerialPort == 1) selectedSerialPort = 0; if(selectedSerialPort == 1) selectedSerialPort = 0;
else selectedSerialPort = 1; else selectedSerialPort = 1;
eeprom_update_byte((unsigned char *)EEPROM_SECOND_SERIAL_ACTIVE, selectedSerialPort); eeprom_update_byte((unsigned char *)EEPROM_SECOND_SERIAL_ACTIVE, selectedSerialPort);
MYSERIAL.begin(BAUDRATE);
lcd_goto_menu(lcd_settings_menu, 11); lcd_goto_menu(lcd_settings_menu, 11);
} }