6525a46a52
New features ============ The PWM frequency for the heated bed and for any heater used as a chamber heater is now 10Hz for bettercompatibility with DC-AC SSRs. The PWM frequency for fans is now configurable using the F paramete ron the M106 command. The default is 500Hz, which gives esonable control of fans not designed for PWM. Increase it to 25000Hz when using 4-wire PWM fans. When a Duet 0.8.5 board is configured or detected, the fan control is now automatically inverted. If you previously used M106 P0 I1 in config.g to invert it, you will need to remove that. M579 (scale Cartesian axes) is now implemented (thanks chrishamm). M114, M119 and M573 commands can now be executed concurrently with other commands. When DDA debugging is enabled, the debug output now includes all active extruders instead of just the first two. M408 S0 now includes the fan speeds (for PanelDue). M119 now reports the Z probe as well as the endstop switch states. A tool can now be defined even if a tool with the same tool number exists already. The existing tool will be shut down and deleted. The bed heater can now be disabled using M140 S-1 (thanks chrishamm). The chamber heater (if present) and the endstop switch states are now reported to the web interface (thanks chrishamm). Increased defauklt Z prove dive height to 5mm. Increased default PID Ki to 0.2 Bug fixes ========= On a CoreXY machine, XY speeds were too low by a factor of sqrt(2). On a delta machine, after running auto calibration the Z=0 height could be slightly inaccurate, depending on the difference between the X and Z endstop corrections When using a non-intelligent modulated Z probe on a Duet 0.8.5, the modulation pin number was incorrect. The M27 (Report SD card print status) response was inverted compared to what it should be. When in Marlin mode it now includes the "byte n/m" field that some versions of Pronterface expect. Cold extrusion prevention did not work - an error message was generated, but the extruder was driven anyway. M999 PERASE is now more reliable (thanks chrishamm). M23, M30 and M32 commands did not work when the filename parameter passed included an absolute path. //A T command inside a macro file did not execute the tool change macros files. A memory leak occurred when a tool was deleted. All moves are now completed before switching to CoreXY mode. Polling requests from PanelDue were not relied to when a macro was being executed M667 with no parameters returned an incorrect string
161 lines
3.4 KiB
C++
161 lines
3.4 KiB
C++
/****************************************************************************************************
|
|
|
|
RepRapFirmware - Tool
|
|
|
|
This class implements a tool in the RepRap machine, usually (though not necessarily) an extruder.
|
|
|
|
Tools may have zero or more drives associated with them and zero or more heaters. There are a fixed number
|
|
of tools in a given RepRap, with fixed heaters and drives. All this is specified on reboot, and cannot
|
|
be altered dynamically. This restriction may be lifted in the future. Tool descriptions are stored in
|
|
GCode macros that are loaded on reboot.
|
|
|
|
-----------------------------------------------------------------------------------------------------
|
|
|
|
Version 0.1
|
|
|
|
Created on: Apr 11, 2014
|
|
|
|
Adrian Bowyer
|
|
RepRap Professional Ltd
|
|
http://reprappro.com
|
|
|
|
Licence: GPL
|
|
|
|
****************************************************************************************************/
|
|
|
|
#ifndef TOOL_H_
|
|
#define TOOL_H_
|
|
|
|
class Tool
|
|
{
|
|
public:
|
|
|
|
static Tool * Create(int toolNumber, long d[], size_t dCount, long h[], size_t hCount);
|
|
static void Delete(Tool *t);
|
|
|
|
const float *GetOffset() const;
|
|
void SetOffset(const float offs[AXES]);
|
|
size_t DriveCount() const;
|
|
int Drive(int driveNumber) const;
|
|
bool ToolCanDrive(bool extrude);
|
|
size_t HeaterCount() const;
|
|
int Heater(int heaterNumber) const;
|
|
int Number() const;
|
|
void SetVariables(const float* standby, const float* active);
|
|
void GetVariables(float* standby, float* active) const;
|
|
void DefineMix(float* m);
|
|
const float* GetMix() const;
|
|
void TurnMixingOn();
|
|
void TurnMixingOff();
|
|
bool Mixing() const;
|
|
float MaxFeedrate() const;
|
|
float InstantDv() const;
|
|
void Print(StringRef& reply);
|
|
|
|
friend class RepRap;
|
|
|
|
protected:
|
|
|
|
Tool* Next() const;
|
|
void Activate(Tool* currentlyActive);
|
|
void Standby();
|
|
void FlagTemperatureFault(int8_t dudHeater);
|
|
void ClearTemperatureFault(int8_t wasDudHeater);
|
|
void UpdateExtruderAndHeaterCount(uint16_t &extruders, uint16_t &heaters) const;
|
|
bool DisplayColdExtrudeWarning();
|
|
|
|
private:
|
|
static Tool *freelist;
|
|
|
|
void SetTemperatureFault(int8_t dudHeater);
|
|
void ResetTemperatureFault(int8_t wasDudHeater);
|
|
bool AllHeatersAtHighTemperature(bool forExtrusion) const;
|
|
int myNumber;
|
|
int drives[DRIVES - AXES];
|
|
float mix[DRIVES - AXES];
|
|
bool mixing;
|
|
size_t driveCount;
|
|
int heaters[HEATERS];
|
|
float activeTemperatures[HEATERS];
|
|
float standbyTemperatures[HEATERS];
|
|
size_t heaterCount;
|
|
Tool* next;
|
|
bool active;
|
|
bool heaterFault;
|
|
float offset[AXES];
|
|
|
|
volatile bool displayColdExtrudeWarning;
|
|
};
|
|
|
|
inline int Tool::Drive(int driveNumber) const
|
|
{
|
|
return drives[driveNumber];
|
|
}
|
|
|
|
inline size_t Tool::HeaterCount() const
|
|
{
|
|
return heaterCount;
|
|
}
|
|
|
|
inline int Tool::Heater(int heaterNumber) const
|
|
{
|
|
return heaters[heaterNumber];
|
|
}
|
|
|
|
inline Tool* Tool::Next() const
|
|
{
|
|
return next;
|
|
}
|
|
|
|
inline int Tool::Number() const
|
|
{
|
|
return myNumber;
|
|
}
|
|
|
|
inline void Tool::DefineMix(float* m)
|
|
{
|
|
for(size_t drive = 0; drive < driveCount; drive++)
|
|
{
|
|
mix[drive] = m[drive];
|
|
}
|
|
}
|
|
|
|
inline const float* Tool::GetMix() const
|
|
{
|
|
return mix;
|
|
}
|
|
|
|
inline void Tool::TurnMixingOn()
|
|
{
|
|
mixing = true;
|
|
}
|
|
|
|
inline void Tool::TurnMixingOff()
|
|
{
|
|
mixing = false;
|
|
}
|
|
|
|
inline bool Tool::Mixing() const
|
|
{
|
|
return mixing;
|
|
}
|
|
|
|
inline size_t Tool::DriveCount() const
|
|
{
|
|
return driveCount;
|
|
}
|
|
|
|
inline const float *Tool::GetOffset() const
|
|
{
|
|
return offset;
|
|
}
|
|
|
|
inline void Tool::SetOffset(const float offs[AXES])
|
|
{
|
|
for(size_t i = 0; i < AXES; ++i)
|
|
{
|
|
offset[i] = offs[i];
|
|
}
|
|
}
|
|
|
|
#endif /* TOOL_H_ */
|