fixed the RDS problems, mostly
This commit is contained in:
parent
32b2e93f5a
commit
da601b84bd
campcaster/src
|
@ -134,7 +134,7 @@ RdsItem :: toString(void) throw ()
|
|||
rdsString->append(*key);
|
||||
rdsString->append("=");
|
||||
rdsString->append(*value);
|
||||
rdsString->append("\n");
|
||||
rdsString->append("\r\n");
|
||||
}
|
||||
|
||||
return rdsString;
|
||||
|
|
|
@ -414,13 +414,6 @@ GLiveSupport :: configure(const xmlpp::Element & element)
|
|||
optionsContainer->setOptionItem(OptionsContainer::serialDeviceName,
|
||||
serialDevice);
|
||||
}
|
||||
// configure the serial port
|
||||
// TODO: make this configurable
|
||||
serialStream->SetBaudRate(LibSerial::SerialStreamBuf::BAUD_2400);
|
||||
serialStream->SetCharSize(LibSerial::SerialStreamBuf::CHAR_SIZE_8);
|
||||
serialStream->SetNumOfStopBits(1);
|
||||
serialStream->SetParity(LibSerial::SerialStreamBuf::PARITY_NONE);
|
||||
serialStream->SetFlowControl(LibSerial::SerialStreamBuf::FLOW_CONTROL_NONE);
|
||||
}
|
||||
|
||||
|
||||
|
@ -1824,7 +1817,14 @@ GLiveSupport :: writeToSerial(Ptr<const Glib::ustring>::Ref message)
|
|||
serialDevice = optionsContainer->getOptionItem(
|
||||
OptionsContainer::serialDeviceName);
|
||||
try {
|
||||
// TODO: move this to a separate class, and make it configurable
|
||||
serialStream->Open(*serialDevice);
|
||||
serialStream->SetBaudRate(LibSerial::SerialStreamBuf::BAUD_2400);
|
||||
serialStream->SetCharSize(LibSerial::SerialStreamBuf::CHAR_SIZE_8);
|
||||
serialStream->SetNumOfStopBits(1);
|
||||
serialStream->SetParity(LibSerial::SerialStreamBuf::PARITY_NONE);
|
||||
serialStream->SetFlowControl(
|
||||
LibSerial::SerialStreamBuf::FLOW_CONTROL_NONE);
|
||||
(*serialStream) << *message;
|
||||
serialStream->flush();
|
||||
serialStream->Close();
|
||||
|
|
Loading…
Reference in New Issue