Remove unuseful and duplicated define.

fpistm · fpistm · commit 3d2638593dc9 · 2017-06-23T14:46:51.000+02:00
MAX_ANALOG_IOS and MAX_DIGITAL_IOS removed.

Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/libraries/CapacitiveSensor-0.5.1/CapacitiveSensor.cpp b/libraries/CapacitiveSensor-0.5.1/CapacitiveSensor.cpp
@@ -27,7 +27,7 @@ CapacitiveSensor::CapacitiveSensor(uint8_t sendPin, uint8_t receivePin)
 	CS_AutocaL_Millis = 20000;
 
 	// get pin mapping and port for send Pin - from PinMode function in core
-	if ((sendPin >= MAX_DIGITAL_IOS) || (receivePin >= MAX_DIGITAL_IOS)) {
+	if ((sendPin >= NUM_DIGITAL_PINS) || (receivePin >= NUM_DIGITAL_PINS)) {
 	  error = -1;
 	  return;
 	}
diff --git a/libraries/Firmata/Boards.h b/libraries/Firmata/Boards.h
@@ -667,8 +667,8 @@ writePort(port, value, bitmask):  Write an 8 bit port.
 
 // Nucleo STM32F429
 #elif defined(STM32)
-#define TOTAL_ANALOG_PINS       MAX_ANALOG_IOS  //7
-#define TOTAL_PINS              MAX_DIGITAL_IOS //22 : All pins can be digital
+#define TOTAL_ANALOG_PINS       NUM_ANALOG_INPUTS  //7
+#define TOTAL_PINS              NUM_DIGITAL_PINS //22 : All pins can be digital
 #define TOTAL_PORTS             3
 #define VERSION_BLINK_PIN       LED_BUILTIN
 #define PIN_SERIAL_RX           9
diff --git a/variants/DISCO_F407VG/variant.h b/variants/DISCO_F407VG/variant.h
@@ -72,9 +72,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/DISCO_F746NG/variant.h b/variants/DISCO_F746NG/variant.h
@@ -66,9 +66,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_F030R8/variant.h b/variants/NUCLEO_F030R8/variant.h
@@ -69,9 +69,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_F091RC/variant.h b/variants/NUCLEO_F091RC/variant.h
@@ -69,9 +69,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_F303RE/variant.h b/variants/NUCLEO_F303RE/variant.h
@@ -69,9 +69,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_F429ZI/variant.h b/variants/NUCLEO_F429ZI/variant.h
@@ -72,9 +72,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_L053R8/variant.h b/variants/NUCLEO_L053R8/variant.h
@@ -69,9 +69,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy
diff --git a/variants/NUCLEO_L476RG/variant.h b/variants/NUCLEO_L476RG/variant.h
@@ -69,9 +69,7 @@ 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_DIGITAL_PINS        DEND
 #define NUM_ANALOG_INPUTS       (AEND - A0)
 
 // Convert a digital pin number Dxx to a PinName Pxy

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ CapacitiveSensor::CapacitiveSensor(uint8_t sendPin, uint8_t receivePin)`
`27`	`27`	`CS_AutocaL_Millis = 20000;`
`28`	`28`
`29`	`29`	`// get pin mapping and port for send Pin - from PinMode function in core`
`30`		`- if ((sendPin >= MAX_DIGITAL_IOS) \|\| (receivePin >= MAX_DIGITAL_IOS)) {`
	`30`	`+ if ((sendPin >= NUM_DIGITAL_PINS) \|\| (receivePin >= NUM_DIGITAL_PINS)) {`
`31`	`31`	`error = -1;`
`32`	`32`	`return;`
`33`	`33`	`}`