lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-02-06 16:47:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

wip : fix receive protocols with different start freq

Browse Source
This commit is contained in:
Georgi Gerganov
2020-12-05 10:17:19 +02:00
parent 09d0e41df4
commit 9de063bf56
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/ggwave.cpp
View File

@@ -463,7 +463,8 @@ void GGWave::receive(const CBDequeueAudio & CBDequeueAudio) {
uint8_t curByte = 0;
for (int i = 0; i < 2*rxProtocol.paramBytesPerTx; ++i) {
int bin = std::round(dataFreqs_hz[0]*ihzPerSample) + i*16;
double freq = hzPerSample*rxProtocol.paramFreqStart;
int bin = std::round(freq*ihzPerSample) + i*16;
int kmax = 0;
double amax = 0.0;
@@ -548,15 +549,25 @@ void GGWave::receive(const CBDequeueAudio & CBDequeueAudio) {
// check if receiving data
if (receivingData == false) {
bool isReceiving = true;
bool isReceiving = false;
for (int i = 0; i < nBitsInMarker; ++i) {
int bin = std::round(dataFreqs_hz[i]*ihzPerSample);
for (const auto & rxProtocol : txProtocols) {
bool isReceivingCur = true;
if (i%2 == 0) {
if (sampleSpectrum[bin] <= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isReceiving = false;
} else {
if (sampleSpectrum[bin] >= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isReceiving = false;
for (int i = 0; i < nBitsInMarker; ++i) {
double freq = hzPerSample*rxProtocol.paramFreqStart + freqDelta_hz*i;
int bin = std::round(freq*ihzPerSample);
if (i%2 == 0) {
if (sampleSpectrum[bin] <= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isReceivingCur = false;
} else {
if (sampleSpectrum[bin] >= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isReceivingCur = false;
}
}
if (isReceivingCur) {
isReceiving = true;
break;
}
}
@@ -574,15 +585,25 @@ void GGWave::receive(const CBDequeueAudio & CBDequeueAudio) {
framesLeftToRecord = recvDuration_frames;
}
} else if (txMode == TxMode::VariableLength) {
bool isEnded = true;
bool isEnded = false;
for (int i = 0; i < nBitsInMarker; ++i) {
int bin = std::round(dataFreqs_hz[i]*ihzPerSample);
for (const auto & rxProtocol : txProtocols) {
bool isEndedCur = true;
if (i%2 == 0) {
if (sampleSpectrum[bin] >= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isEnded = false;
} else {
if (sampleSpectrum[bin] <= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isEnded = false;
for (int i = 0; i < nBitsInMarker; ++i) {
double freq = hzPerSample*rxProtocol.paramFreqStart + freqDelta_hz*i;
int bin = std::round(freq*ihzPerSample);
if (i%2 == 0) {
if (sampleSpectrum[bin] >= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isEndedCur = false;
} else {
if (sampleSpectrum[bin] <= 3.0f*sampleSpectrum[bin + freqDelta_bin]) isEndedCur = false;
}
}
if (isEndedCur) {
isEnded = true;
break;
}
}