FT-2020-DISCOUNT-LCD-jefbed-0.patch

diff -u FT-2020-DISCOUNT-LCD-orig/Configuration.h FT-2020-DISCOUNT-LCD-jefbed/Configuration.h
--- FT-2020-DISCOUNT-LCD-orig/Configuration.h	2017-05-18 19:34:28.000000000 -0400
+++ FT-2020-DISCOUNT-LCD-jefbed/Configuration.h	2018-04-08 14:32:20.059274633 -0400
@@ -329,16 +329,16 @@
 #define DISABLE_E false // For all extruders
 #define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled

-#define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
+#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 true   // for direct drive extruder v9 set to true, for geared extruder set to false
+#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false

 // ENDSTOP SETTINGS:
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
-#define X_HOME_DIR 1
+#define X_HOME_DIR -1
 #define Y_HOME_DIR -1
 #define Z_HOME_DIR -1

@@ -774,8 +774,8 @@

 #define FILAMENT_SENSOR_EXTRUDER_NUM  0  //The number of the extruder that has the filament sensor (0,1,2)
 #define MEASUREMENT_DELAY_CM          14  //measurement delay in cm.  This is the distance from filament sensor to middle of barrel
-
-#define DEFAULT_NOMINAL_FILAMENT_DIA  3.0  //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software.  Used for sensor reading validation
+#define DEFAULT_NOMINAL_FILAMENT_DIA  1.75
+//#define DEFAULT_NOMINAL_FILAMENT_DIA  3.0  //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software.  Used for sensor reading validation
 #define MEASURED_UPPER_LIMIT          3.30  //upper limit factor used for sensor reading validation in mm
 #define MEASURED_LOWER_LIMIT          1.90  //lower limit factor for sensor reading validation in mm
 #define MAX_MEASUREMENT_DELAY         20  //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM  and lower number saves RAM)
Common subdirectories: FT-2020-DISCOUNT-LCD-orig/example_configurations and FT-2020-DISCOUNT-LCD-jefbed/example_configurations
Common subdirectories: FT-2020-DISCOUNT-LCD-orig/scripts and FT-2020-DISCOUNT-LCD-jefbed/scripts
diff -u FT-2020-DISCOUNT-LCD-orig/SdBaseFile.cpp FT-2020-DISCOUNT-LCD-jefbed/SdBaseFile.cpp
--- FT-2020-DISCOUNT-LCD-orig/SdBaseFile.cpp	2015-09-18 22:27:18.000000000 -0400
+++ FT-2020-DISCOUNT-LCD-jefbed/SdBaseFile.cpp	2018-04-04 13:31:42.707951048 -0400
@@ -294,7 +294,7 @@
   return true;
 }
 //------------------------------------------------------------------------------
-void SdBaseFile::getpos(fpos_t* pos) {
+void SdBaseFile::getpos(sd_fpos_t* pos) {
   pos->position = curPosition_;
   pos->cluster = curCluster_;
 }
@@ -925,7 +925,7 @@
  * \return The byte if no error and not at eof else -1;
  */
 int SdBaseFile::peek() {
-  fpos_t pos;
+  sd_fpos_t pos;
   getpos(&pos);
   int c = read();
   if (c >= 0) setpos(&pos);
@@ -1492,7 +1492,7 @@
   return false;
 }
 //------------------------------------------------------------------------------
-void SdBaseFile::setpos(fpos_t* pos) {
+void SdBaseFile::setpos(sd_fpos_t* pos) {
   curPosition_ = pos->position;
   curCluster_ = pos->cluster;
 }
diff -u FT-2020-DISCOUNT-LCD-orig/SdBaseFile.h FT-2020-DISCOUNT-LCD-jefbed/SdBaseFile.h
--- FT-2020-DISCOUNT-LCD-orig/SdBaseFile.h	2015-09-18 22:27:18.000000000 -0400
+++ FT-2020-DISCOUNT-LCD-jefbed/SdBaseFile.h	2018-04-04 13:31:55.928007306 -0400
@@ -31,16 +31,16 @@
 #include "SdVolume.h"
 //------------------------------------------------------------------------------
 /**
- * \struct fpos_t
+ * \struct sd_fpos_t
  * \brief internal type for istream
  * do not use in user apps
  */
-struct fpos_t {
+struct sd_fpos_t {
   /** stream position */
   uint32_t position;
   /** cluster for position */
   uint32_t cluster;
-  fpos_t() : position(0), cluster(0) {}
+  sd_fpos_t() : position(0), cluster(0) {}
 };

 // use the gnu style oflag in open()
@@ -196,11 +196,11 @@
   /** get position for streams
    * \param[out] pos struct to receive position
    */
-  void getpos(fpos_t* pos);
+  void getpos(sd_fpos_t* pos);
   /** set position for streams
    * \param[out] pos struct with value for new position
    */
-  void setpos(fpos_t* pos);
+  void setpos(sd_fpos_t* pos);
   //----------------------------------------------------------------------------
   bool close();
   bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);