josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle second serial port correctly

This commit is contained in:
Alex Voinea 2020-05-27 17:40:14 +03:00
parent b1e446ef97
commit c84aef3a28
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -1014,8 +1014,9 @@ void setup()
lcd_splash(); lcd_splash();
Sound_Init(); // also guarantee "SET_OUTPUT(BEEPER)" Sound_Init(); // also guarantee "SET_OUTPUT(BEEPER)"
selectedSerialPort = eeprom_read_byte((uint8_t*)EEPROM_SECOND_SERIAL_ACTIVE); selectedSerialPort = eeprom_read_byte((uint8_t *)EEPROM_SECOND_SERIAL_ACTIVE);
if (selectedSerialPort == 0xFF) selectedSerialPort = 0; if (selectedSerialPort == 0xFF) selectedSerialPort = 0;
eeprom_update_byte((uint8_t *)EEPROM_SECOND_SERIAL_ACTIVE, selectedSerialPort);
MYSERIAL.begin(BAUDRATE); MYSERIAL.begin(BAUDRATE);
fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
stdout = uartout; stdout = uartout;
@ -1070,7 +1071,7 @@ void setup()
#ifndef W25X20CL #ifndef W25X20CL
SERIAL_PROTOCOLLNPGM("start"); SERIAL_PROTOCOLLNPGM("start");
#else #else
if (optiboot_status == 1) if ((optiboot_status != 0) || (selectedSerialPort != 0))
SERIAL_PROTOCOLLNPGM("start"); SERIAL_PROTOCOLLNPGM("start");
#endif #endif
SERIAL_ECHO_START; SERIAL_ECHO_START;

8
Firmware/optiboot_w25x20cl.cpp
View File

@ -122,12 +122,14 @@ uint8_t optiboot_w25x20cl_enter()
unsigned long boot_timer = 0; unsigned long boot_timer = 0;
const char *ptr = entry_magic_send; const char *ptr = entry_magic_send;
const char *end = strlen_P(entry_magic_send) + ptr; const char *end = strlen_P(entry_magic_send) + ptr;
const uint8_t selectedSerialPort_bak = selectedSerialPort;
// Flush the serial line. // Flush the serial line.
while (RECV_READY) { while (RECV_READY) {
watchdogReset(); watchdogReset();
// Dummy register read (discard) // Dummy register read (discard)
(void)(*(char *)UDR0); (void)(*(char *)UDR0);
} }
selectedSerialPort = 0; //switch to Serial0
MYSERIAL.flush(); //clear RX buffer MYSERIAL.flush(); //clear RX buffer
int SerialHead = rx_buffer.head; int SerialHead = rx_buffer.head;
// Send the initial magic string. // Send the initial magic string.
@ -143,14 +145,20 @@ uint8_t optiboot_w25x20cl_enter()
watchdogReset(); watchdogReset();
delayMicroseconds(1); delayMicroseconds(1);
if (++ boot_timer > boot_timeout) if (++ boot_timer > boot_timeout)
{
// Timeout expired, continue with the application. // Timeout expired, continue with the application.
selectedSerialPort = selectedSerialPort_bak; //revert Serial setting
return 0; return 0;
}
} }
ch = rx_buffer.buffer[SerialHead]; ch = rx_buffer.buffer[SerialHead];
SerialHead = (unsigned int)(SerialHead + 1) % RX_BUFFER_SIZE; SerialHead = (unsigned int)(SerialHead + 1) % RX_BUFFER_SIZE;
if (pgm_read_byte(ptr ++) != ch) if (pgm_read_byte(ptr ++) != ch)
{
// Magic was not received correctly, continue with the application // Magic was not received correctly, continue with the application
selectedSerialPort = selectedSerialPort_bak; //revert Serial setting
return 0; return 0;
}
watchdogReset(); watchdogReset();
} }
cbi(UCSR0B, RXCIE0); //disable the MarlinSerial0 interrupt cbi(UCSR0B, RXCIE0); //disable the MarlinSerial0 interrupt