diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-09-30 12:53:00 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-09-30 12:53:00 +0300 |
| commit | 796b7b65c237ef1b7b3a4f27a33adf3e9fb0d550 (patch) | |
| tree | 3f5ad26dd5c7bbec614b4dfeda7fb7fefdd71533 | |
| parent | 5f2f1eb4a091f0e7867352d6ad5c7fce8ae25e14 (diff) | |
| parent | a98453dc82397d8831371a4f636671c6c492824b (diff) | |
Merge branch 'v3-chrishamm' into 3.5-dev
| -rw-r--r-- | src/Fans/Fan.cpp | 5 | ||||
| -rw-r--r-- | src/GCodes/GCodes7.cpp | 13 | ||||
| -rw-r--r-- | src/Tools/Spindle.cpp | 10 |
3 files changed, 16 insertions, 12 deletions
diff --git a/src/Fans/Fan.cpp b/src/Fans/Fan.cpp index 17d53cef..8f9ccce4 100644 --- a/src/Fans/Fan.cpp +++ b/src/Fans/Fan.cpp @@ -34,12 +34,13 @@ constexpr ObjectModelTableEntry Fan::objectModelTable[] = { "thermostatic", OBJECT_MODEL_FUNC(self, 1), ObjectModelEntryFlags::none }, // 1. Fan.thermostatic members - { "heaters", OBJECT_MODEL_FUNC(self->sensorsMonitored), ObjectModelEntryFlags::none }, // empty if not thermostatic + { "heaters", OBJECT_MODEL_FUNC(self->sensorsMonitored), ObjectModelEntryFlags::obsolete }, // empty if not thermostatic { "highTemperature", OBJECT_MODEL_FUNC_IF(self->sensorsMonitored.IsNonEmpty(), self->triggerTemperatures[1], 1), ObjectModelEntryFlags::none }, { "lowTemperature", OBJECT_MODEL_FUNC_IF(self->sensorsMonitored.IsNonEmpty(), self->triggerTemperatures[0], 1), ObjectModelEntryFlags::none }, + { "sensors", OBJECT_MODEL_FUNC(self->sensorsMonitored), ObjectModelEntryFlags::none }, // empty if not thermostatic }; -constexpr uint8_t Fan::objectModelTableDescriptor[] = { 2, 9, 3 }; +constexpr uint8_t Fan::objectModelTableDescriptor[] = { 2, 9, 4 }; DEFINE_GET_OBJECT_MODEL_TABLE(Fan) diff --git a/src/GCodes/GCodes7.cpp b/src/GCodes/GCodes7.cpp index 23abce06..171ef8bf 100644 --- a/src/GCodes/GCodes7.cpp +++ b/src/GCodes/GCodes7.cpp @@ -121,17 +121,18 @@ GCodeResult GCodes::AcknowledgeMessage(GCodeBuffer&gb, const StringRef& reply) T seq = gb.GetUIValue(); } + const bool cancelled = (gb.Seen('P') && gb.GetIValue() == 1); + ExpressionValue rslt; + if (!cancelled && gb.Seen('R')) + { + rslt = gb.GetExpression(); + } + bool wasBlocking; if (reprap.AcknowledgeMessageBox(seq, wasBlocking)) { if (wasBlocking) { - const bool cancelled = (gb.Seen('P') && gb.GetIValue() == 1); - ExpressionValue rslt; - if (!cancelled && gb.Seen('R')) - { - rslt = gb.GetExpression(); - } MessageBoxClosed(cancelled, true, rslt); } return GCodeResult::ok; diff --git a/src/Tools/Spindle.cpp b/src/Tools/Spindle.cpp index 60455daf..5b45675a 100644 --- a/src/Tools/Spindle.cpp +++ b/src/Tools/Spindle.cpp @@ -27,12 +27,15 @@ constexpr ObjectModelTableEntry Spindle::objectModelTable[] = { "canReverse", OBJECT_MODEL_FUNC(self->reverseNotForwardPort.IsValid()), ObjectModelEntryFlags::none }, { "current", OBJECT_MODEL_FUNC((int32_t)self->currentRpm), ObjectModelEntryFlags::live }, { "frequency", OBJECT_MODEL_FUNC((int32_t)self->frequency), ObjectModelEntryFlags::verbose }, + { "idlePwm", OBJECT_MODEL_FUNC(self->idlePwm, 2), ObjectModelEntryFlags::verbose }, { "max", OBJECT_MODEL_FUNC((int32_t)self->maxRpm), ObjectModelEntryFlags::verbose }, + { "maxPwm", OBJECT_MODEL_FUNC(self->maxPwm, 2), ObjectModelEntryFlags::verbose }, { "min", OBJECT_MODEL_FUNC((int32_t)self->minRpm), ObjectModelEntryFlags::verbose }, + { "minPwm", OBJECT_MODEL_FUNC(self->minPwm, 2), ObjectModelEntryFlags::verbose }, { "state", OBJECT_MODEL_FUNC(self->state.ToString()), ObjectModelEntryFlags::live }, }; -constexpr uint8_t Spindle::objectModelTableDescriptor[] = { 1, 7 }; +constexpr uint8_t Spindle::objectModelTableDescriptor[] = { 1, 10 }; DEFINE_GET_OBJECT_MODEL_TABLE(Spindle) @@ -40,9 +43,8 @@ DEFINE_GET_OBJECT_MODEL_TABLE(Spindle) Spindle::Spindle() noexcept : minPwm(DefaultMinSpindlePwm), maxPwm(DefaultMaxSpindlePwm), idlePwm(DefaultIdleSpindlePwm), - currentRpm(0), configuredRpm(0),minRpm(DefaultMinSpindleRpm), maxRpm(DefaultMaxSpindleRpm), - frequency(0), - state(SpindleState::unconfigured) + currentRpm(0), configuredRpm(0), minRpm(DefaultMinSpindleRpm), maxRpm(DefaultMaxSpindleRpm), + frequency(0), state(SpindleState::unconfigured) { } |