Skip to content

Commit 7e15968

Browse files
committed
Fix bug where _sfm wthin SonarConfiguration isn't being initialized
correctly.
1 parent a71b714 commit 7e15968

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

include/liboculus/SonarConfiguration.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ class SonarConfiguration {
102102

103103
void updateFlags() const;
104104

105-
mutable OculusSimpleFireMessage2 _sfm;
105+
typedef OculusSimpleFireMessage2 ConfigFireMessage;
106+
mutable ConfigFireMessage _sfm;
106107

107108
bool _sendRangeAsMeters;
108109
float _rangeInMeters;

lib/SonarConfiguration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ SonarConfiguration::SonarConfiguration()
4848
_gainAssistance(true),
4949
_512beams(true),
5050
_dataSize(dataSize8Bit) {
51-
memset(&_sfm, 0, sizeof(OculusSimpleFireMessage));
51+
memset(&_sfm, 0, sizeof(ConfigFireMessage));
5252

5353
// Fill in OculusMessageHeader _sfm.head
5454
_sfm.head.oculusId = OCULUS_CHECK_ID; // 0x4f53
5555
_sfm.head.srcDeviceId = 0;
5656
_sfm.head.dstDeviceId = 0; // n.b. ignored by device
5757
_sfm.head.msgId = messageSimpleFire;
5858
_sfm.head.msgVersion = 2;
59-
_sfm.head.payloadSize = sizeof(OculusSimpleFireMessage2) - sizeof(OculusMessageHeader);
59+
_sfm.head.payloadSize = sizeof(ConfigFireMessage) - sizeof(OculusMessageHeader);
6060

6161
_sfm.masterMode = OCULUS_HIGH_FREQ;
6262
_sfm.pingRate = pingRateNormal;

0 commit comments

Comments
 (0)