Skip to content

Commit 0b52369

Browse files
Merge pull request #440 from fpistm/STM32_Update
STM32 update
2 parents 4650504 + 5d37416 commit 0b52369

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

Boards.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,18 +854,28 @@ writePort(port, value, bitmask): Write an 8 bit port.
854854
#define TOTAL_ANALOG_PINS NUM_ANALOG_INPUTS
855855
#define TOTAL_PINS NUM_DIGITAL_PINS
856856
#define TOTAL_PORTS MAX_NB_PORT
857+
#ifdef LED_BUILTIN
857858
#define VERSION_BLINK_PIN LED_BUILTIN
859+
#endif
858860
// PIN_SERIALY_RX/TX defined in the variant.h
859861
#define IS_PIN_DIGITAL(p) (digitalPinIsValid(p) && !pinIsSerial(p))
862+
#if !defined(STM32_CORE_VERSION) || (STM32_CORE_VERSION <= 0x01080000)
860863
#define IS_PIN_ANALOG(p) ((p >= A0) && (p < (A0 + TOTAL_ANALOG_PINS)) && !pinIsSerial(p))
864+
#else
865+
#define IS_PIN_ANALOG(p) (pinIsAnalogInput(p) && !pinIsSerial(p))
866+
#endif
861867
#define IS_PIN_PWM(p) (IS_PIN_DIGITAL(p) && digitalPinHasPWM(p))
862-
#define IS_PIN_SERVO(p) IS_PIN_DIGITAL(p)
868+
#define IS_PIN_SERVO(p) (IS_PIN_DIGITAL(p))
863869
#define IS_PIN_I2C(p) (IS_PIN_DIGITAL(p) && digitalPinHasI2C(p))
864870
#define IS_PIN_SPI(p) (IS_PIN_DIGITAL(p) && digitalPinHasSPI(p))
865871
#define IS_PIN_INTERRUPT(p) (IS_PIN_DIGITAL(p) && (digitalPinToInterrupt(p) > NOT_AN_INTERRUPT)))
866872
#define IS_PIN_SERIAL(p) (digitalPinHasSerial(p) && !pinIsSerial(p))
867873
#define PIN_TO_DIGITAL(p) (p)
874+
#if !defined(STM32_CORE_VERSION) || (STM32_CORE_VERSION <= 0x01080000)
868875
#define PIN_TO_ANALOG(p) (p-A0)
876+
#else
877+
#define PIN_TO_ANALOG(p) (digitalPinToAnalogInput(p))
878+
#endif
869879
#define PIN_TO_PWM(p) (p)
870880
#define PIN_TO_SERVO(p) (p)
871881
#define DEFAULT_PWM_RESOLUTION PWM_RESOLUTION

0 commit comments

Comments
 (0)