lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-04-20 21:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ggwave : significantly speed-up fixed-length decoding on Arduino

Browse Source
This commit is contained in:
Georgi Gerganov
2022-06-05 09:46:45 +03:00
parent 6349e20a81
commit 3f52b0f1b0
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/arduino-rx/arduino-rx.ino
View File

@@ -66,8 +66,9 @@ void loop() {
} }
GGWave ggwave(p); GGWave ggwave(p);
ggwave.setLogFile(nullptr);
ggwave.setRxProtocols({ ggwave.setRxProtocols({
//ggwave.getTxProtocol(GGWAVE_TX_PROTOCOL_MT_FASTEST), ggwave.getTxProtocol(GGWAVE_TX_PROTOCOL_MT_FASTEST),
ggwave.getTxProtocol(GGWAVE_TX_PROTOCOL_DT_FASTEST), ggwave.getTxProtocol(GGWAVE_TX_PROTOCOL_DT_FASTEST),
}); });

19
src/ggwave.cpp
View File

@@ -1663,8 +1663,8 @@ void GGWave::decode_fixed() {
// original, floating-point version // original, floating-point version
//m_rx->spectrumHistoryFixed[m_rx->historyIdFixed] = m_rx->sampleSpectrum; //m_rx->spectrumHistoryFixed[m_rx->historyIdFixed] = m_rx->sampleSpectrum;
// in theory, using uint8_t should work alsmost the same and save 4 times the memory, but for some resone // in theory, using uint8_t should work almost the same and save 4 times the memory, but for some reason
// the result are not as good as with the floating-point version // the results are not as good as with the floating-point version
// float -> uint8_t // float -> uint8_t
//amax = 255.0f/(amax == 0.0f ? 1.0f : amax); //amax = 255.0f/(amax == 0.0f ? 1.0f : amax);
//for (int i = 0; i < m_samplesPerFrame; ++i) { //for (int i = 0; i < m_samplesPerFrame; ++i) {
@@ -1724,11 +1724,8 @@ void GGWave::decode_fixed() {
} }
for (int j = 0; j < rxProtocol.bytesPerTx; ++j) { for (int j = 0; j < rxProtocol.bytesPerTx; ++j) {
int f0bin = -1; int f0bin = 0;
int f1bin = -1; uint16_t f0max = m_rx->spectrumHistoryFixed[historyId][binStart + 2*j*binDelta];
double f0max = -1.0;
double f1max = -1.0;
for (int b = 0; b < 16; ++b) { for (int b = 0; b < 16; ++b) {
{ {
@@ -1739,8 +1736,12 @@ void GGWave::decode_fixed() {
f0bin = b; f0bin = b;
} }
} }
}
{ int f1bin = 0;
if (rxProtocol.extra == 1) {
uint16_t f1max = m_rx->spectrumHistoryFixed[historyId][binStart + 2*j*binDelta + binOffset];
for (int b = 0; b < 16; ++b) {
const auto & v = m_rx->spectrumHistoryFixed[historyId][binStart + 2*j*binDelta + binOffset + b]; const auto & v = m_rx->spectrumHistoryFixed[historyId][binStart + 2*j*binDelta + binOffset + b];
if (f1max <= v) { if (f1max <= v) {
@@ -1748,6 +1749,8 @@ void GGWave::decode_fixed() {
f1bin = b; f1bin = b;
} }
} }
} else {
f1bin = f0bin;
} }
if ((k + 0)%rxProtocol.extra == 0) m_rx->detectedTones[(2*j + 0)*16 + f0bin]++; if ((k + 0)%rxProtocol.extra == 0) m_rx->detectedTones[(2*j + 0)*16 + f0bin]++;