diff options
-rw-r--r-- | Transceiver52M/Transceiver.cpp | 16 | ||||
-rw-r--r-- | Transceiver52M/Transceiver.h | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 2376e3d..bdc8aff 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -214,6 +214,9 @@ void Transceiver::setModulus(int timeslot) case VII: fillerModulus[timeslot] = 102; break; + case XIII: + fillerModulus[timeslot] = 52; + break; default: break; } @@ -268,15 +271,22 @@ Transceiver::CorrType Transceiver::expectedCorrType(GSM::Time currTime) else return TSC; break; + case XIII: { + int mod52 = burstFN % 52; + if ((mod52 == 12) || (mod52 == 38)) + return RACH; + else if ((mod52 == 25) || (mod52 == 51)) + return IDLE; + else + return TSC; + break; + } case LOOPBACK: if ((burstFN % 51 <= 50) && (burstFN % 51 >=48)) return IDLE; else return TSC; break; - case XIII: - return TSC; - break; default: return OFF; break; diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 8df29e5..30eb7b9 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -86,12 +86,14 @@ private: V, ///< FCCH+SCH+CCCH+BCCH+SDCCH/4+SACCH/4, uplink RACH+SDCCH/4 VI, ///< CCCH+BCCH, uplink RACH VII, ///< SDCCH/8 + SACCH/8 + VIII, ///< TCH/F + FACCH/F + SACCH/M + IX, ///< TCH/F + SACCH/M + X, ///< TCH/FD + SACCH/MD + XI, ///< PBCCH+PCCCH+PDTCH+PACCH+PTCCH + XII, ///< PCCCH+PDTCH+PACCH+PTCCH + XIII, ///< PDTCH+PACCH+PTCCH NONE, ///< Channel is inactive, default - LOOPBACK, ///< similar go VII, used in loopback testing
- X, - XI, - XII, - XIII + LOOPBACK ///< similar go VII, used in loopback testing } ChannelCombination; |