MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-26 03:15:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Beginnings of modem I2C OLED support.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-11-13 15:32:43 +00:00
parent 2618a14ae5
commit 14bb39af63
4 changed files with 89 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modem.h
View File

@@ -104,6 +104,9 @@ public:
virtual bool writeSerial(const unsigned char* data, unsigned int length) = 0;
virtual unsigned int readSerial(unsigned char* data, unsigned int length) = 0;
virtual bool writeI2C(const unsigned char* data, unsigned int length) = 0;
virtual unsigned int readI2C(unsigned char* data, unsigned int length) = 0;
virtual unsigned char getMode() const = 0;
virtual bool setMode(unsigned char mode) = 0;

3
NullModem.h
View File

@@ -106,6 +106,9 @@ public:
virtual bool writeSerial(const unsigned char* data, unsigned int length) { return true; };
virtual unsigned int readSerial(unsigned char* data, unsigned int length) { return 0U; };
virtual bool writeI2C(const unsigned char* data, unsigned int length) { return true; };
virtual unsigned int readI2C(unsigned char* data, unsigned int length) { return 0U; };
virtual unsigned char getMode() const { return MODE_IDLE; };
virtual bool setMode(unsigned char mode) { return true; };

99
SerialModem.cpp
View File

@@ -98,6 +98,7 @@ const unsigned char MMDVM_ACK = 0x70U;
const unsigned char MMDVM_NAK = 0x7FU;
const unsigned char MMDVM_SERIAL_DATA = 0x80U;
const unsigned char MMDVM_I2C_DATA = 0x81U;
const unsigned char MMDVM_TRANSPARENT = 0x90U;
const unsigned char MMDVM_QSO_INFO = 0x91U;
@@ -184,6 +185,8 @@ m_rxAX25Data(1000U, "Modem RX AX.25"),
m_txAX25Data(1000U, "Modem TX AX.25"),
m_rxSerialData(1000U, "Modem RX Serial"),
m_txSerialData(1000U, "Modem TX Serial"),
m_rxI2CData(1000U, "Modem RX I2C"),
m_txI2CData(1000U, "Modem TX I2C"),
m_rxTransparentData(1000U, "Modem RX Transparent"),
m_txTransparentData(1000U, "Modem TX Transparent"),
m_sendTransparentDataFrameType(0U),
@@ -872,6 +875,12 @@ void CSerialModem::clock(unsigned int ms)
m_rxSerialData.addData(m_buffer + m_offset, m_length - m_offset);
break;
case MMDVM_I2C_DATA:
if (m_trace)
CUtils::dump(1U, "RX I2C Data", m_buffer, m_length);
m_rxI2CData.addData(m_buffer + m_offset, m_length - m_offset);
break;
default:
LogMessage("Unknown message, type: %02X", m_type);
CUtils::dump("Buffer dump", m_buffer, m_length);
@@ -1103,6 +1112,19 @@ void CSerialModem::clock(unsigned int ms)
if (ret != int(len))
LogWarning("Error when writing Serial data to the MMDVM");
}
if (!m_txI2CData.isEmpty()) {
unsigned char len = 0U;
m_txI2CData.getData(&len, 1U);
m_txI2CData.getData(m_buffer, len);
if (m_trace)
CUtils::dump(1U, "TX I2C Data", m_buffer, len);
int ret = m_serial->write(m_buffer, len);
if (ret != int(len))
LogWarning("Error when writing I2C data to the MMDVM");
}
}
void CSerialModem::close()
@@ -1268,6 +1290,20 @@ unsigned int CSerialModem::readSerial(unsigned char* data, unsigned int length)
return n;
}
unsigned int CSerialModem::readI2C(unsigned char* data, unsigned int length)
{
assert(data != NULL);
assert(length > 0U);
unsigned int n = 0U;
while (!m_rxI2CData.isEmpty() && n < length) {
m_rxI2CData.getData(data + n, 1U);
n++;
}
return n;
}
bool CSerialModem::hasDStarSpace() const
{
unsigned int space = m_txDStarData.freeSpace() / (DSTAR_FRAME_LENGTH_BYTES + 4U);
@@ -1620,6 +1656,48 @@ bool CSerialModem::writeTransparentData(const unsigned char* data, unsigned int
return true;
}
bool CSerialModem::writeSerial(const unsigned char* data, unsigned int length)
{
assert(m_serial != NULL);
assert(data != NULL);
assert(length > 0U);
unsigned char buffer[255U];
buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = length + 3U;
buffer[2U] = MMDVM_SERIAL_DATA;
::memcpy(buffer + 3U, data, length);
unsigned char len = length + 3U;
m_txSerialData.addData(&len, 1U);
m_txSerialData.addData(buffer, len);
return true;
}
bool CSerialModem::writeI2C(const unsigned char* data, unsigned int length)
{
assert(m_serial != NULL);
assert(data != NULL);
assert(length > 0U);
unsigned char buffer[255U];
buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = length + 3U;
buffer[2U] = MMDVM_I2C_DATA;
::memcpy(buffer + 3U, data, length);
unsigned char len = length + 3U;
m_txI2CData.addData(&len, 1U);
m_txI2CData.addData(buffer, len);
return true;
}
bool CSerialModem::writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector)
{
assert(m_serial != NULL);
@@ -1821,27 +1899,6 @@ bool CSerialModem::writeIPInfo(const std::string& address)
return ret != int(length + 4U);
}
bool CSerialModem::writeSerial(const unsigned char* data, unsigned int length)
{
assert(m_serial != NULL);
assert(data != NULL);
assert(length > 0U);
unsigned char buffer[255U];
buffer[0U] = MMDVM_FRAME_START;
buffer[1U] = length + 3U;
buffer[2U] = MMDVM_SERIAL_DATA;
::memcpy(buffer + 3U, data, length);
unsigned char len = length + 3U;
m_txSerialData.addData(&len, 1U);
m_txSerialData.addData(buffer, len);
return true;
}
bool CSerialModem::hasTX() const
{
return m_tx;

5
SerialModem.h
View File

@@ -124,6 +124,9 @@ public:
virtual bool writeSerial(const unsigned char* data, unsigned int length);
virtual unsigned int readSerial(unsigned char* data, unsigned int length);
virtual bool writeI2C(const unsigned char* data, unsigned int length);
virtual unsigned int readI2C(unsigned char* data, unsigned int length);
virtual unsigned char getMode() const;
virtual bool setMode(unsigned char mode);
@@ -206,6 +209,8 @@ private:
CRingBuffer<unsigned char> m_txAX25Data;
CRingBuffer<unsigned char> m_rxSerialData;
CRingBuffer<unsigned char> m_txSerialData;
CRingBuffer<unsigned char> m_rxI2CData;
CRingBuffer<unsigned char> m_txI2CData;
CRingBuffer<unsigned char> m_rxTransparentData;
CRingBuffer<unsigned char> m_txTransparentData;
unsigned int m_sendTransparentDataFrameType;