VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 15:26:33 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rttymod' of https://github.com/srcejon/sdrangel into rttymod

Browse Source
This commit is contained in:
Jon Beniston 2023-09-04 13:28:57 +01:00
commit e1644cff59
6 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/channeltx/modrtty/rttymodsource.cpp
View File

@ -420,10 +420,9 @@ void RttyModSource::encodeText(const QString& text)
{
unsigned bits;
unsigned bitCount;
bool error;
error = m_rttyEncoder.encode(s[i], bits, bitCount);
for (int j = 0; j < bitCount; j++)
m_rttyEncoder.encode(s[i], bits, bitCount);
for (unsigned int j = 0; j < bitCount; j++)
{
int txBit = (bits >> j) & 1;
addBit(txBit);

2
sdrbase/dsp/raisedcosine.h
View File

@ -40,7 +40,7 @@ public:
void create(double beta, int symbolSpan, int samplesPerSymbol, bool normaliseUpsampledAmplitude = false)
{
int nTaps = symbolSpan * samplesPerSymbol + 1;
int i, j;
int i;
// check constraints
if(!(nTaps & 1)) {

2
sdrbase/util/baudot.cpp
View File

@ -307,7 +307,7 @@ bool BaudotEncoder::encode(QChar c, unsigned &bits, unsigned int &bitCount)
// Look for character in other pages
const QString switchPage[] = { ">", "<", "\0" };
for (int page = m_page == LETTERS ? 1 : 0; page < (m_characterSet == Baudot::RUSSIAN) ? 3 : 2; page++)
for (int page = m_page == LETTERS ? 1 : 0; page < ((m_characterSet == Baudot::RUSSIAN) ? 3 : 2); page++)
{
if (m_chars[page].contains(s))
{

6
swagger/sdrangel/code/html2/index.html
View File

@ -11828,10 +11828,6 @@ margin-bottom: 20px;
"lpfTaps" : {
"type" : "integer"
},
"bbNoise" : {
"type" : "integer",
"description" : "Boolean\n * 0 - off\n * 1 - on\n"
},
"rfNoise" : {
"type" : "integer",
"description" : "Boolean\n * 0 - off\n * 1 - on\n"
@ -57998,7 +57994,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2023-09-01T20:07:45.995+02:00
Generated 2023-09-01T21:10:19.928+02:00
</div>
</div>
</div>

23
swagger/sdrangel/code/qt5/client/SWGRTTYModSettings.cpp
View File

@ -46,8 +46,6 @@ SWGRTTYModSettings::SWGRTTYModSettings() {
m_repeat_count_isSet = false;
lpf_taps = 0;
m_lpf_taps_isSet = false;
bb_noise = 0;
m_bb_noise_isSet = false;
rf_noise = 0;
m_rf_noise_isSet = false;
text = nullptr;
@ -122,8 +120,6 @@ SWGRTTYModSettings::init() {
m_repeat_count_isSet = false;
lpf_taps = 0;
m_lpf_taps_isSet = false;
bb_noise = 0;
m_bb_noise_isSet = false;
rf_noise = 0;
m_rf_noise_isSet = false;
text = new QString("");
@ -186,7 +182,6 @@ SWGRTTYModSettings::cleanup() {
if(text != nullptr) {
delete text;
}
@ -253,8 +248,6 @@ SWGRTTYModSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&lpf_taps, pJson["lpfTaps"], "qint32", "");
::SWGSDRangel::setValue(&bb_noise, pJson["bbNoise"], "qint32", "");
::SWGSDRangel::setValue(&rf_noise, pJson["rfNoise"], "qint32", "");
::SWGSDRangel::setValue(&text, pJson["text"], "QString", "QString");
@ -346,9 +339,6 @@ SWGRTTYModSettings::asJsonObject() {
if(m_lpf_taps_isSet){
obj->insert("lpfTaps", QJsonValue(lpf_taps));
}
if(m_bb_noise_isSet){
obj->insert("bbNoise", QJsonValue(bb_noise));
}
if(m_rf_noise_isSet){
obj->insert("rfNoise", QJsonValue(rf_noise));
}
@ -515,16 +505,6 @@ SWGRTTYModSettings::setLpfTaps(qint32 lpf_taps) {
this->m_lpf_taps_isSet = true;
}
qint32
SWGRTTYModSettings::getBbNoise() {
return bb_noise;
}
void
SWGRTTYModSettings::setBbNoise(qint32 bb_noise) {
this->bb_noise = bb_noise;
this->m_bb_noise_isSet = true;
}
qint32
SWGRTTYModSettings::getRfNoise() {
return rf_noise;
@ -797,9 +777,6 @@ SWGRTTYModSettings::isSet(){
if(m_lpf_taps_isSet){
isObjectUpdated = true; break;
}
if(m_bb_noise_isSet){
isObjectUpdated = true; break;
}
if(m_rf_noise_isSet){
isObjectUpdated = true; break;
}

6
swagger/sdrangel/code/qt5/client/SWGRTTYModSettings.h
View File

@ -71,9 +71,6 @@ public:
qint32 getLpfTaps();
void setLpfTaps(qint32 lpf_taps);
qint32 getBbNoise();
void setBbNoise(qint32 bb_noise);
qint32 getRfNoise();
void setRfNoise(qint32 rf_noise);
@ -177,9 +174,6 @@ private:
qint32 lpf_taps;
bool m_lpf_taps_isSet;
qint32 bb_noise;
bool m_bb_noise_isSet;
qint32 rf_noise;
bool m_rf_noise_isSet;