Allow a few cases to be on one line.

Author: mikehosmar

puma_motor_driver/.clang-format

@@ -1,6 +1,7 @@
 ---
 BasedOnStyle: Google
 AccessModifierOffset: -2
+AlignArrayOfStructures: Right
 AlignConsecutiveAssignments:
   Enabled: true
   AlignCompound: true
@@ -14,15 +15,14 @@ AlignConsecutiveMacros:
 AlignTrailingComments:
   OverEmptyLines: 1
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: InlineOnly
 BinPackArguments: false
 BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel: false
   AfterClass: "true"
-  AfterControlStatement: "true"
+  AfterControlStatement: Always
   AfterEnum: "true"
   AfterFunction: "true"
   AfterNamespace: "true"
@@ -35,9 +35,9 @@ BraceWrapping:
   BeforeLambdaBody: false
   BeforeWhile: false
   IndentBraces: "false"
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
 BreakAfterReturnType: Automatic
 BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Custom
@@ -47,7 +47,8 @@ BreakTemplateDeclarations: MultiLine
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
 Cpp11BracedListStyle: false
-PackConstructorInitializers: NextLine
+DerivePointerAlignment: false
+InsertNewlineAtEOF: true
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 60
 PenaltyBreakFirstLessLess: 1000

puma_motor_driver/include/puma_motor_driver/driver.hpp

@@ -437,31 +437,19 @@ class Driver
    */
   double statusPositionGet();
 
-  std::string deviceName() const
-  {
-    return device_name_;
-  }
+  std::string deviceName() const { return device_name_; }
 
-  uint8_t deviceNumber() const
-  {
-    return device_number_;
-  }
+  uint8_t deviceNumber() const { return device_number_; }
 
   // Only used internally but is used for testing.
   struct Field
   {
     uint8_t data[4];
     bool    received;
 
-    float interpretFixed8x8()
-    {
-      return *(reinterpret_cast<int16_t*>(data)) / static_cast<float>(1 << 8);
-    }
+    float interpretFixed8x8() { return *(reinterpret_cast<int16_t*>(data)) / static_cast<float>(1 << 8); }
 
-    double interpretFixed16x16()
-    {
-      return *(reinterpret_cast<int32_t*>(data)) / static_cast<double>(1 << 16);
-    }
+    double interpretFixed16x16() { return *(reinterpret_cast<int32_t*>(data)) / static_cast<double>(1 << 16); }
   };
 
 private:

puma_motor_driver/src/driver.cpp

@@ -72,8 +72,7 @@ Driver::Driver(const std::shared_ptr<clearpath_ros2_socketcan_interface::SocketC
   , gain_d_(0)
   , encoder_cpr_(1)
   , gear_ratio_(1)
-{
-}
+{}
 
 void Driver::processMessage(const can_msgs::msg::Frame::SharedPtr received_msg)
 {