
Implemented F, H and R parameters to M106 command. The second fan output on a Duet 0.8.5 now defaults to being a thermostatic fan at power up. Improved speed of file upload to SD card G32 is now allowed if the printer has not been homed, if there is a bed.g file G30 commands are no longer allowed on a delta that has not been homed M572 parameter P (drive number) replaced by parameter D (extruder number) File info requests are now processed in stages to reduce impact on printing (thanks chrishamm) Use latest network stack and webserver modules from chrishamm (thanks chrishamm) Added Roland mill support (thanks RRP/chrishamm) Added S parameter (idle timeout) to M18 ans M84 commands (thanks chrishamm) Moved I/O pin assignments to separate Pins.h file to more easily support alternative hardware (thanks dnewman) Bug fix: filament usage and % print complete figures were incorrect when absolute extruder coordinates were used Bug fix: file-based print estimate was occasionally returned as 'inf' which caused the web interface to disconnect Bug fix: M666 now flags all towers as not homed Bug fixes to extruder pressure compensation (M572 command).
238 lines
5.9 KiB
C++
238 lines
5.9 KiB
C++
/****************************************************************************************************
|
|
|
|
RepRapFirmware - Main Include
|
|
|
|
This includes all the other include files in the right order and defines some globals.
|
|
No other definitions or information should be in here.
|
|
|
|
-----------------------------------------------------------------------------------------------------
|
|
|
|
Version 0.1
|
|
|
|
18 November 2012
|
|
|
|
Adrian Bowyer
|
|
RepRap Professional Ltd
|
|
http://reprappro.com
|
|
|
|
Licence: GPL
|
|
|
|
****************************************************************************************************/
|
|
|
|
#ifndef REPRAPFIRMWARE_H
|
|
#define REPRAPFIRMWARE_H
|
|
|
|
#include <cstddef> // for size_t
|
|
#include <cfloat>
|
|
#include <cstdarg>
|
|
|
|
#include "Arduino.h"
|
|
#include "Configuration.h"
|
|
|
|
// Module numbers and names, used for diagnostics and debug
|
|
enum Module
|
|
{
|
|
modulePlatform = 0,
|
|
moduleNetwork = 1,
|
|
moduleWebserver = 2,
|
|
moduleGcodes = 3,
|
|
moduleMove = 4,
|
|
moduleHeat = 5,
|
|
moduleDda = 6,
|
|
moduleRoland = 7,
|
|
modulePrintMonitor = 8,
|
|
numModules = 9, // make this one greater than the last module number
|
|
noModule = 15
|
|
};
|
|
|
|
extern const char *moduleName[];
|
|
|
|
// Warn of what's to come, so we can use pointers to classes...
|
|
|
|
class Network;
|
|
class Platform;
|
|
class Webserver;
|
|
class GCodes;
|
|
class Move;
|
|
class Heat;
|
|
class Tool;
|
|
class Roland;
|
|
class PrintMonitor;
|
|
class RepRap;
|
|
class FileStore;
|
|
|
|
// A single instance of the RepRap class contains all the others
|
|
|
|
extern RepRap reprap;
|
|
|
|
// Functions and globals not part of any class
|
|
|
|
extern "C" void debugPrintf(const char* fmt, ...);
|
|
|
|
bool StringEndsWith(const char* string, const char* ending);
|
|
bool StringStartsWith(const char* string, const char* starting);
|
|
bool StringEquals(const char* s1, const char* s2);
|
|
int StringContains(const char* string, const char* match);
|
|
|
|
// Macro to give us the number of elements in an array
|
|
#define ARRAY_SIZE(_x) (sizeof(_x)/sizeof(_x[0]))
|
|
// Macro to give us the highest valid index into an array i.e. one less than the size
|
|
#define ARRAY_UPB(_x) (ARRAY_SIZE(_x) - 1)
|
|
// Macro to assign an array from an initializer list
|
|
#define ARRAY_INIT(_dest, _init) static_assert(sizeof(_dest) == sizeof(_init), "Incompatible array types"); memcpy(_dest, _init, sizeof(_init));
|
|
|
|
// Class to describe a string buffer, including its length. This saves passing buffer lengths around everywhere.
|
|
class StringRef
|
|
{
|
|
char *p; // pointer to the storage
|
|
size_t len; // number of characters in the storage
|
|
|
|
public:
|
|
StringRef(char *pp, size_t pl) : p(pp), len(pl) { }
|
|
|
|
size_t Length() const { return len; }
|
|
size_t strlen() const;
|
|
char *Pointer() { return p; }
|
|
const char *Pointer() const { return p; }
|
|
|
|
char& operator[](size_t index) { return p[index]; }
|
|
char operator[](size_t index) const { return p[index]; }
|
|
|
|
void Clear() { p[0] = 0; }
|
|
|
|
int printf(const char *fmt, ...);
|
|
int vprintf(const char *fmt, va_list vargs);
|
|
int catf(const char *fmt, ...);
|
|
size_t copy(const char* src);
|
|
size_t cat(const char *src);
|
|
};
|
|
|
|
extern StringRef scratchString;
|
|
|
|
// This class is used to hold data for sending (either for Serial or Network destinations)
|
|
class OutputBuffer
|
|
{
|
|
public:
|
|
friend class RepRap;
|
|
|
|
OutputBuffer(OutputBuffer *n) : next(n) { }
|
|
|
|
OutputBuffer *Next() const { return next; }
|
|
void Append(OutputBuffer *other);
|
|
size_t References() const { return references; }
|
|
void IncreaseReferences(size_t refs);
|
|
|
|
const char *Data() const { return data; }
|
|
uint16_t DataLength() const { return dataLength; } // How many bytes have been written to this instance?
|
|
uint32_t Length() const; // How many bytes have been written to the whole chain?
|
|
|
|
char& operator[](size_t index);
|
|
char operator[](size_t index) const;
|
|
const char *Read(uint16_t len);
|
|
uint16_t BytesLeft() const { return bytesLeft; } // How many bytes have not been sent yet?
|
|
|
|
int printf(const char *fmt, ...);
|
|
int vprintf(const char *fmt, va_list vargs);
|
|
int catf(const char *fmt, ...);
|
|
|
|
size_t copy(const char c);
|
|
size_t copy(const char *src);
|
|
size_t copy(const char *src, size_t len);
|
|
|
|
size_t cat(const char c);
|
|
size_t cat(const char *src);
|
|
size_t cat(const char *src, size_t len);
|
|
size_t cat(StringRef &str);
|
|
|
|
size_t EncodeString(const char *src, uint16_t srcLength, bool allowControlChars, bool encapsulateString = true);
|
|
size_t EncodeReply(OutputBuffer *src, bool allowControlChars);
|
|
|
|
private:
|
|
OutputBuffer *next;
|
|
|
|
char data[OUTPUT_BUFFER_SIZE];
|
|
uint16_t dataLength, bytesLeft;
|
|
|
|
size_t references;
|
|
};
|
|
|
|
#include "Network.h"
|
|
#include "Platform.h"
|
|
#include "Webserver.h"
|
|
#include "GCodes.h"
|
|
#include "Move.h"
|
|
#include "Heat.h"
|
|
#include "Tool.h"
|
|
#include "Roland.h"
|
|
#include "PrintMonitor.h"
|
|
#include "Reprap.h"
|
|
|
|
// std::min and std::max don't seem to work with this variant of gcc, so define our own ones here
|
|
// We use these only with primitive types, so pass them directly instead of by const reference
|
|
#undef min
|
|
#undef max
|
|
|
|
template<class X> inline X min(X _a, X _b)
|
|
{
|
|
return (_a < _b) ? _a : _b;
|
|
}
|
|
|
|
template<class X> inline X max(X _a, X _b)
|
|
{
|
|
return (_a > _b) ? _a : _b;
|
|
}
|
|
|
|
// Specialisations for float and double to handle NANs properly
|
|
template<> inline float min(float _a, float _b)
|
|
{
|
|
return (isnan(_a) || _a < _b) ? _a : _b;
|
|
}
|
|
|
|
template<> inline float max(float _a, float _b)
|
|
{
|
|
return (isnan(_a) || _a > _b) ? _a : _b;
|
|
}
|
|
|
|
template<> inline double min(double _a, double _b)
|
|
{
|
|
return (isnan(_a) || _a < _b) ? _a : _b;
|
|
}
|
|
|
|
template<> inline double max(double _a, double _b)
|
|
{
|
|
return (isnan(_a) || _a > _b) ? _a : _b;
|
|
}
|
|
|
|
inline float fsquare(float arg)
|
|
{
|
|
return arg * arg;
|
|
}
|
|
|
|
inline uint64_t isquare64(int32_t arg)
|
|
{
|
|
return (uint64_t)((int64_t)arg * arg);
|
|
}
|
|
|
|
inline uint64_t isquare64(uint32_t arg)
|
|
{
|
|
return (uint64_t)arg * arg;
|
|
}
|
|
|
|
inline void swap(float& a, float& b)
|
|
{
|
|
float temp = a;
|
|
a = b;
|
|
b = temp;
|
|
}
|
|
|
|
#undef constrain
|
|
template<class T> inline float constrain(T val, T vmin, T vmax)
|
|
{
|
|
return max<T>(vmin, min<T>(val, vmax));
|
|
}
|
|
|
|
extern uint32_t isqrt64(uint64_t num); // Thus is defined in its own file, Isqrt.cpp or Isqrt.asm
|
|
|
|
#endif
|
|
|
|
|