g4klx/MMDVM_HS
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVM_HS.git synced 2025-12-06 07:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some cleanup

Browse source
This commit is contained in:
Andy CA6JAU 2018-07-21 12:10:05 -04:00
parent 17161460bf
commit cd1e95ff31
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
DMRSlotRX.cpp
View file

@ -80,6 +80,12 @@ void CDMRSlotRX::reset()
m_delayPtr = 0U; m_delayPtr = 0U;
m_patternBuffer = 0U; m_patternBuffer = 0U;
reset1();
reset2();
}
void CDMRSlotRX::reset1()
{
m_syncPtr1 = 0U; m_syncPtr1 = 0U;
m_control1 = CONTROL_NONE; m_control1 = CONTROL_NONE;
m_syncCount1 = 0U; m_syncCount1 = 0U;
@ -88,8 +94,10 @@ void CDMRSlotRX::reset()
m_endPtr1 = NOENDPTR; m_endPtr1 = NOENDPTR;
m_type1 = 0U; m_type1 = 0U;
m_n1 = 0U; m_n1 = 0U;
}
void CDMRSlotRX::reset2()
{
m_syncPtr2 = 0U; m_syncPtr2 = 0U;
m_control2 = CONTROL_NONE; m_control2 = CONTROL_NONE;
m_syncCount2 = 0U; m_syncCount2 = 0U;
@ -228,8 +236,7 @@ void CDMRSlotRX::procSlot1()
m_syncCount1++; m_syncCount1++;
if (m_syncCount1 >= MAX_SYNC_LOST_FRAMES) { if (m_syncCount1 >= MAX_SYNC_LOST_FRAMES) {
serial.writeDMRLost(0U); serial.writeDMRLost(0U);
m_state1 = DMRRXS_NONE; reset1();
m_endPtr1 = NOENDPTR;
} }
} }
@ -249,7 +256,7 @@ void CDMRSlotRX::procSlot1()
} }
} }
} }
// End of this slot, reset some items for the next slot. // End of this slot, reset some items for the next slot.
m_control1 = CONTROL_NONE; m_control1 = CONTROL_NONE;
} }
@ -331,8 +338,7 @@ void CDMRSlotRX::procSlot2()
m_syncCount2++; m_syncCount2++;
if (m_syncCount2 >= MAX_SYNC_LOST_FRAMES) { if (m_syncCount2 >= MAX_SYNC_LOST_FRAMES) {
serial.writeDMRLost(1U); serial.writeDMRLost(1U);
m_state2 = DMRRXS_NONE; reset2();
m_endPtr2 = NOENDPTR;
} }
} }
@ -352,7 +358,7 @@ void CDMRSlotRX::procSlot2()
} }
} }
} }
// End of this slot, reset some items for the next slot. // End of this slot, reset some items for the next slot.
m_control2 = CONTROL_NONE; m_control2 = CONTROL_NONE;
} }
@ -469,10 +475,10 @@ void CDMRSlotRX::writeRSSIData1()
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
uint16_t rssi = io.readRSSI(); uint16_t rssi = io.readRSSI();
frame1[34U] = (rssi >> 8) & 0xFFU; frame1[34U] = (rssi >> 8) & 0xFFU;
frame1[35U] = (rssi >> 0) & 0xFFU; frame1[35U] = (rssi >> 0) & 0xFFU;
serial.writeDMRData(0U, frame1, DMR_FRAME_LENGTH_BYTES + 3U); serial.writeDMRData(0U, frame1, DMR_FRAME_LENGTH_BYTES + 3U);
#else #else
serial.writeDMRData(0U, frame1, DMR_FRAME_LENGTH_BYTES + 1U); serial.writeDMRData(0U, frame1, DMR_FRAME_LENGTH_BYTES + 1U);
@ -483,10 +489,10 @@ void CDMRSlotRX::writeRSSIData2()
{ {
#if defined(SEND_RSSI_DATA) #if defined(SEND_RSSI_DATA)
uint16_t rssi = io.readRSSI(); uint16_t rssi = io.readRSSI();
frame2[34U] = (rssi >> 8) & 0xFFU; frame2[34U] = (rssi >> 8) & 0xFFU;
frame2[35U] = (rssi >> 0) & 0xFFU; frame2[35U] = (rssi >> 0) & 0xFFU;
serial.writeDMRData(1U, frame2, DMR_FRAME_LENGTH_BYTES + 3U); serial.writeDMRData(1U, frame2, DMR_FRAME_LENGTH_BYTES + 3U);
#else #else
serial.writeDMRData(1U, frame2, DMR_FRAME_LENGTH_BYTES + 1U); serial.writeDMRData(1U, frame2, DMR_FRAME_LENGTH_BYTES + 1U);

2
DMRSlotRX.h
View file

@ -83,6 +83,8 @@ private:
void bitsToBytes(uint16_t start, uint8_t count, uint8_t* buffer); void bitsToBytes(uint16_t start, uint8_t count, uint8_t* buffer);
void writeRSSIData1(); void writeRSSIData1();
void writeRSSIData2(); void writeRSSIData2();
void reset1();
void reset2();
}; };
#endif #endif