diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c index f0c762a..7d608f7 100644 --- a/firmware/AtomBusMon.c +++ b/firmware/AtomBusMon.c @@ -1547,7 +1547,7 @@ void initialize() { STATUS_DDR = MUXSEL_MASK; MUX_DDR = 0; CTRL_PORT = 0; - Serial_Init(57600,57600); + Serial_Init(57600); version(); // Update the hardware copy of the breakpoints uploadBreakpoints(); diff --git a/firmware/status.c b/firmware/status.c index 909c87f..0cf5ad6 100644 --- a/firmware/status.c +++ b/firmware/status.c @@ -106,61 +106,32 @@ char *strhex4(char *buffer, uint16_t i) { #ifdef SERIAL_STATUS static int StdioSerial_TxByte0(char DataByte, FILE *Stream); -static int StdioSerial_TxByte1(char DataByte, FILE *Stream); FILE ser0stream = FDEV_SETUP_STREAM(StdioSerial_TxByte0,NULL,_FDEV_SETUP_WRITE); -FILE ser1stream = FDEV_SETUP_STREAM(StdioSerial_TxByte1,NULL,_FDEV_SETUP_WRITE); -void StdioSerial_TxByte(char DataByte, uint8_t Port) +void StdioSerial_TxByte(char DataByte) { #ifdef COOKED_SERIAL if((DataByte=='\r') || (DataByte=='\n')) { - if(Port==1) - { - Serial_TxByte1('\r'); - Serial_TxByte1('\n'); - } - else - { - Serial_TxByte0('\r'); - Serial_TxByte0('\n'); - } + Serial_TxByte0('\r'); + Serial_TxByte0('\n'); } else #endif - - if(Port==1) - Serial_TxByte1(DataByte); - else - Serial_TxByte0(DataByte); - + Serial_TxByte0(DataByte); } int StdioSerial_TxByte0(char DataByte, FILE *Stream) { - StdioSerial_TxByte(DataByte,0); + StdioSerial_TxByte(DataByte); return 0; } -int StdioSerial_TxByte1(char DataByte, FILE *Stream) +void cls() { - StdioSerial_TxByte(DataByte,1); - return 0; -} - -void cls(uint8_t Port) -{ - if(Port==1) - { - log1(ESC_ERASE_DISPLAY); - log1(ESC_CURSOR_POS(0,0)); - } - else - { - log0(ESC_ERASE_DISPLAY); - log0(ESC_CURSOR_POS(0,0)); - } + logs(ESC_ERASE_DISPLAY); + logs(ESC_CURSOR_POS(0,0)); } @@ -179,18 +150,6 @@ void USART_Init0(const uint32_t BaudRate) #endif } - -void USART_Init1(const uint32_t BaudRate) -{ -#ifdef UCSR1A - UCSR1A = 0; - UCSR1B = ((1 << RXEN1) | (1 << TXEN1)); - UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10)); - - UBRR1 = SERIAL_UBBRVAL(BaudRate); -#endif -} - /** Transmits a given byte through the USART. * * \param DataByte Byte to transmit through the USART @@ -206,15 +165,6 @@ void Serial_TxByte0(const char DataByte) #endif } -void Serial_TxByte1(const char DataByte) -{ -#ifdef UCSR1A - while ( !( UCSR1A & (1<