♻️ (drivers): Refactor pin_is_on

leka · Nov 15, 2022 · ae43f7c · ae43f7c
1 parent 7927dd4
commit ae43f7c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/drivers/CoreIOExpander/source/CoreIOExpander.cpp b/drivers/CoreIOExpander/source/CoreIOExpander.cpp
@@ -78,8 +78,8 @@ auto CoreIOExpanderMCP23017::getModeForPin(uint16_t pin) -> PinMode
 auto CoreIOExpanderMCP23017::readPin(uint16_t pin) -> int
 {
 	_registers.gpio = readRegister(mcp23017::internal_register::GPIO);
-	auto value		= _registers.gpio & pin;
-	return pin == value ? 1 : 0;
+	auto pin_is_on	= _registers.gpio & pin;
+	return pin_is_on;
 }
 
 void CoreIOExpanderMCP23017::writePin(uint16_t pin, int value)

diff --git a/drivers/CoreIOExpander/tests/CoreIOExpander_test.cpp b/drivers/CoreIOExpander/tests/CoreIOExpander_test.cpp
@@ -140,7 +140,7 @@ TEST_F(CoreIOExpanderTest, readPinHigh)
 	MOCK_FUNCTION_expectedCallsReadRegister(mcp23017::internal_register::GPIO, GPIO_expected_buffer);
 
 	auto output_value = expander.readPin(pin_number);
-	EXPECT_EQ(1, output_value);
+	EXPECT_EQ(pin_number, output_value);
 }
 
 TEST_F(CoreIOExpanderTest, readPinLow)

diff --git a/drivers/CoreTouchSensor/source/CoreTouchSensor.cpp b/drivers/CoreTouchSensor/source/CoreTouchSensor.cpp
@@ -20,7 +20,7 @@ void CoreTouchSensor::init()
 
 auto CoreTouchSensor::read() -> bool
 {
-	_state = (1 == _detect_pin.read());
+	_state = (_detect_pin.read() != 0);
 	return _state;
 }