mirror
/
fm_transmitter
kopia lustrzana https://github.com/markondej/fm_transmitter
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed windows 0xD/CR characters, fixed freezing when sudo not used

master
Marcin Kondej 2023-09-29 00:48:32 +02:00
rodzic e4b75e38d1
commit 430923a05a
2 zmienionych plików z 828 dodań i 828 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
transmitter.cpp
Wyświetl plik

@ -350,7 +350,7 @@ Transmitter::Transmitter()
Transmitter::~Transmitter() {
std::unique_lock<std::mutex> lock(mtx);
cv.wait(lock, [&]() -> bool {
return !txThread.joinable() && !enable;
return !enable;
});
if (output != nullptr) {
delete output;
@ -364,16 +364,6 @@ void Transmitter::Transmit(WaveReader &reader, float frequency, float bandwidth,
enable = true;
}
WaveHeader header = reader.GetHeader();
unsigned bufferSize = static_cast<unsigned>(static_cast<unsigned long long>(header.sampleRate) * BUFFER_TIME / 1000000);
unsigned clockDivisor = static_cast<unsigned>(round(Peripherals::GetClockFrequency() * (0x01 << 12) / frequency));
unsigned divisorRange = clockDivisor - static_cast<unsigned>(round(Peripherals::GetClockFrequency() * (0x01 << 12) / (frequency + 0.0005f * bandwidth)));
if (output == nullptr) {
output = new ClockOutput(clockDivisor);
}
auto finally = [&]() {
if (!preserveCarrier) {
delete output;
@ -386,6 +376,16 @@ void Transmitter::Transmit(WaveReader &reader, float frequency, float bandwidth,
cv.notify_all();
};
try {
WaveHeader header = reader.GetHeader();
unsigned bufferSize = static_cast<unsigned>(static_cast<unsigned long long>(header.sampleRate) * BUFFER_TIME / 1000000);
unsigned clockDivisor = static_cast<unsigned>(round(Peripherals::GetClockFrequency() * (0x01 << 12) / frequency));
unsigned divisorRange = clockDivisor - static_cast<unsigned>(round(Peripherals::GetClockFrequency() * (0x01 << 12) / (frequency + 0.0005f * bandwidth)));
if (output == nullptr) {
output = new ClockOutput(clockDivisor);
}
if (dmaChannel != 0xff) {
TransmitViaDma(reader, *output, header.sampleRate, bufferSize, clockDivisor, divisorRange, dmaChannel);
} else {