Merge pull request #402 from sy-c/master

sy-c · web-flow · commit d1b3cca5f392 · 2023-02-16T11:09:57.000+01:00
v0.40.2
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -21,3 +21,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 ## v0.40.1 - 11/01/2023
 - Added support for CRORC firmware version v2.10.0 (0x221ff280)
 - Minor compilation warnings fixed
+
+## v0.40.2 - 16/02/2023
+- Fixed bug with o2-roc-ctp-emulator failing to parse hexadecimal values of the init-orbit option.
diff --git a/src/CommandLineUtilities/ProgramCtpEmulator.cxx b/src/CommandLineUtilities/ProgramCtpEmulator.cxx
@@ -113,7 +113,7 @@ class ProgramCtpEmulator : public Program
                           mOptions.triggerFrequency,
                           mOptions.generateEox,
                           mOptions.generateSingleTrigger,
-                          (uint32_t)strtoul(mOptions.orbitInit.c_str(), NULL, 32) });
+                          (uint32_t)strtoul(mOptions.orbitInit.c_str(), NULL, 16) });
   }
 
  private:
diff --git a/src/ReadoutCardVersion.cxx b/src/ReadoutCardVersion.cxx
@@ -11,7 +11,7 @@
 
 #include "ReadoutCard/Version.h"
 
-#define O2_READOUTCARD_VERSION "0.38.0"
+#define O2_READOUTCARD_VERSION "0.40.2"
 
 namespace o2
 {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class ProgramCtpEmulator : public Program`
`113`	`113`	`mOptions.triggerFrequency,`
`114`	`114`	`mOptions.generateEox,`
`115`	`115`	`mOptions.generateSingleTrigger,`
`116`		`- (uint32_t)strtoul(mOptions.orbitInit.c_str(), NULL, 32) });`
	`116`	`+ (uint32_t)strtoul(mOptions.orbitInit.c_str(), NULL, 16) });`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`#include "ReadoutCard/Version.h"`
`13`	`13`
`14`		`-#define O2_READOUTCARD_VERSION "0.38.0"`
	`14`	`+#define O2_READOUTCARD_VERSION "0.40.2"`
`15`	`15`
`16`	`16`	`namespace o2`
`17`	`17`	`{`