diff --git a/modemmeshtastic/CMakeLists.txt b/modemmeshtastic/CMakeLists.txt index 59a3b4313..bb0b8517e 100644 --- a/modemmeshtastic/CMakeLists.txt +++ b/modemmeshtastic/CMakeLists.txt @@ -1,4 +1,4 @@ -project (modemmeshtatstic) +project (modemmeshtastic) set(modemmeshtastic_SOURCES meshtasticpacket.cpp diff --git a/plugins/channeltx/modmeshtastic/meshtasticmodsettings.cpp b/plugins/channeltx/modmeshtastic/meshtasticmodsettings.cpp index 3c83ecb35..bdf666787 100644 --- a/plugins/channeltx/modmeshtastic/meshtasticmodsettings.cpp +++ b/plugins/channeltx/modmeshtastic/meshtasticmodsettings.cpp @@ -79,7 +79,7 @@ void MeshtasticModSettings::resetToDefaults() m_preambleChirps = 17; m_quietMillis = 1000; m_nbParityBits = 1; - m_textMessage = "Hello LoRa"; + m_textMessage = "Hello Meshtastic"; m_syncWord = 0x34; m_channelMute = false; m_messageRepeat = 1; @@ -193,16 +193,15 @@ bool MeshtasticModSettings::deserialize(const QByteArray& data) m_channelMarker->deserialize(bytetmp); } - d.readString(6, &m_title, "LoRa Demodulator"); + d.readString(6, &m_title, "Meshtastic Modulator"); d.readS32(7, &m_deBits, 0); d.readBool(8, &m_channelMute, false); d.readU32(9, &utmp, 0x34); m_syncWord = utmp > 255 ? 0 : utmp; d.readU32(10, &m_preambleChirps, 17); d.readS32(11, &m_quietMillis, 1000); - d.readBool(11, &m_useReverseAPI, false); d.readBool(12, &m_invertRamps, false); - d.readString(28, &m_textMessage, "Hello LoRa"); + d.readString(28, &m_textMessage, "Hello Meshtastic"); d.readBlob(29, &m_bytesMessage); d.readS32(31, &m_nbParityBits, 1); d.readS32(44, &m_messageRepeat, 1); diff --git a/plugins/channeltx/modmeshtastic/meshtasticmodsource.cpp b/plugins/channeltx/modmeshtastic/meshtasticmodsource.cpp index 28bd5d2bb..00bdb2afc 100644 --- a/plugins/channeltx/modmeshtastic/meshtasticmodsource.cpp +++ b/plugins/channeltx/modmeshtastic/meshtasticmodsource.cpp @@ -286,15 +286,6 @@ void MeshtasticModSource::modulateSample() m_chirpCount = 0; m_chirp0 = encodeSymbol(m_symbols[m_chirpCount], MeshtasticModSettings::m_hasHeader && (m_chirpCount < 8U)); m_txFrameToken++; - - std::vector mappedPreview; - const unsigned int previewCount = std::min(8U, static_cast(m_symbols.size())); - mappedPreview.reserve(previewCount); - - for (unsigned int i = 0; i < previewCount; i++) { - mappedPreview.push_back(encodeSymbol(m_symbols[i], MeshtasticModSettings::m_hasHeader && (i < 8U))); - } - m_chirp = (m_chirp0 + m_fftLength)*MeshtasticModSettings::oversampling - 1; m_state = ChirpChatStatePayload; }