Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Duet3D/RepRapFirmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Coenen <manuel@duet3d.com>2021-01-20 12:41:54 +0300
committerManuel Coenen <manuel@duet3d.com>2021-01-20 12:41:54 +0300
commit31d547166717da3bb5e70bf985469f9ea0c36102 (patch)
treecdc68a5504af5a170f15171906e8311f9141882f /src/Hardware
parentf415976c32b69480c5dac4279247e37875176491 (diff)
Clean-up remaining #if SAME5x instances
Diffstat (limited to 'src/Hardware')
-rw-r--r--src/Hardware/IoPorts.cpp2
-rw-r--r--src/Hardware/IoPorts.h10
2 files changed, 3 insertions, 9 deletions
diff --git a/src/Hardware/IoPorts.cpp b/src/Hardware/IoPorts.cpp
index c3a28f7b..efd09484 100644
--- a/src/Hardware/IoPorts.cpp
+++ b/src/Hardware/IoPorts.cpp
@@ -626,7 +626,7 @@ uint16_t IoPort::ReadAnalog() const noexcept
}
else
{
- AnalogOut(pin, pwm, freq);
+ AnalogOut::Write(pin, pwm, freq);
}
#else
AnalogOut(pin, pwm, freq);
diff --git a/src/Hardware/IoPorts.h b/src/Hardware/IoPorts.h
index 90a832eb..5866ae3a 100644
--- a/src/Hardware/IoPorts.h
+++ b/src/Hardware/IoPorts.h
@@ -10,10 +10,8 @@
#include <RepRapFirmware.h>
-#if SAME5x || SAME70
-# include <Interrupts.h>
-# include <AnalogIn.h>
-#endif
+#include <Interrupts.h>
+#include <AnalogIn.h>
// Class to represent a port
class IoPort
@@ -79,12 +77,8 @@ protected:
// Get the physical pin without checking the validity of the logical pin
Pin GetPinNoCheck() const noexcept
{
-#if SAME5x || SAME70
// New-style pin table is indexed by pin number
return logicalPin;
-#else
- return PinTable[logicalPin].pin;
-#endif
}
static const char* TranslatePinAccess(PinAccess access) noexcept;