Skip to content

Implement polymorphism for DigitalIn/Out/InOut #13209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions drivers/include/drivers/DigitalIn.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2019 ARM Limited
* Copyright (c) 2006-2020 ARM Limited
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -19,9 +19,11 @@

#include "platform/platform.h"

#include "interfaces/InterfaceDigitalIn.h"
#include "hal/gpio_api.h"

namespace mbed {

/**
* \defgroup drivers_DigitalIn DigitalIn class
* \ingroup drivers-public-api-gpio
Expand Down Expand Up @@ -51,7 +53,11 @@ namespace mbed {
* }
* @endcode
*/
class DigitalIn {
class DigitalIn
#ifdef FEATURE_EXPERIMENTAL_API
final : public interface::DigitalIn
#endif
{

public:
/** Create a DigitalIn connected to the specified pin
Expand All @@ -75,6 +81,13 @@ class DigitalIn {
gpio_init_in_ex(&gpio, pin, mode);
}

/** Class destructor, deinitialize the pin
*/
~DigitalIn()
{
gpio_free(&gpio);
}

/** Read the input, represented as 0 or 1 (int)
*
* @returns
Expand All @@ -92,7 +105,6 @@ class DigitalIn {
* @param pull PullUp, PullDown, PullNone, OpenDrain
*/
void mode(PinMode pull);

/** Return the output setting, represented as 0 or 1 (int)
*
* @returns
Expand Down
7 changes: 6 additions & 1 deletion drivers/include/drivers/DigitalInOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "platform/platform.h"

#include "interfaces/InterfaceDigitalInOut.h"
#include "hal/gpio_api.h"

namespace mbed {
Expand All @@ -32,7 +33,11 @@ namespace mbed {
*
* @note Synchronization level: Interrupt safe
*/
class DigitalInOut {
class DigitalInOut
#ifdef FEATURE_EXPERIMENTAL_API
final : public interface::DigitalInOut
#endif
{

public:
/** Create a DigitalInOut connected to the specified pin
Expand Down
8 changes: 7 additions & 1 deletion drivers/include/drivers/DigitalOut.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#define MBED_DIGITALOUT_H

#include "platform/platform.h"

#include "interfaces/InterfaceDigitalOut.h"
#include "hal/gpio_api.h"

namespace mbed {
Expand Down Expand Up @@ -46,7 +48,11 @@ namespace mbed {
* }
* @endcode
*/
class DigitalOut {
class DigitalOut
#ifdef FEATURE_EXPERIMENTAL_API
final : public interface::DigitalOut
#endif
{

public:
/** Create a DigitalOut connected to the specified pin
Expand Down
55 changes: 55 additions & 0 deletions drivers/include/drivers/interfaces/InterfaceDigitalIn.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Mbed-OS Microcontroller Library
* Copyright (c) 2021 Embedded Planet
* Copyright (c) 2021 ARM Limited
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/

#ifndef MBED_INTERFACE_DIGITALIN_H_
#define MBED_INTERFACE_DIGITALIN_H_


namespace mbed {

class DigitalIn;

namespace interface {

#ifdef FEATURE_EXPERIMENTAL_API

// TODO - move method doxygen comments to interface once this polymorphism is mainstream

// Pure interface definition for DigitalIn
struct DigitalIn {
virtual ~DigitalIn() = default;
virtual int read() = 0;
virtual void mode(PinMode pull) = 0;
virtual int is_connected() = 0;

operator int()
{
// Underlying implementation is responsible for thread-safety
return read();
}

};
#else
using DigitalIn = ::mbed::DigitalIn;
#endif /* FEATURE_EXPERIMENTAL_API */

} // namespace interface
} // namespace mbed

#endif /* MBED_INTERFACE_DIGITALIN_H_ */
73 changes: 73 additions & 0 deletions drivers/include/drivers/interfaces/InterfaceDigitalInOut.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
* Mbed-OS Microcontroller Library
* Copyright (c) 2021 Embedded Planet
* Copyright (c) 2021 ARM Limited
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/

#ifndef MBED_INTERFACE_DIGITALINOUT_H_
#define MBED_INTERFACE_DIGITALINOUT_H_

#include "PinNames.h"

namespace mbed {

class DigitalInOut;

namespace interface {

#ifdef FEATURE_EXPERIMENTAL_API

// TODO - move method doxygen comments to interface once this polymorphism is mainstream

// Pure interface definition for DigitalInOut
struct DigitalInOut {
virtual ~DigitalInOut() = default;
virtual void write(int value) = 0;
virtual int read() = 0;
virtual void output() = 0;
virtual void input() = 0;
virtual void mode(PinMode pull) = 0;
virtual int is_connected() = 0;

DigitalInOut &operator= (int value)
{
// Underlying implementation is responsible for thread-safety
write(value);
return *this;
}

DigitalInOut &operator= (DigitalInOut &rhs)
{
// Underlying implementation is responsible for thread-safety
write(rhs.read());
return *this;
}

operator int()
{
// Underlying implementation is responsible for thread-safety
return read();
}

};
#else
using DigitalInOut = ::mbed::DigitalInOut;
#endif /* FEATURE_EXPERIMENTAL_API */

} // namespace interface
} // namespace mbed

#endif /* MBED_INTERFACE_DIGITALINOUT_H_ */
71 changes: 71 additions & 0 deletions drivers/include/drivers/interfaces/InterfaceDigitalOut.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* Mbed-OS Microcontroller Library
* Copyright (c) 2021 Embedded Planet
* Copyright (c) 2021 ARM Limited
* SPDX-License-Identifier: Apache-2.0
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/

#ifndef MBED_INTERFACE_DIGITALOUT_H_
#define MBED_INTERFACE_DIGITALOUT_H_

#include "PinNames.h"

namespace mbed {

class DigitalOut;

namespace interface {

#ifdef FEATURE_EXPERIMENTAL_API

// TODO - move method doxygen comments to interface once this polymorphism is mainstream
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this todo ,as this is almost ready for integration,it will go into the next release . If there is anything outstanding, create an issue about it.


// Pure interface definition for DigitalOut
struct DigitalOut {
virtual ~DigitalOut() = default;
virtual void write(int value) = 0;
virtual int read() = 0;
virtual int is_connected() = 0;

DigitalOut &operator= (int value)
{
// Underlying implementation is responsible for thread-safety
write(value);
return *this;
}

DigitalOut &operator= (DigitalOut &rhs)
{
// Underlying implementation is responsible for thread-safety
write(rhs.read());
return *this;
}

operator int()
{
// Underlying implementation is responsible for thread-safety
return read();
}

};
#else
using DigitalOut = ::mbed::DigitalOut;
#endif /* FEATURE_EXPERIMENTAL_API */

} // namespace interface
} // namespace mbed


#endif /* MBED_INTERFACE_DIGITALOUT_H_ */