diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-10-28 14:58:15 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-10-28 14:58:15 +0300 |
| commit | 8207b22cc13e7893ae1cb43f4aef4a7632cac5b3 (patch) | |
| tree | bd49861385980e72aeb6fe16fae0c3acc5895852 /src/GCodes/GCodeMachineState.h | |
| parent | 5e9d621403eb54b00a84d4824b75c056121730aa (diff) | |
SBC improvements for 3.4-b6
Refactored various parts of the SBC interface
Renamed Linux to SBC in various places
CAN updater checks if file is present on SBC before update
SBC task is only woken up when SPI transfers finish
Bug fix: Codes that were sent back to the SBC (e.g. from USB) caused temp reports to be printed
Bug fix: SBC reconnects could take longer than expected
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index f45e77f3..a6bb3e2a 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -117,7 +117,7 @@ enum class GCodeState : uint8_t timingSDread, #endif -#if HAS_LINUX_INTERFACE +#if HAS_SBC_INTERFACE waitingForAcknowledgement, #endif @@ -139,7 +139,7 @@ enum class BlockType : uint8_t loop // block inside a 'while' command }; -#if HAS_LINUX_INTERFACE +#if HAS_SBC_INTERFACE typedef uint8_t FileId; constexpr FileId NoFileId = 0; @@ -203,7 +203,7 @@ public: #if HAS_MASS_STORAGE || HAS_EMBEDDED_FILES FileData fileState; #endif -#if HAS_LINUX_INTERFACE +#if HAS_SBC_INTERFACE FileId fileId; // virtual ID to distinguish files in different stack levels (only unique per GB) #endif ResourceBitmap lockedResources; @@ -229,7 +229,7 @@ public: macroRestartable : 1, // true if the current macro has used M98 R1 to say that it can be interrupted and restarted firstCommandAfterRestart : 1, // true if this is the first command after restarting a macro that was interrupted commandRepeated : 1 // true if the current command is being repeated because it returned GCodeResult::notFinished the first time -#if HAS_LINUX_INTERFACE +#if HAS_SBC_INTERFACE , lastCodeFromSbc : 1, macroStartedByCode : 1, fileFinished : 1 @@ -244,7 +244,7 @@ public: void WaitForAcknowledgement() noexcept; -#if HAS_LINUX_INTERFACE +#if HAS_SBC_INTERFACE void SetFileExecuting() noexcept; #endif |