fixed merge conflicts

hal/src/fsfw_hal/common/gpio/gpioDefinitions.h

@@ -26,8 +26,10 @@ enum GpioOperation {
 
 enum GpioTypes {
     NONE,
+    GPIO_REGULAR,
     GPIO_REGULAR_BY_CHIP,
     GPIO_REGULAR_BY_LABEL,
+    GPIO_REGULAR_BY_LINE_NAME,
     CALLBACK
 };
 
@@ -75,6 +77,12 @@ public:
             int initValue, int lineNum): GpioBase(gpioType, consumer, direction, initValue),
             lineNum(lineNum) {
     }
+
+    // line number will be configured at a later point for the open by line name configuration
+    GpiodRegularBase(gpio::GpioTypes gpioType, std::string consumer, gpio::Direction direction,
+            int initValue): GpioBase(gpioType, consumer, direction, initValue) {
+    }
+
     int lineNum = 0;
     struct gpiod_line* lineHandle = nullptr;
 };
@@ -120,6 +128,27 @@ public:
     std::string label;
 };
 
+/**
+ * @brief   Passing this GPIO configuration to the GPIO IF object will try to open the GPIO by its
+ *          line name. This line name can be set in the device tree and must be unique. Otherwise
+ *          the driver will open the first line with the given name.
+ */
+class GpiodRegularByLineName: public GpiodRegularBase {
+public:
+    GpiodRegularByLineName(std::string lineName_, std::string consumer_, gpio::Direction direction_,
+            int initValue_) :
+            GpiodRegularBase(gpio::GpioTypes::GPIO_REGULAR_BY_LINE_NAME, consumer_, direction_,
+                    initValue_), lineName(lineName_) {
+    }
+
+    GpiodRegularByLineName(std::string lineName_, std::string consumer_) :
+            GpiodRegularBase(gpio::GpioTypes::GPIO_REGULAR_BY_LINE_NAME, consumer_, gpio::Direction::IN,
+                    gpio::LOW), lineName(lineName_) {
+    }
+
+    std::string lineName;
+};
+
 class GpioCallback: public GpioBase {
 public:
     GpioCallback(std::string consumer, gpio::Direction direction_, int initValue_,