mirror of https://github.com/g4klx/MMDVM.git
Change size of space in transmit routines.
This commit is contained in:
parent
d89b68ff76
commit
8c970b26db
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2016 by Colin Durbridge G4EML
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
@ -158,7 +158,7 @@ void CDMRDMOTX::writeByte(uint8_t c)
|
|||
io.write(STATE_DMR, outBuffer, blockSize);
|
||||
}
|
||||
|
||||
uint16_t CDMRDMOTX::getSpace() const
|
||||
uint8_t CDMRDMOTX::getSpace() const
|
||||
{
|
||||
return m_fifo.getSpace() / (DMR_FRAME_LENGTH_BYTES + 2U);
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2016 by Colin Durbridge G4EML
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
@ -35,7 +35,7 @@ public:
|
|||
|
||||
void setTXDelay(uint8_t delay);
|
||||
|
||||
uint16_t getSpace() const;
|
||||
uint8_t getSpace() const;
|
||||
|
||||
private:
|
||||
CSerialRB m_fifo;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2016 by Colin Durbridge G4EML
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
@ -301,12 +301,12 @@ void CDMRTX::writeByte(uint8_t c, uint8_t control)
|
|||
io.write(STATE_DMR, outBuffer, blockSize, controlBuffer);
|
||||
}
|
||||
|
||||
uint16_t CDMRTX::getSpace1() const
|
||||
uint8_t CDMRTX::getSpace1() const
|
||||
{
|
||||
return m_fifo[0U].getSpace() / (DMR_FRAME_LENGTH_BYTES + 2U);
|
||||
}
|
||||
|
||||
uint16_t CDMRTX::getSpace2() const
|
||||
uint8_t CDMRTX::getSpace2() const
|
||||
{
|
||||
return m_fifo[1U].getSpace() / (DMR_FRAME_LENGTH_BYTES + 2U);
|
||||
}
|
||||
|
|
6
DMRTX.h
6
DMRTX.h
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2016 by Colin Durbridge G4EML
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
@ -49,8 +49,8 @@ public:
|
|||
|
||||
void process();
|
||||
|
||||
uint16_t getSpace1() const;
|
||||
uint16_t getSpace2() const;
|
||||
uint8_t getSpace1() const;
|
||||
uint8_t getSpace2() const;
|
||||
|
||||
void setColorCode(uint8_t colorCode);
|
||||
|
||||
|
|
|
@ -460,7 +460,7 @@ void CDStarTX::setTXDelay(uint8_t delay)
|
|||
m_txDelay = 300U + uint16_t(delay) * 6U; // 250ms + tx delay
|
||||
}
|
||||
|
||||
uint16_t CDStarTX::getSpace() const
|
||||
uint8_t CDStarTX::getSpace() const
|
||||
{
|
||||
return m_buffer.getSpace() / (DSTAR_DATA_LENGTH_BYTES + 1U);
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ public:
|
|||
|
||||
void setTXDelay(uint8_t delay);
|
||||
|
||||
uint16_t getSpace() const;
|
||||
uint8_t getSpace() const;
|
||||
|
||||
private:
|
||||
CSerialRB m_buffer;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2016,2017 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
|
||||
|
@ -189,7 +189,7 @@ void CP25TX::setTXDelay(uint8_t delay)
|
|||
m_txDelay = 600U + uint16_t(delay) * 12U; // 500ms + tx delay
|
||||
}
|
||||
|
||||
uint16_t CP25TX::getSpace() const
|
||||
uint8_t CP25TX::getSpace() const
|
||||
{
|
||||
return m_buffer.getSpace() / P25_LDU_FRAME_LENGTH_BYTES;
|
||||
}
|
||||
|
|
2
P25TX.h
2
P25TX.h
|
@ -33,7 +33,7 @@ public:
|
|||
|
||||
void setTXDelay(uint8_t delay);
|
||||
|
||||
uint16_t getSpace() const;
|
||||
uint8_t getSpace() const;
|
||||
|
||||
private:
|
||||
CSerialRB m_buffer;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2009-2017 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
|
||||
|
@ -169,7 +169,7 @@ void CYSFTX::setTXDelay(uint8_t delay)
|
|||
m_txDelay = 600U + uint16_t(delay) * 12U; // 500ms + tx delay
|
||||
}
|
||||
|
||||
uint16_t CYSFTX::getSpace() const
|
||||
uint8_t CYSFTX::getSpace() const
|
||||
{
|
||||
return m_buffer.getSpace() / YSF_FRAME_LENGTH_BYTES;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue