Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial I2C driver code.

This commit is contained in:
Jonathan Naylor 2020-11-18 14:06:18 +00:00
parent 53b5659639
commit 2285f9bd82
11 changed files with 155 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Config.h
View File

@ -75,7 +75,10 @@
// #define USE_COS_AS_LOCKOUT
// Use pins to output the current mode via LEDs
#define MODE_LEDS
// #define MODE_LEDS
// Use an OLED to show the current mode via a small screen (64x32) on I2C3
#define MODE_OLED
// For the original Arduino Due pin layout
// #define ARDUINO_DUE_PAPA
@ -105,10 +108,10 @@
#define SEND_RSSI_DATA
// Use the modem as a serial repeater for Nextion displays
#define SERIAL_REPEATER
// #define SERIAL_REPEATER
// Use the modem as an I2C repeater for OLED displays
// #define I2C_REPEATER
// Use the modem as an I2C repeater for an OLED display on I2C1
#define I2C_REPEATER
// To reduce CPU load, you can remove the DC blocker by commenting out the next line
#define USE_DCBLOCKER
@ -121,13 +124,17 @@
// #define USE_ALTERNATE_NXDN_LEDS
// Use the D-Star and P25 LEDs for M17
#define USE_ALTERNATE_M17_LEDS
// #define USE_ALTERNATE_M17_LEDS
// Use the D-Star and DMR LEDs for POCSAG
#define USE_ALTERNATE_POCSAG_LEDS
// #define USE_ALTERNATE_POCSAG_LEDS
// Use the D-Star and YSF LEDs for FM
#define USE_ALTERNATE_FM_LEDS
// #define USE_ALTERNATE_FM_LEDS
#if defined(MODE_OLED)
#undef MODE_LEDS
#endif
#endif

8
Globals.h
View File

@ -100,6 +100,8 @@ enum MMDVM_STATE {
#include "CalNXDN.h"
#include "CalPOCSAG.h"
#include "CalRSSI.h"
#include "I2CPort.h"
#include "I2COLED.h"
#include "CWIdTX.h"
#include "AX25RX.h"
#include "AX25TX.h"
@ -142,6 +144,12 @@ extern bool m_dcd;
extern CSerialPort serial;
extern CIO io;
#if defined(MODE_OLED)
extern CI2COLED oled;
extern CI2CPort i2C1;
extern CI2CPort i2C3;
#endif
#if defined(MODE_DSTAR)
extern CDStarRX dstarRX;
extern CDStarTX dstarTX;

40
I2COLED.h Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (C) 2020 by 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Config.h"
#if defined(MODE_OLED)
#if !defined(I2COLED_H)
#define I2COLED_H
#include "Globals.h"
class CI2COLED {
public:
CI2COLED();
void setMode(MMDVM_STATE state);
private:
};
#endif
#endif

44
I2CPort.h Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (C) 2020 by 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "Config.h"
#if defined(MODE_OLED) || defined(I2C_REPEATER)
#if !defined(I2CPORT_H)
#define I2CPORT_H
#include "Globals.h"
class CI2CPort {
public:
CI2CPort();
bool init();
uint8_t writeCommand(const uint8_t* data, uint8_t length);
uint8_t writeData(const uint8_t* data, uint8_t length);
private:
};
#endif
#endif

4
IO.cpp
View File

@ -760,6 +760,10 @@ void CIO::setMode(MMDVM_STATE state)
}
#endif
#if defined(MODE_OLED)
oled.setMode(state);
#endif
m_modemState = state;
}

8
IOSTM.cpp
View File

@ -190,6 +190,14 @@ void CIO::initInt()
#endif
#endif
#if defined(MODE_OLED)
I2C3Init();
#endif
#if defined(I2C_REPEATER)
I2C1Init();
#endif
}
void CIO::startInt()

6
IOSTM_CMSIS.cpp
View File

@ -357,6 +357,12 @@ void CIO::initInt()
#if defined(STM32F1_POG)
FancyLEDEffect();
#endif
#if defined(MODE_OLED)
I2C3Init();
#endif
#if defined(I2C_REPEATER)
I2C1Init();
#endif
}
void CIO::startInt()

6
MMDVM.cpp
View File

@ -41,6 +41,12 @@ bool m_duplex = true;
bool m_tx = false;
bool m_dcd = false;
#if defined(MODE_OLED)
CI2COLED oled;
CI2CPort i2C1;
CI2CPort i2C3;
#endif
#if defined(MODE_DSTAR)
CDStarRX dstarRX;
CDStarTX dstarTX;

6
MMDVM.ino
View File

@ -38,6 +38,12 @@ bool m_duplex = true;
bool m_tx = false;
bool m_dcd = false;
#if defined(MODE_OLED)
CI2COLED oled;
CI2CPort i2C1;
CI2CPort i2C3;
#endif
#if defined(MODE_DSTAR)
CDStarRX dstarRX;
CDStarTX dstarTX;

42
SerialPort.cpp
View File

@ -127,6 +127,10 @@ const uint8_t PROTOCOL_VERSION = 2U;
const int MAX_SERIAL_DATA = 250;
const uint16_t MAX_SERIAL_COUNT = 100U;
// I2C types
const uint8_t I2C_COMMAND = 0x00U;
const uint8_t I2C_DATA = 0x40U;
CSerialPort::CSerialPort() :
m_buffer(),
m_ptr(0U),
@ -134,8 +138,7 @@ m_len(0U),
m_debug(false),
m_serialData(),
m_lastSerialAvail(0),
m_lastSerialAvailCount(0U),
m_i2CData()
m_lastSerialAvailCount(0U)
{
}
@ -852,9 +855,6 @@ void CSerialPort::start()
#if defined(SERIAL_REPEATER)
beginInt(3U, 9600);
#endif
#if defined(I2C_REPEATER)
beginInt(10U, 9600);
#endif
}
void CSerialPort::process()
@ -939,22 +939,6 @@ void CSerialPort::process()
m_lastSerialAvailCount = 0U;
}
#endif
#if defined(I2C_REPEATER)
// Write any outgoing serial data
uint16_t i2CSpace = m_i2CData.getData();
if (i2CSpace > 0U) {
int avail = availableForWriteInt(10U);
if (avail < i2CSpace)
i2CSpace = avail;
for (uint16_t i = 0U; i < i2CSpace; i++) {
uint8_t c = 0U;
m_i2CData.get(c);
writeInt(10U, &c, 1U);
}
}
#endif
}
void CSerialPort::processMessage(uint8_t type, const uint8_t* buffer, uint16_t length)
@ -1332,8 +1316,20 @@ void CSerialPort::processMessage(uint8_t type, const uint8_t* buffer, uint16_t l
#if defined(I2C_REPEATER)
case MMDVM_I2C_DATA: {
for (uint16_t i = 0U; i < length; i++)
m_i2CData.put(buffer[i]);
uint8_t type = buffer[0U];
uint8_t err = 4U;
switch (type) {
case I2C_COMMAND:
err = i2C1.writeCommand(buffer + 1U, length - 1U);
break;
case I2C_DATA:
err = i2C1.writeData(buffer + 1U, length - 1U);
break;
}
if (err != 0U) {
DEBUG2("Received invalid I2C data", err);
sendNAK(err);
}
}
break;
#endif

1
SerialPort.h
View File

@ -100,7 +100,6 @@ private:
CRingBuffer<uint8_t> m_serialData;
int m_lastSerialAvail;
uint16_t m_lastSerialAvailCount;
CRingBuffer<uint8_t> m_i2CData;
void sendACK();
void sendNAK(uint8_t err);