Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed the RDS problems, mostly

Browse source
This commit is contained in:
fgerlits 2007-06-15 13:11:47 +00:00
parent 32b2e93f5a
commit da601b84bd
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
campcaster/src/modules/core/src/RdsItem.cxx
View file

@ -134,7 +134,7 @@ RdsItem :: toString(void) throw ()
rdsString->append(*key); rdsString->append(*key);
rdsString->append("="); rdsString->append("=");
rdsString->append(*value); rdsString->append(*value);
rdsString->append("\n"); rdsString->append("\r\n");
} }
return rdsString; return rdsString;

14
campcaster/src/products/gLiveSupport/src/GLiveSupport.cxx
View file

@ -414,13 +414,6 @@ GLiveSupport :: configure(const xmlpp::Element & element)
optionsContainer->setOptionItem(OptionsContainer::serialDeviceName, optionsContainer->setOptionItem(OptionsContainer::serialDeviceName,
serialDevice); 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( serialDevice = optionsContainer->getOptionItem(
OptionsContainer::serialDeviceName); OptionsContainer::serialDeviceName);
try { try {
// TODO: move this to a separate class, and make it configurable
serialStream->Open(*serialDevice); 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) << *message;
serialStream->flush(); serialStream->flush();
serialStream->Close(); serialStream->Close();