Review analog pins numbering and pin functions

analogRead(A0) == analogRead(0)
analogWrite(A0) != analogWrite(0) == analogWrite(D0)
All pins available in PinMap_ADC are available with Ax alias

Move pin functions to pins_arduino.c to avoid duplicated code.
Pin functions naming alignement.

Move init() function to pins_arduino.c to avoid duplicated code
and define it as weak.

Minor clean of unused code.
Remove usb flags for variants w/o usb.
Serialx under switch.Disable by default

Now, variant files only contain source which differ for each variants.

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

Diff for: cores/arduino/Arduino.h

@@ -73,7 +73,7 @@ extern void loop( void ) ;
 
 
 // Include board variant
-#include "variant.h"
+#include "pins_arduino.h"
 
 #include "wiring.h"
 #include "wiring_digital.h"

Diff for: cores/arduino/Tone.cpp

@@ -28,7 +28,7 @@ static stimer_t _timer;
 
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
 {
-  PinName p = digitalToPinName(_pin);
+  PinName p = digitalPinToPinName(_pin);
   if(p != NC) {
     if((g_lastPin == NC) || (g_lastPin == p)) {
       _timer.pin = p;
@@ -41,7 +41,7 @@ void tone(uint8_t _pin, unsigned int frequency, unsigned long duration)
 
 void noTone(uint8_t _pin)
 {
-  PinName p = digitalToPinName(_pin);
+  PinName p = digitalPinToPinName(_pin);
   if(p != NC) {
     TimerPinDeinit(&_timer);
     digitalWrite(_pin, 0);

Diff for: cores/arduino/WInterrupts.c

@@ -25,7 +25,7 @@
 void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode)
 {
   uint32_t it_mode;
-  PinName p = digitalToPinName(pin);
+  PinName p = digitalPinToPinName(pin);
   GPIO_TypeDef* port = set_GPIO_Port_Clock(STM_PORT(p));
   if (port == NC)
 	  return;
@@ -51,7 +51,7 @@ void attachInterrupt(uint32_t pin, void (*callback)(void), uint32_t mode)
 
 void detachInterrupt(uint32_t pin)
 {
-  PinName p = digitalToPinName(pin);
+  PinName p = digitalPinToPinName(pin);
   GPIO_TypeDef* port = get_GPIO_Port(STM_PORT(p));
   if (port == NC)
 	  return;

Diff for: cores/arduino/pins_arduino.c

@@ -0,0 +1,36 @@
+/*
+  Copyright (c) 2011 Arduino.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "pins_arduino.h"
+
+void __libc_init_array(void);
+
+WEAK uint32_t pinNametoDigitalPin(PinName p)
+{
+  uint32_t i = 0;
+  for(i = 0; i < NUM_DIGITAL_PINS; i++) {
+	  if (digitalPin[i] == p)
+		  break;
+  }
+  return i;
+}
+
+WEAK void init( void )
+{
+  hw_config_init();
+}

Diff for: cores/arduino/pins_arduino.h

@@ -15,7 +15,37 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifndef _PINS_ARDUINO_H_
+#define _PINS_ARDUINO_H_
+
+/**
+ * Libc porting layers
+ */
+#if defined (  __GNUC__  ) /* GCC CS3 */
+#    include <syscalls.h> /** RedHat Newlib minimal stub */
+#endif
 
 // API compatibility
 #include "variant.h"
 
+#define NUM_DIGITAL_PINS        DEND
+#define NUM_ANALOG_INPUTS       (AEND-A0)
+
+// Convert a digital pin number Dxx to a PinName Pxy
+// Note: Analog pin is also a digital pin.
+#define digitalPinToPinName(p)   ((p < NUM_DIGITAL_PINS) ? digitalPin[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
+// Convert a PinName Pxy to a digital pin number
+uint32_t pinNametoDigitalPin(PinName p);
+
+// Convert an analog pin number to a digital pin number
+// Used by analogRead api to have A0 == 0
+#define analogInputToDigitalPin(p) ((p < NUM_ANALOG_INPUTS) ? (p+A0) : p)
+// Convert an analog pin number Axx to a PinName Pxy
+#define analogInputToPinName(p) (digitalPinToPinName(analogInputToDigitalPin(p)))
+// All pins could manage EXTI
+#define digitalPinToInterrupt(p) (p)
+
+#define digitalPinToPort(p)     ( get_GPIO_Port(digitalPinToPinName(p)) )
+#define digitalPinToBitMask(p)  ( STM_GPIO_PIN(digitalPinToPinName(p)) )
+
+#endif /*_PINS_ARDUINO_H_*/

Diff for: cores/arduino/wiring_analog.c

@@ -52,7 +52,7 @@ static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)
 uint32_t analogRead(uint32_t ulPin)
 {
   uint32_t value = 0;
-  PinName p = analogToPinName(ulPin);
+  PinName p = analogInputToPinName(ulPin);
   if(p != NC) {
     value = adc_read_value(p);
     value = mapResolution(value, ADC_RESOLUTION, _readResolution);
@@ -71,7 +71,7 @@ void analogOutputInit(void) {
 void analogWrite(uint32_t ulPin, uint32_t ulValue) {
 
   uint8_t do_init = 0;
-  PinName p = analogToPinName(ulPin);
+  PinName p = digitalPinToPinName(ulPin);
   if(p != NC) {
     if(pin_in_pinmap(p, PinMap_DAC)) {
       if(is_pin_configured(p, g_anOutputPinConfigured) == false) {

Diff for: cores/arduino/wiring_digital.c

@@ -30,7 +30,7 @@ extern uint32_t g_anOutputPinConfigured[MAX_NB_PORT];
 
 void pinMode( uint32_t ulPin, uint32_t ulMode )
 {
-  PinName p = digitalToPinName(ulPin);
+  PinName p = digitalPinToPinName(ulPin);
 
   if(p != NC) {
     // If the pin that support PWM or DAC output, we need to turn it off
@@ -66,7 +66,7 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
 
 void digitalWrite( uint32_t ulPin, uint32_t ulVal )
 {
-  PinName p = digitalToPinName(ulPin);
+  PinName p = digitalPinToPinName(ulPin);
   if(p != NC) {
     if(is_pin_configured(p, g_digPinConfigured)) {
       digital_io_write(get_GPIO_Port(STM_PORT(p)), STM_GPIO_PIN(p), ulVal);
@@ -77,7 +77,7 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
 int digitalRead( uint32_t ulPin )
 {
   uint8_t level = 0;
-  PinName p = digitalToPinName(ulPin);
+  PinName p = digitalPinToPinName(ulPin);
   if(p != NC) {
     if(is_pin_configured(p, g_digPinConfigured)) {
       level = digital_io_read(get_GPIO_Port(STM_PORT(p)), STM_GPIO_PIN(p));

Diff for: libraries/SPI/SPI.cpp

@@ -19,9 +19,9 @@
 
 SPIClass::SPIClass() : g_active_id(-1)
 {
-  _spi.pin_miso = digitalToPinName(MISO);
-  _spi.pin_mosi = digitalToPinName(MOSI);
-  _spi.pin_sclk = digitalToPinName(SCLK);
+  _spi.pin_miso = digitalPinToPinName(MISO);
+  _spi.pin_mosi = digitalPinToPinName(MOSI);
+  _spi.pin_sclk = digitalPinToPinName(SCLK);
   _spi.pin_ssel = NC;
 }
 
@@ -30,12 +30,12 @@ ssel pin. Enable this pin disable software CS. See microcontroller documentation
 for the list of available SS pins. */
 SPIClass::SPIClass(uint8_t mosi, uint8_t miso, uint8_t sclk, uint8_t ssel) : g_active_id(-1)
 {
-  _spi.pin_miso = digitalToPinName(miso);
-  _spi.pin_mosi = digitalToPinName(mosi);
-  _spi.pin_sclk = digitalToPinName(sclk);
+  _spi.pin_miso = digitalPinToPinName(miso);
+  _spi.pin_mosi = digitalPinToPinName(mosi);
+  _spi.pin_sclk = digitalPinToPinName(sclk);
 
   if(ssel != 0xFF) {
-    _spi.pin_ssel = digitalToPinName(ssel);
+    _spi.pin_ssel = digitalPinToPinName(ssel);
   } else {
     _spi.pin_ssel = NC;
   }

Diff for: libraries/Wire/Wire.cpp

@@ -45,14 +45,14 @@ void (*TwoWire::user_onReceive)(int);
 
 TwoWire::TwoWire()
 {
-  _i2c.sda = digitalToPinName(SDA);
-  _i2c.scl = digitalToPinName(SCL);
+  _i2c.sda = digitalPinToPinName(SDA);
+  _i2c.scl = digitalPinToPinName(SCL);
 }
 
 TwoWire::TwoWire(uint8_t sda, uint8_t scl)
 {
-  _i2c.sda = digitalToPinName(sda);
-  _i2c.scl = digitalToPinName(scl);
+  _i2c.sda = digitalPinToPinName(sda);
+  _i2c.scl = digitalPinToPinName(scl);
 }
 
 // Public Methods //////////////////////////////////////////////////////////////

Diff for: variants/otto/variant.cpp

@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 // Pin number
-const PinName digital_arduino[] = {
+const PinName digitalPin[] = {
   PA1,  //D0
   PA0,  //D1
   PH6,  //D2
@@ -145,23 +145,6 @@ void serialEventRun(void)
 extern "C" {
 #endif
 
-void __libc_init_array(void);
-
-uint32_t pinNametoPinNumber(PinName p)
-{
-  uint32_t i = 0;
-  for(i = 0; i < NUM_DIGITAL_PINS; i++) {
-	  if (digital_arduino[i] == p)
-		  break;
-  }
-  return i;
-}
-
-void init( void )
-{
-  hw_config_init();
-}
-
 /**
   * @brief  System Clock Configuration
   * @param  None

Diff for: variants/otto/variant.h

@@ -19,10 +19,6 @@
 #ifndef _VARIANT_ARDUINO_STM32_
 #define _VARIANT_ARDUINO_STM32_
 
-/*----------------------------------------------------------------------------
- *        Definitions
- *----------------------------------------------------------------------------*/
-
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
@@ -33,19 +29,12 @@
 extern "C"{
 #endif // __cplusplus
 
-/**
- * Libc porting layers
- */
-#if defined (  __GNUC__  ) /* GCC CS3 */
-#    include <syscalls.h> /** RedHat Newlib minimal stub */
-#endif
-
 /*----------------------------------------------------------------------------
  *        Pins
  *----------------------------------------------------------------------------*/
 #include "PeripheralPins.h"
 
-extern const PinName digital_arduino[];
+extern const PinName digitalPin[];
 
 enum {
   D0,  D1,  D2,  D3,  D4,  D5,  D6,  D7,  D8,  D9,
@@ -67,23 +56,6 @@ enum {
   AEND
 };
 
-#define MAX_ANALOG_IOS          (sizeof(PinMap_ADC)/sizeof(PinMap))
-#define MAX_DIGITAL_IOS         DEND
-#define NUM_DIGITAL_PINS        MAX_DIGITAL_IOS
-#define NUM_ANALOG_INPUTS       (AEND - A0)
-
-// Convert a digital pin number Dxx to a PinName Pxy
-#define digitalToPinName(p)     ((p < NUM_DIGITAL_PINS) ? digital_arduino[p] : (STM_VALID_PINNAME(p))? (PinName)p : NC)
-// Convert an analog pin number Axx to a PinName Pxy
-#define analogToPinName(p)      (digitalToPinName(p))
-// Convert an analog pin number to a digital pin number
-#define analogToDigital(p)      (p)
-// Convert a PinName Pxy to a pin number
-uint32_t pinNametoPinNumber(PinName p);
-
-#define digitalPinToPort(p)     ( get_GPIO_Port(digitalToPinName(p)) )
-#define digitalPinToBitMask(p)  ( STM_GPIO_PIN(digitalToPinName(p)) )
-
 //ADC resolution is 12bits
 #define ADC_RESOLUTION          12
 #define DACC_RESOLUTION         12
@@ -170,8 +142,6 @@ uint32_t pinNametoPinNumber(PinName p);
 #define CODEC                   0
 #define MCU                     1
 
-//Enable Firmata
-#define STM32 1
 
 #ifdef __cplusplus
 } // extern "C"