Skip to content

RP2040: avoid implicit conversion from NinaPin to int #227

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 1 commit into from
Jun 14, 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
5 changes: 5 additions & 0 deletions cores/arduino/wiring_analog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,9 @@ void analogUpdate()
void analogReadResolution(int bits)
{
read_resolution = bits;
}

int getAnalogReadResolution()
{
return read_resolution;
}
9 changes: 9 additions & 0 deletions variants/NANO_RP2040_CONNECT/nina_pins.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include "nina_pins.h"

NinaPin LEDR(27);
NinaPin LEDG(25);
NinaPin LEDB(26);
NinaPin A4(34);
NinaPin A5(39);
NinaPin A6(36);
NinaPin A7(35);
36 changes: 28 additions & 8 deletions variants/NANO_RP2040_CONNECT/nina_pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,36 @@
* TYPEDEF
******************************************************************************/

enum NinaPin {
LEDR = 27,
LEDG = 25,
LEDB = 26,
A4 = 34,
A5 = 39,
A6 = 36,
A7 = 35
int getAnalogReadResolution();

class NinaPin {
public:
NinaPin(int _pin) : pin(_pin) {};
int get() {
return pin;
};
int analogReadResolution() {
return getAnalogReadResolution();
};
bool operator== (NinaPin const & other) const {
return pin == other.pin;
}
//operator int() = delete;
__attribute__ ((error("Change me to a #define"))) operator int();
private:
int pin;
};

extern NinaPin LEDR;
extern NinaPin LEDG;
extern NinaPin LEDB;
extern NinaPin A4;
extern NinaPin A5;
extern NinaPin A6;
extern NinaPin A7;

#define NINA_PINS_AS_CLASS

/******************************************************************************
* FUNCTION DECLARATION
******************************************************************************/
Expand Down