uvos/SerialPortMultiplexer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for unchanged serial port baud rate

Browse Source
This commit is contained in:
IMback
2018-10-31 00:38:39 +01:00
parent 121d97b816
commit befdbe010b
2 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
main.cpp
View File

@ -39,6 +39,7 @@ struct Config
unsigned short port = 6856; unsigned short port = 6856;
int baud = B9600; int baud = B9600;
bool noSerial = false; bool noSerial = false;
bool verbose = false;
}; };
static int parseCmdArgs(int argc, char** argv, Config *config) static int parseCmdArgs(int argc, char** argv, Config *config)
@ -75,6 +76,10 @@ static int parseCmdArgs(int argc, char** argv, Config *config)
printRates(); printRates();
return -1; return -1;
} }
else if (std::string(argv[i]) == "-v" || std::string(argv[i]) == "--verbose")
{
config->verbose=true;
}
} }
return 0; return 0;
} }
@ -90,7 +95,7 @@ void acceptThreadFunction( TCPServerSocket* servSock, std::vector<TCPSocket*>*
clientSockets->back()->send("UVOS serial multiplexer " VERSION "\n", sizeof("UVOS serial multiplexer " VERSION "\n")-1); clientSockets->back()->send("UVOS serial multiplexer " VERSION "\n", sizeof("UVOS serial multiplexer " VERSION "\n")-1);
std::cout<<"got client\n"; std::cout<<"got client\n";
} }
std::this_thread::sleep_for(std::chrono::milliseconds(20)); std::this_thread::sleep_for(std::chrono::milliseconds(200));
} }
} }
@ -147,35 +152,48 @@ int main(int argc, char* argv[])
if(readlen > 0) if(readlen > 0)
{ {
std::cout<<"bcst: "; if(config.verbose)
for( int j = 0; j < readlen; j++ )std::cout<<buffer[j]; {
std::cout<<"bcst: ";
for( int j = 0; j < readlen; j++ )std::cout<<buffer[j];
std::cout<<std::endl;
}
clientSockets[i]->send(buffer, readlen); clientSockets[i]->send(buffer, readlen);
std::cout<<std::endl;
} }
char inBuffer[2048]; char inBuffer[4096];
int reclen = clientSockets[i]->recv(inBuffer, 2048); int reclen = clientSockets[i]->recv(inBuffer, 4096);
if( reclen > 0 ) if( reclen > 0 )
{ {
std::cout<<"rec: "; if(config.verbose)
for( int j = 0; j < reclen; j++ )std::cout<<inBuffer[j]; {
std::cout<<"rec: ";
for( int j = 0; j < reclen; j++ )std::cout<<inBuffer[j];
}
if(strncmp( inBuffer, "bcst: ", 6 ) == 0) if(strncmp( inBuffer, "bcst: ", 6 ) == 0)
{ {
std::cout<<"bcst: "; if(config.verbose)
for( int j = 6; j < reclen; j++ )std::cout<<inBuffer[j]; {
std::cout<<"bcst: ";
for( int j = 6; j < reclen; j++ )std::cout<<inBuffer[j];
std::cout<<std::endl;
}
for(unsigned int j = 0; j < clientSockets.size(); j++) if(i != j) clientSockets[j]->send(inBuffer+6, reclen-6); for(unsigned int j = 0; j < clientSockets.size(); j++) if(i != j) clientSockets[j]->send(inBuffer+6, reclen-6);
std::cout<<std::endl;
} }
else else
{ {
std::cout<<"wrote \""; if(config.verbose)
for( int j = 0; j < reclen; j++ )std::cout<<inBuffer[j]; {
std::cout<<"\" to serial \n"; std::cout<<"wrote \"";
for( int j = 0; j < reclen; j++ )std::cout<<inBuffer[j];
std::cout<<"\" to serial \n";
}
sWrite(serial, inBuffer, reclen); sWrite(serial, inBuffer, reclen);
} }
std::cout<<std::endl; if(config.verbose) std::cout<<std::endl;
} }
else if(reclen == 0) else if(reclen == 0)
{ {
@ -195,7 +213,7 @@ int main(int argc, char* argv[])
if(i < 0) i=0; if(i < 0) i=0;
} }
} }
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} }
acceptThread->join(); acceptThread->join();

52
serial_io.cpp
View File

@ -20,24 +20,25 @@ ssize_t sRead(int port, void *buf, size_t count)
void printRates() void printRates()
{ {
std::cout<<"Rates:\n"\ std::cout<<"Rates:\n"\
<<"B50 "<<B50<<'\n'\ <<"Unchanged 0\n" \
<<"B75 "<<B75<<'\n'\ <<"B50 "<<B50<<'\n'\
<<"B110 "<<B110<<'\n'\ <<"B75 "<<B75<<'\n'\
<<"B134 "<<B134<<'\n'\ <<"B110 "<<B110<<'\n'\
<<"B150 "<<B150<<'\n'\ <<"B134 "<<B134<<'\n'\
<<"B200 "<<B200<<'\n'\ <<"B150 "<<B150<<'\n'\
<<"B300 "<<B300<<'\n'\ <<"B200 "<<B200<<'\n'\
<<"B600 "<<B600<<'\n'\ <<"B300 "<<B300<<'\n'\
<<"B1200 "<<B1200<<'\n'\ <<"B600 "<<B600<<'\n'\
<<"B1800 "<<B1800<<'\n'\ <<"B1200 "<<B1200<<'\n'\
<<"B2400 "<<B2400<<'\n'\ <<"B1800 "<<B1800<<'\n'\
<<"B4800 "<<B4800<<'\n'\ <<"B2400 "<<B2400<<'\n'\
<<"B9600 "<<B9600<<'\n'\ <<"B4800 "<<B4800<<'\n'\
<<"B19200 "<<B19200<<'\n'\ <<"B9600 "<<B9600<<'\n'\
<<"B38400 "<<B38400<<'\n'\ <<"B19200 "<<B19200<<'\n'\
<<"B57600 "<<B57600<<'\n'\ <<"B38400 "<<B38400<<'\n'\
<<"B115200 "<<B115200<<'\n'\ <<"B57600 "<<B57600<<'\n'\
<<"B230400 "<<B230400<<'\n'; <<"B115200 "<<B115200<<'\n'\
<<"B230400 "<<B230400<<'\n';
} }
#endif #endif
@ -73,11 +74,16 @@ int serialport_init(const char* device, int baud)
toptions.c_cflag &= ~(CSIZE | PARENB); toptions.c_cflag &= ~(CSIZE | PARENB);
toptions.c_cflag |= CS8; toptions.c_cflag |= CS8;
if(cfsetispeed(&toptions, baud) < 0 || cfsetospeed(&toptions, baud) < 0) if(baud != 0)
{ {
perror("init_serialport: Couldn't set baud rate"); int error = cfsetispeed(&toptions, baud) | cfsetospeed(&toptions, baud);
return -1;
} if(error)
{
perror("init_serialport: Couldn't set baud rate");
return -1;
}
}
// see: http://unixwiz.net/techtips/termios-vmin-vtime.html // see: http://unixwiz.net/techtips/termios-vmin-vtime.html
toptions.c_cc[VMIN] = 0; toptions.c_cc[VMIN] = 0;
toptions.c_cc[VTIME] = 40; toptions.c_cc[VTIME] = 40;