Skip to content

Commit 699504e

Browse files
committed
fix json crorc-id
1 parent e07b22c commit 699504e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/CardConfigurator.cxx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
182182
parsedString = subtree.get<std::string>("cruId");
183183
cruId = Hex::fromString(parsedString);
184184

185-
parsedString = subtree.get<std::string>("crorc-id");
186-
crorcId = Hex::fromString(parsedString);
187-
188185
allowRejection = subtree.get<bool>("allowRejection");
189186

190187
triggerWindowSize = subtree.get<int>("triggerWindowSize");
@@ -208,7 +205,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
208205
parameters.setDynamicOffsetEnabled(dynamicOffset);
209206
parameters.setOnuAddress(onuAddress);
210207
parameters.setCruId(cruId);
211-
parameters.setCrorcId(crorcId);
212208
parameters.setAllowRejection(allowRejection);
213209
parameters.setTriggerWindowSize(triggerWindowSize);
214210
parameters.setGbtEnabled(gbtEnabled);
@@ -217,6 +213,14 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
217213
parameters.setUserAndCommonLogicEnabled(userAndCommonLogicEnabled);
218214
parameters.setSystemId(systemId);
219215
parameters.setTimeFrameLength(timeFrameLength);
216+
217+
} else if (group == "crorc") {
218+
219+
parsedString = subtree.get<std::string>("crorcId");
220+
crorcId = Hex::fromString(parsedString);
221+
222+
parameters.setCrorcId(crorcId);
223+
220224
} else if (group == "links") { // Configure all links with default values
221225

222226
enabled = subtree.get<bool>("enabled");

0 commit comments

Comments
 (0)