Fix all compiler and linker errors for SAM4E+CoreN2G

Note: PinTable still empty

5 files changed, 5 insertions, 5 deletions

diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp
index 429e96b7..38ca4b47 100644
--- a/src/FilamentMonitors/FilamentMonitor.cpp
+++ b/src/FilamentMonitors/FilamentMonitor.cpp
@@ -102,7 +102,7 @@ GCodeResult FilamentMonitor::CommonConfigure(GCodeBuffer& gb, const StringRef& r
 		}
 
 		haveIsrStepsCommanded = false;
-		if (interruptMode != INTERRUPT_MODE_NONE && !port.AttachInterrupt(InterruptEntry, interruptMode, this))
+		if (interruptMode != InterruptMode::none && !port.AttachInterrupt(InterruptEntry, interruptMode, this))
 		{
 			reply.copy("unsuitable pin");
 			return GCodeResult::error;
diff --git a/src/FilamentMonitors/LaserFilamentMonitor.cpp b/src/FilamentMonitors/LaserFilamentMonitor.cpp
index d7d00b20..117aee4a 100644
--- a/src/FilamentMonitors/LaserFilamentMonitor.cpp
+++ b/src/FilamentMonitors/LaserFilamentMonitor.cpp
@@ -100,7 +100,7 @@ float LaserFilamentMonitor::MeasuredSensitivity() const noexcept
 // Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
 GCodeResult LaserFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
 {
-	const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_CHANGE, seen);
+	const GCodeResult rslt = CommonConfigure(gb, reply, InterruptMode::change, seen);
 	if (rslt <= GCodeResult::warning)
 	{
 		gb.TryGetFValue('L', calibrationFactor, seen);
diff --git a/src/FilamentMonitors/PulsedFilamentMonitor.cpp b/src/FilamentMonitors/PulsedFilamentMonitor.cpp
index e1c1b1be..4d15e94a 100644
--- a/src/FilamentMonitors/PulsedFilamentMonitor.cpp
+++ b/src/FilamentMonitors/PulsedFilamentMonitor.cpp
@@ -99,7 +99,7 @@ float PulsedFilamentMonitor::MeasuredSensitivity() const noexcept
 // Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
 GCodeResult PulsedFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
 {
-	const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_RISING, seen);
+	const GCodeResult rslt = CommonConfigure(gb, reply, InterruptMode::rising, seen);
 	if (rslt <= GCodeResult::warning)
 	{
 		gb.TryGetFValue('L', mmPerPulse, seen);
diff --git a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
index 5780ee39..abbad96a 100644
--- a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
+++ b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
@@ -102,7 +102,7 @@ float RotatingMagnetFilamentMonitor::MeasuredSensitivity() const noexcept
 // Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
 GCodeResult RotatingMagnetFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
 {
-	const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_CHANGE, seen);
+	const GCodeResult rslt = CommonConfigure(gb, reply, InterruptMode::change, seen);
 	if (rslt <= GCodeResult::warning)
 	{
 		gb.TryGetFValue('L', mmPerRev, seen);
diff --git a/src/FilamentMonitors/SimpleFilamentMonitor.cpp b/src/FilamentMonitors/SimpleFilamentMonitor.cpp
index dd65d5cd..677ce29e 100644
--- a/src/FilamentMonitors/SimpleFilamentMonitor.cpp
+++ b/src/FilamentMonitors/SimpleFilamentMonitor.cpp
@@ -41,7 +41,7 @@ SimpleFilamentMonitor::SimpleFilamentMonitor(unsigned int extruder, unsigned int
 // Configure this sensor, returning true if error and setting 'seen' if we processed any configuration parameters
 GCodeResult SimpleFilamentMonitor::Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) THROWS(GCodeException)
 {
-	const GCodeResult rslt = CommonConfigure(gb, reply, INTERRUPT_MODE_NONE, seen);
+	const GCodeResult rslt = CommonConfigure(gb, reply, InterruptMode::none, seen);
 	if (rslt <= GCodeResult::warning)
 	{
 		if (gb.Seen('S'))