Feature/enum cleanup (#15)

* Move enum into Constants.h to be more broadly available

* line length and curly brace cleanup

* Added extra const to intermediate variable.

Co-authored-by: Aaron Marburg <[email protected]>

Author: lauralindzey

include/liboculus/Constants.h

@@ -84,4 +84,13 @@ struct FlagBits {
   static const uint8_t Do512Beams    = (0x01) << 6;
 };
 
-}  // namespace liboculus
+  // There doesn't appear to be an enum for the masterMode (like there is
+  // for pingRate and dataSize), so creating our own to match comments in
+  // liboculus/thirdparty/Oculus/Oculus.h.
+  typedef enum {
+    OCULUS_LOW_FREQ = 1,
+    OCULUS_HIGH_FREQ = 2
+  } OculusFreqMode;
+
+
+}  // namespace liboculus

include/liboculus/SonarConfiguration.h

@@ -34,6 +34,7 @@
 #include <boost/asio.hpp>
 
 #include "Oculus/Oculus.h"
+#include "liboculus/Constants.h"
 
 namespace liboculus {
 
@@ -57,11 +58,6 @@ class SonarConfiguration {
   SonarConfiguration &setFlags(uint8_t flags);
   SonarConfiguration &setWaterTemperature(double degC);
 
-  typedef enum {
-    OCULUS_LOW_FREQ = 1,
-    OCULUS_HIGH_FREQ = 2
-  } OculusFreqMode;
-
   SonarConfiguration &setFreqMode(OculusFreqMode input);
   OculusFreqMode getFreqMode() const {
     if (_sfm.masterMode == 1)
@@ -96,9 +92,7 @@ class SonarConfiguration {
   SonarConfiguration &use512Beams()    { return set512Beams(true); }
   bool get512Beams() const                { return _512beams;}
 
-
   bool getSendGain() const                { return _sendGain; }
-  //bool getData16Bit() const               { return _16bitData; }
   bool getSimpleReturn() const            { return _simpleReturn; }
   bool getGainAssistance() const          { return _gainAssistance; }
 

lib/SonarConfiguration.cpp

@@ -191,11 +191,13 @@ std::vector<uint8_t> SonarConfiguration::serialize<OculusSimpleFireMessage>() co
 
 void SonarConfiguration::updateFlags() const {
   _sfm.extFlags = 0;
-  if (_dataSize == dataSize32Bit) 
+  if (_dataSize == dataSize32Bit) {
     _sfm.extFlags |= 0x00000200;
+  }
 
+  const bool more_than_8bit = (_dataSize == dataSize16Bit) || (_dataSize == dataSize32Bit);
   _sfm.flags = (_rangeInMeters  ? FlagBits::RangeAsMeters : 0 ) |
-         (((_dataSize == dataSize16Bit) || (_dataSize == dataSize32Bit)) ? FlagBits::Data16Bits : 0) |
+         (more_than_8bit  ? FlagBits::Data16Bits : 0) |
          (_sendGain       ? FlagBits::DoSendGain : 0) |
          (_simpleReturn   ? FlagBits::SimpleReturn : 0) |
          (_gainAssistance ? FlagBits::GainAssistance : 0) |
@@ -221,7 +223,4 @@ void SonarConfiguration::dump() const {
             << "\n       use 512 beams   " << get512Beams();
 }
 
-
-
-
 }  // namespace liboculus