diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-03-08 17:34:33 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-03-08 17:34:33 +0300 |
| commit | 8586a96c969594bd31cc9b2275e54b41e179a74b (patch) | |
| tree | 1c86b648603be7ecba036c8efda7e8b48a66fab0 /src/GCodes/GCodeMachineState.h | |
| parent | fe81ce8d292a5e9ed45c9a76e8bc9b9c3e75fb2e (diff) | |
Bug fixes and refactoring
Tightened up JSON path parsing
Used NamedEnum for GCodeChannel and Compatibility
Added a check for bad channel numbers received from SBC
Fixed bugs in M220
Increased max number of MDNS services form 1 to 4
Added noexcept specifiers to functions in DataTransfer class
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index c348e63a..12d52564 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -8,9 +8,10 @@ #ifndef SRC_GCODES_GCODEMACHINESTATE_H_ #define SRC_GCODES_GCODEMACHINESTATE_H_ -#include "RepRapFirmware.h" -#include "Storage/FileData.h" +#include <RepRapFirmware.h> +#include <Storage/FileData.h> #include <General/FreelistManager.h> +#include <General/NamedEnum.h> // Enumeration to list all the possible states that the Gcode processing machine may be in enum class GCodeState : uint8_t @@ -106,17 +107,8 @@ enum class GCodeState : uint8_t #endif }; -// Other firmware that we might switch to be compatible with. -enum class Compatibility : uint8_t -{ - me = 0, - reprapFirmware = 1, - marlin = 2, - teacup = 3, - sprinter = 4, - repetier = 5, - nanoDLP = 6 -}; +// Other firmware that we might switch to be compatible with. The ordering is as for M555 starting with 0. +NamedEnum(Compatibility, uint8_t, Default, RepRapFirmware, Marlin, Teacup, Sprinter, Repetier, NanoDLP); // Type of the block we are in when processing conditional GCode enum class BlockType : uint8_t |