set DMR registration requirement on whether or not the CC is dedicated;

dmr/Control.cpp

@@ -126,9 +126,6 @@ void Control::setOptions(yaml::Node& conf, uint32_t netId, uint8_t siteId, uint8
     if (backOff > 15U)
         backOff = 15U;
 
-    Slot::setSiteData(netId, siteId, channelId, channelNo);
-    Slot::setAlohaConfig(nRandWait, backOff);
-
     yaml::Node control = dmrProtocol["control"];
     bool enableTSCC = control["enable"].as<bool>(false);
     bool dedicatedTSCC = false;
@@ -139,6 +136,9 @@ void Control::setOptions(yaml::Node& conf, uint32_t netId, uint8_t siteId, uint8
         dedicatedTSCC = false;
     }
 
+    Slot::setSiteData(netId, siteId, channelId, channelNo, dedicatedTSCC);
+    Slot::setAlohaConfig(nRandWait, backOff);
+
     m_tsccSlotNo = (uint8_t)control["slot"].as<uint32_t>(0U);
     switch (m_tsccSlotNo) {
     case 1U:

dmr/Slot.cpp

@@ -637,10 +637,10 @@ void Slot::init(Control* dmr, uint32_t colorCode, SiteData siteData, bool embedd
 /// <param name="siteId">DMR Site ID.</param>
 /// <param name="channelId">Channel ID.</param>
 /// <param name="channelNo">Channel Number.</param>
-/// <param name="nRandWait"></param>
+/// <param name="requireReg"></param>
-void Slot::setSiteData(uint32_t netId, uint8_t siteId, uint8_t channelId, uint32_t channelNo)
+void Slot::setSiteData(uint32_t netId, uint8_t siteId, uint8_t channelId, uint32_t channelNo, bool requireReg)
 {
-    m_siteData = SiteData(SITE_MODEL_SMALL, netId, siteId, 3U, true);
+    m_siteData = SiteData(SITE_MODEL_SMALL, netId, siteId, 3U, requireReg);
     m_channelNo = channelNo;
 
     std::vector<lookups::IdenTable> entries = m_idenTable->list();

dmr/Slot.h

@@ -110,7 +110,7 @@ namespace dmr
             network::BaseNetwork* network, bool duplex, lookups::RadioIdLookup* ridLookup, lookups::TalkgroupIdLookup* tidLookup,
             lookups::IdenTableLookup* idenTable, lookups::RSSIInterpolator* rssiMapper, uint32_t jitter, bool verbose);
         /// <summary>Sets local configured site data.</summary>
-        static void setSiteData(uint32_t netId, uint8_t siteId, uint8_t channelId, uint32_t channelNo);
+        static void setSiteData(uint32_t netId, uint8_t siteId, uint8_t channelId, uint32_t channelNo, bool requireReq);
         /// <summary>Sets TSCC Aloha configuration.</summary>
         static void setAlohaConfig(uint8_t nRandWait, uint8_t backOff);