diff options
| author | David Crocker <dcrocker@eschertech.com> | 2017-08-02 12:57:08 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2017-08-02 12:57:08 +0300 |
| commit | 186f9bd62f25e77cf324e948cf39d90d50c624ea (patch) | |
| tree | f41cc840c166a9610c91f17e55c384362160d66a /src/RepRap.h | |
| parent | aad83dd820c74f5cc7c12eac36d0fec46ffce0cc (diff) | |
More changes for 1.19beta12
Mergd in chrishamm's changes for displaying additional axois jog buttons
in messasge boxes
Mixing no longer needs to be enabled on multi-extruder tools, it happens
automatically if only one extrusion amount is given
Diffstat (limited to 'src/RepRap.h')
| -rw-r--r-- | src/RepRap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/RepRap.h b/src/RepRap.h index e5e97339..4c34c29a 100644 --- a/src/RepRap.h +++ b/src/RepRap.h @@ -101,7 +101,7 @@ public: void Beep(int freq, int ms); void SetMessage(const char *msg); - void SetAlert(const char *msg, const char *title, int mode, float timeout, bool showZControls); + void SetAlert(const char *msg, const char *title, int mode, float timeout, AxesBitmap controls); void ClearAlert(); #ifdef DUET_NG @@ -158,7 +158,7 @@ private: char boxMessage[MESSAGE_LENGTH + 1], boxTitle[MESSAGE_LENGTH + 1]; int boxMode; uint32_t boxTimer, boxTimeout; - bool boxZControls; + AxesBitmap boxControls; }; inline Platform& RepRap::GetPlatform() const { return *platform; } |