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:
authorDavid Crocker <dcrocker@eschertech.com>2019-10-22 20:15:35 +0300
committerDavid Crocker <dcrocker@eschertech.com>2019-10-22 20:15:35 +0300
commitc25d73194252791ceb479ced79ffc77b31c810fe (patch)
tree7ab38e353fb66438bbf5130edf5b5cd64a2af6b7
parent3e7b9e6762509a5e5e2aaf442ea128f6b0830943 (diff)
Release 3.0beta113.0beta11
Fixed compilation errors for Duet 2 boards
-rw-r--r--src/Endstops/LocalZProbe.cpp11
-rw-r--r--src/Endstops/LocalZProbe.h4
-rw-r--r--src/Version.h2
3 files changed, 16 insertions, 1 deletions
diff --git a/src/Endstops/LocalZProbe.cpp b/src/Endstops/LocalZProbe.cpp
index eea7ccf7..7af2c88d 100644
--- a/src/Endstops/LocalZProbe.cpp
+++ b/src/Endstops/LocalZProbe.cpp
@@ -72,6 +72,17 @@ GCodeResult LocalZProbe::Configure(GCodeBuffer& gb, const StringRef &reply, bool
return ZProbe::Configure(gb, reply, seen);
}
+#if ALLOCATE_DEFAULT_PORTS
+
+bool LocalZProbe::AssignPorts(const char* pinNames, const StringRef& reply)
+{
+ IoPort* const ports[] = { &inputPort, &modulationPort };
+ const PinAccess access[] = { PinAccess::read, PinAccess::write0 };
+ return IoPort::AssignPorts(pinNames, reply, PinUsedBy::zprobe, 2, ports, access);
+}
+
+#endif
+
// This is called by the tick ISR to get the raw Z probe reading to feed to the filter
uint16_t LocalZProbe::GetRawReading() const
{
diff --git a/src/Endstops/LocalZProbe.h b/src/Endstops/LocalZProbe.h
index 9af0819f..15691f3d 100644
--- a/src/Endstops/LocalZProbe.h
+++ b/src/Endstops/LocalZProbe.h
@@ -26,6 +26,10 @@ public:
GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, bool& seen) override;
GCodeResult SendProgram(const uint32_t zProbeProgram[], size_t len, const StringRef& reply) override;
+#if ALLOCATE_DEFAULT_PORTS
+ bool AssignPorts(const char *pinNames, const StringRef& reply);
+#endif
+
private:
IoPort inputPort;
IoPort modulationPort; // the modulation port we are using
diff --git a/src/Version.h b/src/Version.h
index 74bf72f0..8a80bc39 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -20,7 +20,7 @@
#endif
#ifndef DATE
-# define DATE "2019-10-21b1"
+# define DATE "2019-10-22b1"
#endif
#define AUTHORS "reprappro, dc42, chrishamm, t3p3, dnewman, printm3d"