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

ggwave : add DSS test + remove OperatingMode enum

Browse Source
This commit is contained in:
Georgi Gerganov
2022-06-11 20:23:13 +03:00
parent 5f555d9281
commit 915dd8be16
9 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/arduino-rx-web/arduino-rx-web.cpp
View File

@@ -225,8 +225,8 @@ bool GGWave_init(
if (reinit) {
if (g_ggWave) delete g_ggWave;
ggwave_OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode = ggwave_OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
g_ggWave = new GGWave({
payloadLength,

4
examples/ggwave-common-sdl2.cpp
View File

@@ -212,8 +212,8 @@ bool GGWave_init(
}
if (reinit) {
ggwave_OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode = ggwave_OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
g_ggWave = std::make_shared<GGWave>(GGWave::Parameters {
payloadLength,

4
examples/ggwave-to-file/main.cpp
View File

@@ -79,8 +79,8 @@ int main(int argc, char** argv) {
fprintf(stderr, "Generating waveform for message '%s' ...\n", message.c_str());
ggwave_OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode = ggwave_OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (useDSS) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
GGWave ggWave({
payloadLength,

4
examples/r2t2/main.cpp
View File

@@ -71,8 +71,8 @@ int main(int argc, char** argv) {
const int txProtocolId = argm.count("t") == 0 ? 0 : std::stoi(argm.at("t"));
const int payloadLength = argm.count("l") == 0 ? 16 : std::stoi(argm.at("l"));
ggwave_OperatingMode mode = ggwave_OperatingMode(GGWAVE_OPERATING_MODE_TX | GGWAVE_OPERATING_MODE_TX_ONLY_TONES);
if (useDSS) mode = ggwave_OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_TX | GGWAVE_OPERATING_MODE_TX_ONLY_TONES;
if (useDSS) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
GGWave ggWave({
payloadLength,

4
examples/r2t2/r2t2-rx.cpp
View File

@@ -224,8 +224,8 @@ bool GGWave_init(
if (reinit) {
if (g_ggWave) delete g_ggWave;
ggwave_OperatingMode mode = GGWAVE_OPERATING_MODE_RX;
if (useDSS) mode = ggwave_OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_RX;
if (useDSS) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
g_ggWave = new GGWave({
payloadLength,

6
examples/waver/common.cpp
View File

@@ -623,12 +623,12 @@ void updateCore() {
if (inputCurrent.flags.needReinit) {
static auto sampleRateInpOld = ggWave->sampleRateInp();
static auto sampleRateOutOld = ggWave->sampleRateOut();
GGWave::SampleFormat sampleFormatInpOld = ggWave->sampleFormatInp();
GGWave::SampleFormat sampleFormatOutOld = ggWave->sampleFormatOut();
auto sampleFormatInpOld = ggWave->sampleFormatInp();
auto sampleFormatOutOld = ggWave->sampleFormatOut();
auto rxProtocolsOld = ggWave->rxProtocols();
GGWave::OperatingMode mode = GGWAVE_OPERATING_MODE_RX_AND_TX;
if (inputCurrent.directSequenceSpread) mode = GGWave::OperatingMode(mode | GGWAVE_OPERATING_MODE_USE_DSS);
if (inputCurrent.directSequenceSpread) mode |= GGWAVE_OPERATING_MODE_USE_DSS;
GGWave::Parameters parameters {
inputCurrent.payloadLength,