Arduino Nano R2040 Connect Nina pins access with WiFiNINA lib (#404)

Author: JAndrassy

boards.txt

@@ -3808,7 +3808,7 @@ arduino_nano_connect.vid.0=0x2341
 arduino_nano_connect.pid.0=0x0058
 arduino_nano_connect.build.usbpid=-DSERIALUSB_PID=0x0058
 arduino_nano_connect.build.usbpwr=-DUSBD_MAX_POWER_MA=250
-arduino_nano_connect.build.board=ARDUINO_NANO_RP2040_CONNECT
+arduino_nano_connect.build.board=NANO_RP2040_CONNECT
 arduino_nano_connect.build.mcu=cortex-m0plus
 arduino_nano_connect.build.variant=arduino_nano_connect
 arduino_nano_connect.upload.tool=uf2conv
@@ -4019,7 +4019,7 @@ arduino_nano_connectpicoprobe.vid.0=0x2341
 arduino_nano_connectpicoprobe.pid.0=0x0004
 arduino_nano_connectpicoprobe.build.usbpid=-DSERIALUSB_PID=0x0058
 arduino_nano_connectpicoprobe.build.usbpwr=-DUSBD_MAX_POWER_MA=250
-arduino_nano_connectpicoprobe.build.board=ARDUINO_NANO_RP2040_CONNECT
+arduino_nano_connectpicoprobe.build.board=NANO_RP2040_CONNECT
 arduino_nano_connectpicoprobe.build.mcu=cortex-m0plus
 arduino_nano_connectpicoprobe.build.variant=arduino_nano_connect
 arduino_nano_connectpicoprobe.upload.tool=picoprobe
@@ -4230,7 +4230,7 @@ arduino_nano_connectpicodebug.vid.0=0x1209
 arduino_nano_connectpicodebug.pid.0=0x2488
 arduino_nano_connectpicodebug.build.usbpid=-DSERIALUSB_PID=0x0058
 arduino_nano_connectpicodebug.build.usbpwr=-DUSBD_MAX_POWER_MA=250
-arduino_nano_connectpicodebug.build.board=ARDUINO_NANO_RP2040_CONNECT
+arduino_nano_connectpicodebug.build.board=NANO_RP2040_CONNECT
 arduino_nano_connectpicodebug.build.mcu=cortex-m0plus
 arduino_nano_connectpicodebug.build.variant=arduino_nano_connect
 arduino_nano_connectpicodebug.upload.tool=picodebug

tools/makeboards.py

@@ -163,7 +163,7 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
 MakeBoard("adafruit_trinkeyrp2040qt", "Adafruit", "Trinkey RP2040 QT", "0x239a", "0x8109", 250, "ADAFRUIT_TRINKEYQT_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_macropad2040", "Adafruit", "MacroPad RP2040", "0x239a", "0x8107", 250, "ADAFRUIT_MACROPAD_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_kb2040", "Adafruit", "KB2040", "0x239a", "0x8105", 250, "ADAFRUIT_KB2040_RP2040", 8, "boot2_w25q080_2_padded_checksum")
-MakeBoard("arduino_nano_connect", "Arduino", "Nano RP2040 Connect", "0x2341", "0x0058", 250, "ARDUINO_NANO_RP2040_CONNECT", 16, "boot2_w25q080_2_padded_checksum")
+MakeBoard("arduino_nano_connect", "Arduino", "Nano RP2040 Connect", "0x2341", "0x0058", 250, "NANO_RP2040_CONNECT", 16, "boot2_w25q080_2_padded_checksum")
 MakeBoard("cytron_maker_nano_rp2040", "Cytron", "Maker Nano RP2040", "0x2e8a", "0x100f", 250, "CYTRON_MAKER_NANO_RP2040", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("cytron_maker_pi_rp2040", "Cytron", "Maker Pi RP2040", "0x2e8a", "0x1000", 250, "CYTRON_MAKER_PI_RP2040", 2, "boot2_w25q080_2_padded_checksum")
 MakeBoard("sparkfun_promicrorp2040", "SparkFun", "ProMicro RP2040", "0x1b4f", "0x0026", 250, "SPARKFUN_PROMICRO_RP2040", 16, "boot2_generic_03h_4_padded_checksum")

variants/arduino_nano_connect/nina_pins.cpp

@@ -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);

variants/arduino_nano_connect/nina_pins.h

@@ -13,16 +13,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
  ******************************************************************************/

variants/arduino_nano_connect/pins_arduino.h

@@ -39,8 +39,6 @@ static const uint8_t A0 = (26u);
 static const uint8_t A1 = (27u);
 static const uint8_t A2 = (28u);
 static const uint8_t A3 = (29u);
-static const uint8_t A4 = (12u);
-static const uint8_t A5 = (13u);
 
 // LEDs
 #define PIN_LED        (D13)