Skip to content

Commit 3d26385

Browse files
committed
Remove unuseful and duplicated define.
MAX_ANALOG_IOS and MAX_DIGITAL_IOS removed. Signed-off-by: Frederic.Pillon <[email protected]>
1 parent b24477f commit 3d26385

File tree

10 files changed

+11
-27
lines changed

10 files changed

+11
-27
lines changed

Diff for: libraries/CapacitiveSensor-0.5.1/CapacitiveSensor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CapacitiveSensor::CapacitiveSensor(uint8_t sendPin, uint8_t receivePin)
2727
CS_AutocaL_Millis = 20000;
2828

2929
// 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)) {
3131
error = -1;
3232
return;
3333
}

Diff for: libraries/Firmata/Boards.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,8 @@ writePort(port, value, bitmask): Write an 8 bit port.
667667

668668
// Nucleo STM32F429
669669
#elif defined(STM32)
670-
#define TOTAL_ANALOG_PINS MAX_ANALOG_IOS //7
671-
#define TOTAL_PINS MAX_DIGITAL_IOS //22 : All pins can be digital
670+
#define TOTAL_ANALOG_PINS NUM_ANALOG_INPUTS //7
671+
#define TOTAL_PINS NUM_DIGITAL_PINS //22 : All pins can be digital
672672
#define TOTAL_PORTS 3
673673
#define VERSION_BLINK_PIN LED_BUILTIN
674674
#define PIN_SERIAL_RX 9

Diff for: variants/DISCO_F407VG/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ enum {
7272
AEND
7373
};
7474

75-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS DEND
77-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_DIGITAL_PINS DEND
7876
#define NUM_ANALOG_INPUTS (AEND - A0)
7977

8078
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/DISCO_F746NG/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ enum {
6666
AEND
6767
};
6868

69-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
70-
#define MAX_DIGITAL_IOS DEND
71-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
69+
#define NUM_DIGITAL_PINS DEND
7270
#define NUM_ANALOG_INPUTS (AEND - A0)
7371

7472
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_F030R8/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ enum {
6969
AEND
7070
};
7171

72-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73-
#define MAX_DIGITAL_IOS DEND
74-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
72+
#define NUM_DIGITAL_PINS DEND
7573
#define NUM_ANALOG_INPUTS (AEND - A0)
7674

7775
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_F091RC/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ enum {
6969
AEND
7070
};
7171

72-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73-
#define MAX_DIGITAL_IOS DEND
74-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
72+
#define NUM_DIGITAL_PINS DEND
7573
#define NUM_ANALOG_INPUTS (AEND - A0)
7674

7775
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_F303RE/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ enum {
6969
AEND
7070
};
7171

72-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73-
#define MAX_DIGITAL_IOS DEND
74-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
72+
#define NUM_DIGITAL_PINS DEND
7573
#define NUM_ANALOG_INPUTS (AEND - A0)
7674

7775
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_F429ZI/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ enum {
7272
AEND
7373
};
7474

75-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
76-
#define MAX_DIGITAL_IOS DEND
77-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
75+
#define NUM_DIGITAL_PINS DEND
7876
#define NUM_ANALOG_INPUTS (AEND - A0)
7977

8078
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_L053R8/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ enum {
6969
AEND
7070
};
7171

72-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73-
#define MAX_DIGITAL_IOS DEND
74-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
72+
#define NUM_DIGITAL_PINS DEND
7573
#define NUM_ANALOG_INPUTS (AEND - A0)
7674

7775
// Convert a digital pin number Dxx to a PinName Pxy

Diff for: variants/NUCLEO_L476RG/variant.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ enum {
6969
AEND
7070
};
7171

72-
#define MAX_ANALOG_IOS (sizeof(PinMap_ADC)/sizeof(PinMap))
73-
#define MAX_DIGITAL_IOS DEND
74-
#define NUM_DIGITAL_PINS MAX_DIGITAL_IOS
72+
#define NUM_DIGITAL_PINS DEND
7573
#define NUM_ANALOG_INPUTS (AEND - A0)
7674

7775
// Convert a digital pin number Dxx to a PinName Pxy

0 commit comments

Comments
 (0)