MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 16:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove all of the display processing from the code.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-16 17:18:43 +01:00
parent f12604bb1c
commit d01520bea1
27 changed files with 74 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
M17Control.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020,2021,2022,2023 Jonathan Naylor, G4KLX
* Copyright (C) 2020-2023 Jonathan Naylor, G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -60,13 +60,12 @@ const unsigned char BIT_MASK_TABLE[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04
#define WRITE_BIT(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
#define READ_BIT(p,i) (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
CM17Control::CM17Control(const std::string& callsign, unsigned int can, bool selfOnly, bool allowEncryption, CM17Network* network, CDisplay* display, unsigned int timeout, bool duplex, CRSSIInterpolator* rssiMapper) :
CM17Control::CM17Control(const std::string& callsign, unsigned int can, bool selfOnly, bool allowEncryption, CM17Network* network, unsigned int timeout, bool duplex, CRSSIInterpolator* rssiMapper) :
m_callsign(callsign),
m_can(can),
m_selfOnly(selfOnly),
m_allowEncryption(allowEncryption),
m_network(network),
m_display(display),
m_duplex(duplex),
m_queue(5000U, "M17 Control"),
m_source(),
@@ -106,7 +105,6 @@ m_bitErrsAccum(0U),
m_enabled(true),
m_fp(NULL)
{
assert(display != NULL);
assert(rssiMapper != NULL);
m_rfText = new char[4U * M17_META_LENGTH_BYTES];
@@ -390,14 +388,10 @@ bool CM17Control::writeModem(unsigned char* data, unsigned int len)
m_bitErrsAccum += errors;
m_bitsCount += 272U;
writeJSONBER();
m_display->writeM17RSSI(m_rssi);
writeJSONRSSI();
float ber = float(m_rfErrs) / float(m_rfBits);
m_display->writeM17BER(ber);
if (m_duplex) {
unsigned char rfData[2U + M17_FRAME_LENGTH_BYTES];
@@ -545,8 +539,6 @@ void CM17Control::writeEndRF()
m_rfCollectedLSF.reset();
if (m_netState == RS_NET_IDLE) {
m_display->clearM17();
if (m_network != NULL)
m_network->reset();
}
@@ -568,8 +560,6 @@ void CM17Control::writeEndNet()
m_netLSF.reset();
m_display->clearM17();
if (m_network != NULL)
m_network->reset();
}
@@ -631,8 +621,6 @@ void CM17Control::writeNetwork()
return;
}
m_display->writeM17(m_source.c_str(), m_dest.c_str(), "N");
m_netTimeoutTimer.start();
m_elapsed.start();
m_netFrames = 0U;
@@ -832,8 +820,6 @@ bool CM17Control::processRFHeader(bool lateEntry)
return false;
}
m_display->writeM17(m_source.c_str(), m_dest.c_str(), "R");
createRFLSF(true);
if (m_duplex) {