deleted polling sequence file

2021-03-22 12:47:45 +01:00
parent 5439305b8c 682cdb3ce9
commit 862a546637
55 changed files with 1039 additions and 741 deletions
--- a/linux/gpio/LinuxLibgpioIF.cpp
+++ b/linux/gpio/LinuxLibgpioIF.cpp
@ -88,8 +88,12 @@ ReturnValue_t LinuxLibgpioIF::configureRegularGpio(gpioId_t gpioId, GpiodRegular
    lineNum = regularGpio->lineNum;
    lineHandle = gpiod_chip_get_line(chip, lineNum);
    if (!lineHandle) {
+<<<<<<< HEAD
        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line for GPIO with id "
                    << gpioId << std::endl;
+=======
+        sif::error << "LinuxLibgpioIF::configureGpios: Failed to open line" << std::endl;
+>>>>>>> develop
        gpiod_chip_close(chip);
        return RETURN_FAILED;
    }