dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 08:36:14 +01:00
Code Releases Activity

up to date - just one error now

Browse Source
This commit is contained in:
travis-farmer 2023-10-20 14:17:12 -04:00
parent 1d6b7d4c63
commit 881c490ae0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MotorDriver.cpp
View File

@ -39,9 +39,7 @@ volatile portreg_t shadowPORTD;
volatile portreg_t shadowPORTE; volatile portreg_t shadowPORTE;
volatile portreg_t shadowPORTF; volatile portreg_t shadowPORTF;
#endif #endif
#ifdef ARDUINO_GIGA
extern gpio_t digitalPinToGpio(int P);
#endif
MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int16_t brake_pin, MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, int16_t brake_pin,
byte current_pin, float sense_factor, unsigned int trip_milliamps, int16_t fault_pin) { byte current_pin, float sense_factor, unsigned int trip_milliamps, int16_t fault_pin) {
const FSH * warnString = F("** WARNING **"); const FSH * warnString = F("** WARNING **");
@ -512,7 +510,7 @@ void MotorDriver::getFastPin(const FSH* type,int pin, bool input, FASTPIN & res
#if defined(ARDUINO_GIGA) #if defined(ARDUINO_GIGA)
(void)type; (void)type;
(void)input; // no warnings please (void)input; // no warnings please
result = digitalPinToGpio(pin); *result = digitalPinToGpio(pin);
#else #else
(void) type; // avoid compiler warning if diag not used above. (void) type; // avoid compiler warning if diag not used above.
#if defined(ARDUINO_ARCH_SAMD) #if defined(ARDUINO_ARCH_SAMD)

2
MotorDriver.h
View File

@ -127,6 +127,8 @@ typedef uint8_t portreg_t;
#if defined(ARDUINO_GIGA) #if defined(ARDUINO_GIGA)
typedef gpio_t FASTPIN; typedef gpio_t FASTPIN;
#include <pinDefinitions.h>
//extern gpio_t digitalPinToGpio(uint8_t P);
#else #else
struct FASTPIN { struct FASTPIN {
volatile portreg_t *inout; volatile portreg_t *inout;