diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7d0d065..d7d548c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -190,10 +190,15 @@ #define PID_dT ((16.0 * 8.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it +// Neutron + #define DEFAULT_Kp 9.36//9.03 + #define DEFAULT_Ki 0.76//0.74 + #define DEFAULT_Kd 28.98//27.37 + // Ultimaker - #define DEFAULT_Kp 9.3//15.98//16.54 - #define DEFAULT_Ki 0.64//2.24//1.3 - #define DEFAULT_Kd 33.69//28.55//52.56 +// #define DEFAULT_Kp 9.3//15.98//16.54 +// #define DEFAULT_Ki 0.64//2.24//1.3 +// #define DEFAULT_Kd 33.69//28.55//52.56 // Makergear // #define DEFAULT_Kp 7.0 @@ -309,10 +314,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DISABLE_Z false #define DISABLE_E false // For all extruders -#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true -#define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false -#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true +#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false +#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index a2e997f..9795dce 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -57,7 +57,7 @@ //This is for controlling a fan to cool down the stepper drivers //it will turn on when any driver is enabled //and turn off after the set amount of seconds from last driver being disabled again -#define CONTROLLERFAN_PIN -1 //Pin used for the fan to cool controller (-1 to disable) +#define CONTROLLERFAN_PIN 8 //Pin used for the fan to cool controller (-1 to disable) #define CONTROLLERFAN_SECS 60 //How many seconds, after all motors were disabled, the fan should run #define CONTROLLERFAN_SPEED 255 // == full speed @@ -71,7 +71,7 @@ // extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE. // Multiple extruders can be assigned to the same pin in which case // the fan will turn on when any selected extruder is above the threshold. -#define EXTRUDER_0_AUTO_FAN_PIN -1 +#define EXTRUDER_0_AUTO_FAN_PIN 9 #define EXTRUDER_1_AUTO_FAN_PIN -1 #define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 diff --git a/Marlin/SdBaseFile.cpp b/Marlin/SdBaseFile.cpp index 747d1d9..28704ce 100644 --- a/Marlin/SdBaseFile.cpp +++ b/Marlin/SdBaseFile.cpp @@ -364,7 +364,7 @@ bool SdBaseFile::getFilename(char* name) return true; } //------------------------------------------------------------------------------ -void SdBaseFile::getpos(fpos_t* pos) +void SdBaseFile::getpos(filepos_t* pos) { pos->position = curPosition_; pos->cluster = curCluster_; @@ -1226,7 +1226,7 @@ bool SdBaseFile::openRoot(SdVolume* vol) */ int SdBaseFile::peek() { - fpos_t pos; + filepos_t pos; getpos(&pos); int c = read(); if (c >= 0) @@ -1952,7 +1952,7 @@ bool SdBaseFile::seekSet(uint32_t pos) return false; } //------------------------------------------------------------------------------ -void SdBaseFile::setpos(fpos_t* pos) +void SdBaseFile::setpos(filepos_t* pos) { curPosition_ = pos->position; curCluster_ = pos->cluster; diff --git a/Marlin/SdBaseFile.h b/Marlin/SdBaseFile.h index 7061ab9..c57d203 100644 --- a/Marlin/SdBaseFile.h +++ b/Marlin/SdBaseFile.h @@ -31,17 +31,17 @@ #include "SdVolume.h" //------------------------------------------------------------------------------ /** - * \struct fpos_t + * \struct filepos_t * \brief internal type for istream * do not use in user apps */ -struct fpos_t +struct filepos_t { /** stream position */ uint32_t position; /** cluster for position */ uint32_t cluster; - fpos_t() : position(0), cluster(0) + filepos_t() : position(0), cluster(0) { } }; @@ -223,11 +223,11 @@ class SdBaseFile { /** get position for streams * \param[out] pos struct to receive position */ - void getpos(fpos_t* pos); + void getpos(filepos_t* pos); /** set position for streams * \param[out] pos struct with value for new position */ - void setpos(fpos_t* pos); + void setpos(filepos_t* pos); //---------------------------------------------------------------------------- bool close(); bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock); diff --git a/Marlin/pins.h b/Marlin/pins.h index 673be6d..5e6ce0d 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -395,7 +395,7 @@ #endif #if MOTHERBOARD == 33 || MOTHERBOARD == 35 - #define FAN_PIN 9 // (Sprinter config) + #define FAN_PIN -1 //9 // (Sprinter config) #else #define FAN_PIN 4 // IO pin. Buffer needed #endif