Fix: There's a need to convert from a GPIO number to ADC channel number.

Author: aentinger

src/utility/nano_rp2040_support.cpp

@@ -30,43 +30,42 @@
  * FUNCTION DEFINITION
  ******************************************************************************/
 
+uint8_t toAnalogPin(NinaPin pin)
+{
+  if      (pin == A4) return 6; /* ADC1 - CH6 */
+  else if (pin == A5) return 3; /* ADC1 - CH3 */
+  else if (pin == A6) return 0; /* ADC1 - CH0 */
+  else if (pin == A7) return 7; /* ADC1 - CH7 */
+  else                return 0xFF;
+}
+
 void pinMode(NinaPin pin, PinMode mode)
 {
-  WiFiDrv::wifiDriverInit();
-  Serial.print(__FUNCTION__);
-  Serial.print(": pin = ");
-  Serial.print(pin);
-  Serial.print(", mode = ");
-  Serial.println(mode);
   WiFiDrv::pinMode(static_cast<uint8_t>(pin), static_cast<uint8_t>(mode));
 }
 
 PinStatus digitalRead(NinaPin pin)
 {
-  WiFiDrv::wifiDriverInit();
   return WiFiDrv::digitalRead(static_cast<uint8_t>(pin));
 }
 
 void digitalWrite(NinaPin pin, PinStatus value)
 {
-  WiFiDrv::wifiDriverInit();
-  Serial.print(__FUNCTION__);
-  Serial.print(": pin = ");
-  Serial.print(pin);
-  Serial.print(", value = ");
-  Serial.println(value);
   WiFiDrv::digitalWrite(static_cast<uint8_t>(pin), static_cast<uint8_t>(value));
 }
 
 int analogRead(NinaPin pin)
 {
-  WiFiDrv::wifiDriverInit();
-  return WiFiDrv::analogRead(static_cast<uint8_t>(pin));
+  uint8_t const adc_channel = toAnalogPin(pin);
+
+  if (adc_channel == 0xFF)
+    return 0;
+  else
+    return WiFiDrv::analogRead(adc_channel);
 }
 
 void analogWrite(NinaPin pin, int value)
 {
-  WiFiDrv::wifiDriverInit();
   WiFiDrv::analogWrite(static_cast<uint8_t>(pin), static_cast<uint8_t>(value));
 }
 

src/utility/wifi_drv.cpp

@@ -1119,12 +1119,12 @@ void WiFiDrv::digitalWrite(uint8_t pin, uint8_t value)
     SpiDrv::spiSlaveDeselect();
 }
 
-uint16_t WiFiDrv::analogRead(uint8_t pin)
+uint16_t WiFiDrv::analogRead(uint8_t adc_channel)
 {
     WAIT_FOR_SLAVE_SELECT();
     // Send Command
     SpiDrv::sendCmd(GET_ANALOG_READ, PARAM_NUMS_1);
-    SpiDrv::sendParam((uint8_t*)&pin, 1, LAST_PARAM);
+    SpiDrv::sendParam((uint8_t*)&adc_channel, 1, LAST_PARAM);
 
     // pad to multiple of 4
     SpiDrv::readChar();

src/utility/wifi_drv.h

@@ -292,7 +292,7 @@ class WiFiDrv
     static void pinMode(uint8_t pin, uint8_t mode);
     static PinStatus digitalRead(uint8_t pin);
     static void digitalWrite(uint8_t pin, uint8_t value);
-    static uint16_t analogRead(uint8_t pin);
+    static uint16_t analogRead(uint8_t adc_channel);
     static void analogWrite(uint8_t pin, uint8_t value);
 
     static int8_t downloadFile(const char* url, uint8_t url_len, const char *filename, uint8_t filename_len);