From 371f0a20cad4dfcb3237db6f72a7e35403950938 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Fri, 30 Jun 2023 20:48:40 +1000 Subject: Clean up gpios interface --- src/drivers/test/test_dac.cpp | 4 ++-- src/drivers/test/test_gpio_expander.cpp | 11 +++++------ src/drivers/test/test_storage.cpp | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src/drivers/test') diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp index edf9e1e9..e8d8dd94 100644 --- a/src/drivers/test/test_dac.cpp +++ b/src/drivers/test/test_dac.cpp @@ -10,7 +10,7 @@ #include "catch2/catch.hpp" -#include "gpio_expander.hpp" +#include "gpios.hpp" #include "i2c.hpp" #include "i2c_fixture.hpp" @@ -18,7 +18,7 @@ namespace drivers { TEST_CASE("dac configuration", "[integration]") { I2CFixture i2c; - GpioExpander expander; + IGpios expander; cpp::result dac_res = AudioDac::create(&expander); REQUIRE(dac_res.has_value()); std::unique_ptr dac(dac_res.value()); diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp index 2a31d9c7..972bcf09 100644 --- a/src/drivers/test/test_gpio_expander.cpp +++ b/src/drivers/test/test_gpio_expander.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "gpio_expander.hpp" +#include "gpios.hpp" #include "catch2/catch.hpp" @@ -15,17 +15,16 @@ namespace drivers { TEST_CASE("gpio expander", "[integration]") { I2CFixture i2c; - GpioExpander expander; + IGpios expander; SECTION("with() writes when ") { // Initial value. expander.Read(); - REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == true); + REQUIRE(expander.get_input(IGpios::KEY_DOWN) == true); - expander.with( - [&](auto& gpio) { gpio.set_pin(GpioExpander::KEY_DOWN, false); }); + expander.with([&](auto& gpio) { gpio.set_pin(IGpios::KEY_DOWN, false); }); expander.Read(); - REQUIRE(expander.get_input(GpioExpander::KEY_DOWN) == false); + REQUIRE(expander.get_input(IGpios::KEY_DOWN) == false); } } diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp index 90f2843a..c785fa01 100644 --- a/src/drivers/test/test_storage.cpp +++ b/src/drivers/test/test_storage.cpp @@ -14,7 +14,7 @@ #include "catch2/catch.hpp" -#include "gpio_expander.hpp" +#include "gpios.hpp" #include "i2c.hpp" #include "i2c_fixture.hpp" #include "spi.hpp" @@ -29,7 +29,7 @@ static const std::string kTestFilePath = TEST_CASE("sd card storage", "[integration]") { I2CFixture i2c; SpiFixture spi; - GpioExpander expander; + IGpios expander; { std::unique_ptr result(SdStorage::create(&expander).value()); -- cgit v1.2.3