diff options
| author | David Crocker <dcrocker@eschertech.com> | 2018-04-04 01:32:18 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2018-04-04 01:32:18 +0300 |
| commit | 46d4d32b2fcdc11d65e314c6e37dfb67513b6380 (patch) | |
| tree | 30f487f4de322e9aefc8c5ef7dafdb3818490191 /src/Platform.h | |
| parent | 8f3f4431bc6db2405e82883323c64d80d07cdd87 (diff) | |
Yet more RTOS work
Added malloc lock/unlock functions to avoid crash in sprintf etc.
Allow jerk values down to 0.1mm/sec
Add missing call to HttpResponder::CheckSessions()
Added mutex around the access to HttpResponder::gcodeReply
Warn if M500 used without M502 in config.g
M114 now sends user coordinates first
Condensed memory diagnostics a little
Embed OutputStack objects instead of creating them dynamically
Diffstat (limited to 'src/Platform.h')
| -rw-r--r-- | src/Platform.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/Platform.h b/src/Platform.h index 664e06a4..b70c875d 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -603,6 +603,7 @@ public: #if SAM4E || SAM4S || SAME70 uint32_t Random(); + void PrintUniqueId(MessageType mtype); #endif static uint8_t softwareResetDebugInfo; // extra info for debugging @@ -631,10 +632,6 @@ private: bool ExtruderMotorStalled(size_t extruder) const pre(extruder < MaxExtruders); #endif -#if SAM4E || SAM4S || SAME70 - void PrintUniqueId(MessageType mtype); -#endif - // These are the structures used to hold our non-volatile data. // The SAM3X and SAM4E don't have EEPROM so we save the data to flash. This unfortunately means that it gets cleared // every time we reprogram the firmware via bossa, but it can be retained when firmware updates are performed @@ -824,18 +821,18 @@ private: uint32_t baudRates[NUM_SERIAL_CHANNELS]; uint8_t commsParams[NUM_SERIAL_CHANNELS]; - OutputStack *auxOutput; + OutputStack auxOutput; Mutex auxMutex; OutputBuffer *auxGCodeReply; // G-Code reply for AUX devices (special one because it is actually encapsulated before sending) uint32_t auxSeq; // Sequence number for AUX devices bool auxDetected; // Have we processed at least one G-Code from an AUX device? #ifdef SERIAL_AUX2_DEVICE - OutputStack *aux2Output; + OutputStack aux2Output; Mutex aux2Mutex; #endif - OutputStack *usbOutput; + OutputStack usbOutput; Mutex usbMutex; // Files @@ -1008,7 +1005,7 @@ inline float Platform::GetInstantDv(size_t drive) const inline void Platform::SetInstantDv(size_t drive, float value) { - instantDvs[drive] = max<float>(value, 1.0); // don't allow zero or negative values, they causes Move to loop indefinitely + instantDvs[drive] = max<float>(value, 0.1); // don't allow zero or negative values, they causes Move to loop indefinitely } inline void Platform::SetDirectionValue(size_t drive, bool dVal) |