Merge branch 'Development'

Documentation/CurrentSensor.md

+Power consumption sensor (Hall effect sensor like ACS712)
+---------------------------------------------------------
+Support for a current sensor (Hall effect sensor like ACS712) for measure the power consumption
+Since it's more simple to deal with, we measure the DC current and we assume that POWER_VOLTAGE that comes from your power supply it's almost stable.
+You have to change the POWER_SENSITIVITY with the one that you can find in the datasheet. (in case of ACS712: set to .100 for 20A version or set .066 for 30A version)
+
+After setted POWER_VOLTAGE and POWER_SENSITIVITY you have to found correct value for POWER_ZERO.
+You can do it by using "M70 Z" gcode and read the calculated value from serial messages.
+Before calling "M70 Z" you have to disconnect the cable for measure the current from the sensor leaving only +5, OUT and GND connections.
+Insert new values into FW and recompile.
+Now you can reconnect the current cable to the sensor.
+
+Now you have to set right value for POWER_ERROR.
+Get a good multimeter and meacure DC current coming out from the power supply.
+In order to get an accurate value power-on something (Eg. Heater, Motor, Fan) DO NOT POWER-ON THE BED OR YOU MAY KILL IT!!!!
+Call "M70 Ax" where 'x' is the value measured by the multimeter.
+Insert new values into FW and recompile.
+
+With this module we measure the Printer power consumption ignoring the Power Supply power consumption,
+so we consider the POWER_EFFICIENCY of our supply to be 100%.
+WARNING: from this moment the procedure can be REALLY HARMFUL to health unless you have a little experience so DO NOT DO IT IF YOU DO NOT KNOW WHAT YOU ARE DOING!!!
+If you want to approximately add the supply consumption you have measure the AC current with a good multimeter
+and moltiple it with the mains voltage (110V AC - 220V AC).
+MULTIMETER_WATT = MULTIMETER_CURRENTMAINS_VOLTAGE
+Call "M70 Wx" where 'x' is MULTIMETER_WATT;
+Insert new values into FW and recompile.
+
+Now you AC712 it should be calibrated.
\ No newline at end of file

Documentation/changelog.md

+### Version 4.2.0
+* Add PID Extrusion Rate Kc in percent.
+* New configuration systems (Now you can create a separate file with all configuration and use it in you FW update)
+* New namings for file
+* Added more documentation inside configuration file
+* More checks for feature incompatibility during compilation
+* Codeclean
+* General bugfix
+* Removed legacy support for old configuration (Do not use your old configuration files, namings and position for configuration has changed)
+
 ### Version 4.1.5
+* Added dot for SD write operation
+* Added statistics menu
+* Added an overall configuration file
+* Added M70 gcode for calibrate AC721 current sensor
+* Added documentation for calibrate AC721 current sensor
 * Critical stepper motor frequency bugfix
 * Introduced more intuitive menu tree.
 * Added a menu option to fix loose steps from LCD

MarlinKimbra/boards.h → MarlinKimbra/Boards.h

-#ifndef BOARDS_H
-#define BOARDS_H
+#ifndef BOARD_H
+#define BOARD_H
 
+// Macros for board type
 #define BOARD_UNKNOWN -1
 
 #define BOARD_GEN7_CUSTOM       10   // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
@@ -14,19 +15,20 @@
 #define BOARD_GEN3_MONOLITHIC   22   // Gen3 Monolithic Electronics
 
 #define BOARD_RAMPS_OLD         3    // MEGA/RAMPS up to 1.2
-#define BOARD_RAMPS_13_EFB      33   // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Bed)
-#define BOARD_RAMPS_13_EEB      34   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Bed)
-#define BOARD_RAMPS_13_EFF      35   // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Fan)
-#define BOARD_RAMPS_13_EEF      36   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Fan)
-#define BOARD_RAMPS_13_EEE      37   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Hotend2)
+#define BOARD_RAMPS_13_HFB      33   // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Bed)
+#define BOARD_RAMPS_13_HHB      34   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Bed)
+#define BOARD_RAMPS_13_HFF      35   // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Fan)
+#define BOARD_RAMPS_13_HHF      36   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Fan)
+#define BOARD_RAMPS_13_HHH      37   // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Hotend2)
 #define BOARD_RAMBO             301  // Rambo
 #define BOARD_MINIRAMBO         302  // Mini-Rambo
 
 #define BOARD_DUEMILANOVE_328P  4    // Duemilanove w/ ATMega328P pin assignments
-#define BOARD_RADDS             402  // RADDS
-#define BOARD_RAMPS_FDV1        403  // RAMPS-FD V1
-#define BOARD_RAMPS_FDV2        404  // RAMPS-FD V2
-#define BOARD_RAMPS4DUE         433  // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1)
+#define BOARD_RADDS             402  // RADDS ARM 32
+#define BOARD_RAMPS_FDV1        403  // RAMPS-FD V1 ARM 32
+#define BOARD_RAMPS_FDV2        404  // RAMPS-FD V2 ARM 32
+#define BOARD_SMART_RAMPS       408  // SMART RAMPS ARM 32
+#define BOARD_RAMPS4DUE         433  // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1) ARM 32
 
 #define BOARD_GEN6              5    // Gen6
 #define BOARD_GEN6_DELUXE       51   // Gen6 deluxe
@@ -68,4 +70,4 @@
 
 #define MB(board) (MOTHERBOARD==BOARD_##board)
 
-#endif //__BOARDS_H
+#endif

MarlinKimbra/Configuration_Overall.h

+/**
+ * Configuration_Overall.h
+ * Here you can define all your custom settings and they will overwrite configurations in the main configuration files.
+ */

MarlinKimbra/pins2tool.h → MarlinKimbra/Configuration_Pins.h

-//============================================================================
-//==================== Change PIN width Configurator Tool ====================
-//============================================================================
+#ifndef CONFIGURATION_PINS_H
+#define CONFIGURATION_PINS_H
+
+//=========================== BASIC ==============================
 
 //X axis pins
 #define X_STEP_PIN    ORIG_X_STEP_PIN
@@ -57,12 +58,72 @@
 #define TEMP_BED_PIN    ORIG_TEMP_BED_PIN
 
 //FAN pin
-#define FAN_PIN       ORIG_FAN_PIN
+#define FAN_PIN         ORIG_FAN_PIN
+
+//==================================================================
+
+//=========================== FEATURE ==============================
+
+#if ENABLED(MKR4)
+  #define E0E1_CHOICE_PIN     -1
+  #define E0E2_CHOICE_PIN     -1
+  #define E0E3_CHOICE_PIN     -1
+  #define E1E3_CHOICE_PIN     -1
+#endif //MKR4
+
+#if ENABLED(NPR2)
+  #define E_MIN_PIN           -1
+#endif
+
+#if ENABLED(LASERBEAM)
+  #define LASER_PWR_PIN       -1
+  #define LASER_TTL_PIN       -1
+#endif
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define FILRUNOUT_PIN       -1
+#endif
+
+#if ENABLED(FILAMENT_SENSOR)
+  #define FILWIDTH_PIN        -1     // ANALOG NUMBERING
+#endif
+
+#if ENABLED(POWER_CONSUMPTION)
+  #define POWER_CONSUMPTION_PIN -1   // ANALOG NUMBERING
+#endif
+
+#if ENABLED(PHOTOGRAPH)
+  #define PHOTOGRAPH_PIN -1
+#endif
 
-//=========================== START YOUR CHANGE ==============================
-// Example for change X_MIN_PIN
-// #undef X_MIN_PIN
-// #define X_MIN_PIN newpin
+#if ENABLED(CHDK)
+  #define CHDK_PIN -1
+#endif
 
+#if ENABLED(CONTROLLERFAN)
+  #define CONTROLLERFAN_PIN -1
+#endif
+
+#if ENABLED(EXTRUDER_AUTO_FAN)
+  #define EXTRUDER_0_AUTO_FAN_PIN -1
+  #define EXTRUDER_1_AUTO_FAN_PIN -1
+  #define EXTRUDER_2_AUTO_FAN_PIN -1
+  #define EXTRUDER_3_AUTO_FAN_PIN -1
+#endif
+
+#if ENABLED(X2_IS_TMC)
+  #define X2_ENABLE_PIN -1
+  #define X2_STEP_PIN   -1
+  #define X2_DIR_PIN    -1
+#endif
+
+#if ENABLED(Z_PROBE_SLED)
+  #define SLED_PIN      -1
+#endif
+
+#if ENABLED(Z_PROBE_ENDSTOP)
+  #define Z_PROBE_PIN   -1
+#endif
 
-//============================================================================
+//====================================================================
+#endif
\ No newline at end of file

MarlinKimbra/Default_Version.h → MarlinKimbra/Configuration_Version.h

+#ifndef CONFIGURATION_VERSION_H
+#define CONFIGURATION_VERSION_H
 /*
  * This file is a placeholder for a file which could be distributed in an archive
  * It takes the place of an automatically created "_Version.h" which is generated during the build process
@@ -6,8 +8,9 @@
 // #error "You must specify the following parameters related to your distribution"
 
 #if true
-  #define SHORT_BUILD_VERSION "4.1.5 dev"
+  #define SHORT_BUILD_VERSION "4.2.0 dev"
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found
   #define SOURCE_CODE_URL  "https://github.com/MagoKimbra/MarlinKimbra"
+#endif
 #endif
\ No newline at end of file

MarlinKimbra/M100_Free_Mem_Chk.cpp

-#define M100_FREE_MEMORY_DUMPER       // Comment out to remove Dump sub-command
-#define M100_FREE_MEMORY_CORRUPTOR    // Comment out to remove Corrupt sub-command
-
-
-// M100 Free Memory Watcher
-//
-// This code watches the free memory block between the bottom of the heap and the top of the stack.
-// This memory block is initialized and watched via the M100 command.
-//
-// M100 I Initializes the free memory block and prints vitals statistics about the area
-// M100 F Identifies how much of the free memory block remains free and unused.  It also
-//    detects and reports any corruption within the free memory block that may have
-//    happened due to errant firmware.
-// M100 D Does a hex display of the free memory block along with a flag for any errant
-//    data that does not match the expected value.
-// M100 C x Corrupts x locations within the free memory block.   This is useful to check the
-//    correctness of the M100 F and M100 D commands.
-//
-// Initial version by Roxy-3DPrintBoard
-//
-//
-
-
-#include "Marlin.h"
-
-#ifdef M100_FREE_MEMORY_WATCHER
-  extern void *__brkval;
-  extern size_t  __heap_start, __heap_end, __flp;
-
-  //
-  // Declare all the functions we need from Marlin_Main.cpp to do the work!
-  //
-  float code_value();
-  long code_value_long();
-  bool code_seen(char );
-
-
-  //
-  // Utility functions used by M100 to get its work done.
-  //
-  unsigned char *top_of_stack();
-  void prt_hex_nibble( unsigned int );
-  void prt_hex_byte(unsigned int );
-  void prt_hex_word(unsigned int );
-  int how_many_E5s_are_here( unsigned char *);
-
-
-  void gcode_M100() {
-    static int m100_not_initialized = 1;
-    unsigned char *sp, *ptr;
-    int i, j, n;
-
-    //
-    // M100 D dumps the free memory block from __brkval to the stack pointer.
-    // malloc() eats memory from the start of the block and the stack grows
-    // up from the bottom of the block.    Solid 0xE5's indicate nothing has
-    // used that memory yet.   There should not be anything but 0xE5's within
-    // the block of 0xE5's.  If there is, that would indicate memory corruption
-    // probably caused by bad pointers.  Any unexpected values will be flagged in
-    // the right hand column to help spotting them.
-    //
-    #ifdef M100_FREE_MEMORY_DUMPER      // Comment out to remove Dump sub-command
-      if ( code_seen('D') ) {
-        ptr = (unsigned char *) __brkval;
-
-        //
-        // We want to start and end the dump on a nice 16 byte boundry even though
-        // the values we are using are not 16 byte aligned.
-        //
-        ECHO_M("\n__brkval : ");
-        prt_hex_word( (unsigned int) ptr );
-        ptr = (unsigned char *) ((unsigned long) ptr & 0xfff0);
-
-        sp = top_of_stack();
-        ECHO_M("\nStack Pointer : ");
-        prt_hex_word( (unsigned int) sp );
-        ECHO_M("\n");
-
-        sp = (unsigned char *) ((unsigned long) sp | 0x000f);
-        n = sp - ptr;
-
-        //
-        // This is the main loop of the Dump command.
-        //
-        while ( ptr < sp ) {
-          prt_hex_word( (unsigned int) ptr);  // Print the address
-          ECHO_M(":");
-          for(i = 0; i < 16; i++) {     // and 16 data bytes
-            prt_hex_byte( *(ptr+i));
-            ECHO_M(" ");
-            delay(2);
-          }
-
-          ECHO_M("|");        // now show where non 0xE5's are
-          for(i = 0; i < 16; i++) {
-            delay(2);
-            if ( *(ptr+i)==0xe5)
-              ECHO_M(" ");
-            else
-              ECHO_M("?");
-          }
-          ECHO_M("\n");
-
-          ptr += 16;
-          delay(2);
-        }
-        ECHO_M("Done.\n");
-        return;
-      }
-    #endif
-
-    //
-    // M100 F   requests the code to return the number of free bytes in the memory pool along with
-    // other vital statistics that define the memory pool.
-    //
-    if ( code_seen('F') ) {
-      int max_addr = (int) __brkval;
-      int max_cnt = 0;
-      int block_cnt = 0;
-      ptr = (unsigned char *) __brkval;
-      sp = top_of_stack();
-      n = sp - ptr;
-
-      // Scan through the range looking for the biggest block of 0xE5's we can find
-
-      for(i = 0; i < n; i++) {
-        if ( *(ptr+i) == (unsigned char) 0xe5) {
-          j = how_many_E5s_are_here( (unsigned char *) ptr+i );
-          if ( j > 8) {
-            ECHO_MV("Found ", j );
-            ECHO_M(" bytes free at 0x");
-            prt_hex_word( (int) ptr+i );
-            ECHO_M("\n");
-            i += j;
-            block_cnt++;
-          }
-          if ( j>max_cnt) {     // We don't do anything with this information yet
-            max_cnt  = j;     // but we do know where the biggest free memory block is.
-            max_addr = (int) ptr+i;
-          }
-        }
-      }
-      if (block_cnt>1)
-          ECHO_EM("\nMemory Corruption detected in free memory area.\n");
-
-      ECHO_M("\nDone.\n");
-      return;
-    }
-
-    //
-    // M100 C x  Corrupts x locations in the free memory pool and reports the locations of the corruption.
-    // This is useful to check the correctness of the M100 D and the M100 F commands.
-    //
-    #ifdef M100_FREE_MEMORY_CORRUPTOR
-      if ( code_seen('C') ) {
-        int x;      // x gets the # of locations to corrupt within the memory pool
-        x = code_value();
-        ECHO_EM("Corrupting free memory block.\n");
-        ptr = (unsigned char *) __brkval;
-        ECHO_MV("\n__brkval : ",(long) ptr );
-        ptr += 8;
-
-        sp = top_of_stack();
-        ECHO_MV("\nStack Pointer : ",(long) sp );
-        ECHO_EM("\n");
-
-        n = sp - ptr - 64;    // -64 just to keep us from finding interrupt activity that
-                              // has altered the stack.
-        j = n / (x+1);
-        for(i = 1; i <= x; i++) {
-          *(ptr+(i*j)) = i;
-          ECHO_M("\nCorrupting address: 0x");
-          prt_hex_word( (unsigned int)  (ptr+(i*j)) );
-        }
-        ECHO_EM("\n");
-        return;
-      }
-    #endif
-
-    //
-    // M100 I    Initializes the free memory pool so it can be watched and prints vital
-    // statistics that define the free memory pool.
-    //
-    if (m100_not_initialized || code_seen('I') ) {        // If no sub-command is specified, the first time
-      ECHO_EM("Initializing free memory block.\n");       // this happens, it will Initialize.
-      ptr = (unsigned char *) __brkval;         // Repeated M100 with no sub-command will not destroy the
-      ECHO_MV("\n__brkval : ",(long) ptr );     // state of the initialized free memory pool.
-      ptr += 8;
-
-      sp = top_of_stack();
-      ECHO_MV("\nStack Pointer : ",(long) sp );
-      ECHO_EM("\n");
-
-      n = sp - ptr - 64;    // -64 just to keep us from finding interrupt activity that
-                            // has altered the stack.
-
-      ECHO_V( n );
-      ECHO_EM(" bytes of memory initialized.\n");
-
-      for(i = 0; i < n; i++)
-        *(ptr+i) = (unsigned char) 0xe5;
-
-      for(i = 0; i < n; i++) {
-        if ( *(ptr+i) != (unsigned char) 0xe5 ) {
-          ECHO_MV("? address : ", (unsigned long) ptr+i );
-          ECHO_MV("=", *(ptr+i) );
-          ECHO_EM("\n");
-        }
-      }
-      m100_not_initialized = 0;
-      ECHO_EM("Done.\n");
-      return;
-    }
-    return;
-  }
-
-  // top_of_stack() returns the location of a variable on its stack frame.  The value returned is above
-  // the stack once the function returns to the caller.
-
-  unsigned char *top_of_stack() {
-    unsigned char x;
-    return &x + 1; // x is pulled on return;
-  }
-
-  //
-  // 3 support routines to print hex numbers.  We can print a nibble, byte and word
-  //
-  void prt_hex_nibble( unsigned int n ) {
-    if ( n <= 9 )
-      ECHO_V(n);
-    else
-      ECHO_V( (char) ('A'+n-10) );
-    delay(2);
-  }
-
-  void prt_hex_byte(unsigned int b) {
-    prt_hex_nibble( ( b & 0xf0 ) >> 4 );
-    prt_hex_nibble(  b & 0x0f );
-  }
-
-  void prt_hex_word(unsigned int w) {
-    prt_hex_byte( ( w & 0xff00 ) >> 8 );
-    prt_hex_byte(  w & 0x0ff );
-  }
-
-  // how_many_E5s_are_here() is a utility function to easily find out how many 0xE5's are
-  // at the specified location.  Having this logic as a function simplifies the search code.
-  //
-  int how_many_E5s_are_here( unsigned char *p) {
-    int n;
-
-    for(n = 0; n < 32000; n++) {
-      if ( *(p+n) != (unsigned char) 0xe5)
-        return n-1;
-    }
-    return -1;
-  }
-
-#endif

MarlinKimbra/MarlinKimbra.ino

@@ -30,27 +30,24 @@
 /* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
 /* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
 
-#include "Configuration.h"
-#include "pins.h"
+#include "base.h"
 
-#ifdef ULTRA_LCD
-  #if defined(LCD_I2C_TYPE_PCF8575)
+#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
+  #include <Wire.h>
+#endif
+#if ENABLED(ULTRA_LCD)
+  #if ENABLED(LCD_I2C_TYPE_PCF8575)
     #include <Wire.h>
     #include <LiquidCrystal_I2C.h>
-  #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
+  #elif ENABLED(LCD_I2C_TYPE_MCP23017) || ENABLED(LCD_I2C_TYPE_MCP23008)
     #include <Wire.h>
     #include <LiquidTWI2.h>
-  #elif defined(DOGLCD)
+  #elif ENABLED(DOGLCD)
     #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
   #else
     #include <LiquidCrystal.h> // library for character LCD
   #endif
 #endif
-
-#if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1
-#include <SPI.h>
-#endif
-
-#if defined(DIGIPOT_I2C)
-  #include <Wire.h>
+#if HAS(DIGIPOTSS)
+  #include <SPI.h>
 #endif

MarlinKimbra/MarlinSerial.cpp

@@ -20,7 +20,8 @@
   Modified 28 September 2010 by Mark Sproul
 */
 
-#include "Marlin.h"
+#include "base.h"
+
 #include "MarlinSerial.h"
 
 #ifndef USBCON
@@ -280,7 +281,6 @@ void MarlinSerial::printFloat(double number, uint8_t digits) {
 }
 // Preinstantiate Objects //////////////////////////////////////////////////////
 
-
 MarlinSerial customizedSerial;
 
 #endif // whole file

MarlinKimbra/MarlinSerial.h

@@ -19,12 +19,14 @@
   Modified 28 September 2010 by Mark Sproul
 */
 
-#ifndef MarlinSerial_h
-#define MarlinSerial_h
-#include "Marlin.h"
+#ifndef MARLINSERIAL_H
+#define MARLINSERIAL_H
 
-#ifndef SERIAL_PORT
-  #define SERIAL_PORT 0
+#ifndef cbi
+  #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#endif
+#ifndef sbi
+  #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
 #endif
 
 // The presence of the UBRRH register is used to detect a UART.

MarlinKimbra/Nextion.h

@@ -32,5 +32,7 @@
 #include "NexSlider.h"
 #include "NexText.h"
 #include "NexWaveform.h"
+#include "NexTimer.h"
+
 
 #endif /* #ifndef __NEXTION_H__ */

MarlinKimbra/Sd2Card.cpp

@@ -17,7 +17,7 @@
  * along with the Arduino Sd2Card Library.  If not, see
  * <http://www.gnu.org/licenses/>.
  */
-#include "Marlin.h"
+#include "base.h"
 
 #if ENABLED(SDSUPPORT)
 #include "Sd2Card.h"

MarlinKimbra/Sd2Card.h

@@ -18,11 +18,11 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "Marlin.h"
-#if ENABLED(SDSUPPORT)
-
 #ifndef Sd2Card_h
 #define Sd2Card_h
+#include "base.h"
+#if ENABLED(SDSUPPORT)
+
 /**
  * \file
  * \brief Sd2Card class for V2 SD/SDHC cards

MarlinKimbra/Sd2PinMap.h

@@ -18,10 +18,6 @@
  * <http://www.gnu.org/licenses/>.
  */
 // Warning this file was generated by a program.
-#include "Marlin.h"
-#include "macros.h"
-
-#if ENABLED(SDSUPPORT)
 
 #ifndef Sd2PinMap_h
 #define Sd2PinMap_h
@@ -434,5 +430,3 @@ static inline __attribute__((always_inline))
 }
 #endif  // Sd2PinMap_h
 
-
-#endif