diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2019-03-30 21:15:41 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2019-03-30 21:15:41 +0300 |
| commit | 095df6b75b505a650188ad74935d268429d41a63 (patch) | |
| tree | 7959b92266f5df230f7ffc61c90d1858828e2799 /src/GCodes/GCodeInput.h | |
| parent | 9a8acc6ba9c7e3d973fcb23a901322acdcc896ca (diff) | |
Work on the new the SPI interface
Transfers over the SPI1 channel of the SAME70 working
Refactored GCodeBuffer for two data types:
1. For string-based inputs (standard text-based approach)
2. For binary data transfers as used in the new SPI protocol (untested)
Added OpenOCD script for SAME70 <-> Atmel ICE
Fixed relative workspace paths in the linker settings again
Diffstat (limited to 'src/GCodes/GCodeInput.h')
| -rw-r--r-- | src/GCodes/GCodeInput.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/GCodes/GCodeInput.h b/src/GCodes/GCodeInput.h index 7d493df8..69ccdcb8 100644 --- a/src/GCodes/GCodeInput.h +++ b/src/GCodes/GCodeInput.h @@ -9,6 +9,7 @@ #define GCODEINPUT_H #include "RepRapFirmware.h" +#include "GCodes/GCodeBuffer/StringGCodeBuffer.h" #include "Storage/FileData.h" #include "MessageType.h" #include "RTOSIface/RTOSIface.h" @@ -22,7 +23,7 @@ class GCodeInput { public: virtual void Reset() = 0; // Clean all the cached data from this input - virtual bool FillBuffer(GCodeBuffer *gb); // Fill a GCodeBuffer with the last available G-code + virtual bool FillBuffer(GCodeBuffer *gb); // Fill a GCodeBuffer with the last available G-code virtual size_t BytesCached() const = 0; // How many bytes have been cached? protected: @@ -106,7 +107,7 @@ class NetworkGCodeInput: public RegularGCodeInput public: NetworkGCodeInput(); - bool FillBuffer(GCodeBuffer *gb) override; // Fill a GCodeBuffer with the last available G-code + bool FillBuffer(GCodeBuffer *gb) override; // Fill a GCodeBuffer with the last available G-code void Put(MessageType mtype, const char *buf); // Append a null-terminated string to the buffer void Put(MessageType mtype, char c); // Append a single character. This does NOT lock the mutex! |