Merge c458e98cd3 into d46a6f092a

digitalPinToPort back from arduino core
added note about SystemCoreClock
2024-11-24 08:36:14 +01:00 · 2023-11-08 18:41:14 +00:00 · 2023-11-08 13:40:39 -05:00 · 2023-11-07 16:37:38 -05:00
2 changed files with 3 additions and 1 deletions
--- a/DCCTimer.h
+++ b/DCCTimer.h
@ -92,6 +92,7 @@ private:
 #if defined(ARDUINO_ARCH_STM32)  // TODO: PMA temporary hack - assumes 100Mhz F_CPU as STM32 can change frequency
  static const long CLOCK_CYCLES=(100000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
 #elif defined(ARDUINO_GIGA)
+  ///TJF: we could get F_CPU from SystemCoreClock, but it will not allow as it is a non-constant value
  static const long CLOCK_CYCLES=(480000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
 #else
  static const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1;
--- a/MotorDriver.cpp
+++ b/MotorDriver.cpp
@ -530,7 +530,8 @@ void  MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
 #elif defined(ARDUINO_ARCH_STM32)
    GPIO_TypeDef *port = digitalPinToPort(pin);
 #elif defined(ARDUINO_GIGA)
-    auto * port = ((GPIO_TypeDef *)(GPIOA_BASE + (GPIOB_BASE - GPIOA_BASE) * (digitalPinToPinName(pin) >> 4)));
+    //auto * port = ((GPIO_TypeDef *)(GPIOA_BASE + (GPIOB_BASE - GPIOA_BASE) * (digitalPinToPinName(pin) >> 4)));
+    GPIO_TypeDef *port = (GPIO_TypeDef *)digitalPinToPort(pin);
 #else
    uint8_t port = digitalPinToPort(pin);
 #endif
Author	SHA1	Message	Date
Travis Farmer	c0dcff7c81	Merge `c458e98cd3` into `d46a6f092a`	2023-11-08 18:41:14 +00:00
travis-farmer	c458e98cd3	digitalPinToPort back from arduino core	2023-11-08 13:40:39 -05:00
travis-farmer	f254643a1d	added note about SystemCoreClock	2023-11-07 16:37:38 -05:00