Commit d57ece57 authored by Simone Primarosa's avatar Simone Primarosa

Update 5.0.0 dev

First flash successuful
parent cb9f5b7c
### Version 5.0.0
* 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
......
......@@ -30,7 +30,7 @@
/* 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 "elements.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
......
......@@ -20,7 +20,7 @@
Modified 28 September 2010 by Mark Sproul
*/
#include "elements.h"
#include "base.h"
#include "MarlinSerial.h"
......
......@@ -27,11 +27,11 @@
* - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
*/
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#include "ultralcd.h"
#include "elements.h"
#include "base.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
#if ENABLED(AUTO_BED_LEVELING_GRID)
......@@ -4282,7 +4282,7 @@ inline void gcode_G92() {
hasS = codenum > 0;
}
if (HASNTP && HASNTS && *args != '\0')
if (!hasP && !hasS && *args != '\0')
lcd_setstatus(args, true);
else {
LCD_MESSAGEPGM(MSG_USERWAIT);
......@@ -8087,7 +8087,9 @@ void kill(const char *lcd_msg) {
sei(); // enable interrupts
for (int i = 5; i--; lcd_update()) delay(200); // Wait a short time
cli(); // disable interrupts
suicide();
#if HAS(SUICIDE)
suicide();
#endif
while(1) { /* Intentionally left empty */ } // Wait for reset
}
......
......@@ -17,7 +17,7 @@
* along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#if ENABLED(SDSUPPORT)
#include "Sd2Card.h"
......
......@@ -20,7 +20,7 @@
#ifndef Sd2Card_h
#define Sd2Card_h
#include "elements.h"
#include "base.h"
#if ENABLED(SDSUPPORT)
/**
......
......@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#if ENABLED(SDSUPPORT)
#include "Marlin_main.h"
#include <stdint.h>
......
......@@ -24,7 +24,7 @@
* \file
* \brief Useful utility functions.
*/
#include "elements.h"
#include "base.h"
#include "MarlinSerial.h"
/** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x))
......
......@@ -17,7 +17,7 @@
* along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#if ENABLED(SDSUPPORT)
#include "Marlin_main.h"
#include "SdFile.h"
......
......@@ -17,7 +17,7 @@
* along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#if ENABLED(SDSUPPORT)
......
#ifndef ELEMENTS_H
#define ELEMENTS_H
#ifndef BASE_H
#define BASE_H
#include "Arduino.h"
#include "pins_arduino.h"
......
......@@ -3,7 +3,7 @@
Created by Tim Koster, August 21 2013.
*/
#include "elements.h"
#include "base.h"
#if ENABLED(BLINKM)
#include "blinkm.h"
......
#include "elements.h"
#include "base.h"
#if HAS(BUZZER)
......
#include "elements.h"
#include "base.h"
#if ENABLED(SDSUPPORT)
......
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
......
#ifndef CONFIGURATION_STORE_H
#define CONFIGURATION_STORE_H
#include "elements.h"
#include "base.h"
void Config_ResetDefault();
void ConfigSD_ResetDefault();
......
#include "elements.h"
#include "base.h"
#if ENABLED(DIGIPOT_I2C)
......
......@@ -3,7 +3,7 @@
* Externa DAC for Alligator Board
*
****************************************************************/
#include "elements.h"
#include "base.h"
#if MB(ALLIGATOR)
#include "stepper.h"
......
......@@ -4,7 +4,7 @@
By MagoKimbra
*/
#include "elements.h"
#include "base.h"
#if ENABLED(FIRMWARE_TEST)
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
......
......@@ -48,7 +48,7 @@
*
*/
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
......
#include "elements.h"
#include "base.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && ENABLED(AUTO_BED_LEVELING_GRID)
#include "qr_solve.h"
......
......@@ -1594,56 +1594,56 @@
#if ENABLED(MKR4)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXIST(E0E1_CHOICE_PIN)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXISTS(E0E1_CHOICE_PIN)
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN to a valid pin if you enable MKR4 with 2 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST(E0E1_CHOICE_PIN) || !PIN_EXIST(E0E2_CHOICE_PIN))
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E0E2_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN and E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 1 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST(E0E1_CHOICE_PIN) || !PIN_EXIST(E0E2_CHOICE_PIN) || !PIN_EXIST(E0E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E0E2_CHOICE_PIN) || !PIN_EXISTS(E0E3_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN, E0E2_CHOICE_PIN and E0E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXIST(E0E2_CHOICE_PIN)
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXISTS(E0E2_CHOICE_PIN)
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 2 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXIST(E0E1_CHOICE_PIN) || !PIN_EXIST(E1E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXISTS(E0E1_CHOICE_PIN) || !PIN_EXISTS(E1E3_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN and E1E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 2 driver
#endif
#endif
#if ENABLED(NPR2) && !PIN_EXIST(E_MIN_PIN)
#if ENABLED(NPR2) && !PIN_EXISTS(E_MIN_PIN)
#error DEPENDENCY ERROR: You have to set E_MIN_PIN to a valid pin if you enable NPR2
#endif
#if ENABLED(LASERBEAM) && (!PIN_EXIST(LASER_PWR_PIN) || !PIN_EXIST(LASER_TTL_PIN))
#if ENABLED(LASERBEAM) && (!PIN_EXISTS(LASER_PWR_PIN) || !PIN_EXISTS(LASER_TTL_PIN))
#error DEPENDENCY ERROR: You have to set LASER_PWR_PIN and LASER_TTL_PIN to a valid pin if you enable LASERBEAM
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXIST(FILRUNOUT_PIN)
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXISTS(FILRUNOUT_PIN)
#error DEPENDENCY ERROR: You have to set FILRUNOUT_PIN to a valid pin if you enable FILAMENT_RUNOUT_SENSOR
#endif
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXIST(FILWIDTH_PIN)
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXISTS(FILWIDTH_PIN)
#error DEPENDENCY ERROR: You have to set FILWIDTH_PIN to a valid pin if you enable FILAMENT_SENSOR
#endif
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXIST(POWER_CONSUMPTION_PIN)
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXISTS(POWER_CONSUMPTION_PIN)
#error DEPENDENCY ERROR: You have to set POWER_CONSUMPTION_PIN to a valid pin if you enable POWER_CONSUMPTION
#endif
#if ENABLED(PHOTOGRAPH) && !PIN_EXIST(PHOTOGRAPH_PIN)
#if ENABLED(PHOTOGRAPH) && !PIN_EXISTS(PHOTOGRAPH_PIN)
#error DEPENDENCY ERROR: You have to set PHOTOGRAPH_PIN to a valid pin if you enable PHOTOGRAPH
#endif
#if ENABLED(CHDK) && !PIN_EXIST(CHDK_PIN)
#if ENABLED(CHDK) && !PIN_EXISTS(CHDK_PIN)
#error DEPENDENCY ERROR: You have to set CHDK_PIN to a valid pin if you enable CHDK
#endif
#if ENABLED(CONTROLLERFAN) && !PIN_EXIST(CONTROLLERFAN_PIN)
#if ENABLED(CONTROLLERFAN) && !PIN_EXISTS(CONTROLLERFAN_PIN)
#error DEPENDENCY ERROR: You have to set CONTROLLERFAN_PIN to a valid pin if you enable CONTROLLERFAN
#endif
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXIST(EXTRUDER_0_AUTO_FAN_PIN) && !PIN_EXIST(EXTRUDER_1_AUTO_FAN_PIN) && !PIN_EXIST(EXTRUDER_2_AUTO_FAN_PIN) && !PIN_EXIST(EXTRUDER_3_AUTO_FAN_PIN)
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXISTS(EXTRUDER_0_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_1_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_2_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_3_AUTO_FAN_PIN)
#error DEPENDENCY ERROR: You have to set at least one EXTRUDER_?_AUTO_FAN_PIN to a valid pin if you enable EXTRUDER_AUTO_FAN
#endif
#if ENABLED(X2_IS_TMC) && (!PIN_EXIST(X2_ENABLE_PIN) || !PIN_EXIST(X2_STEP_PIN) || !PIN_EXIST(X2_DIR_PIN))
#if ENABLED(X2_IS_TMC) && (!PIN_EXISTS(X2_ENABLE_PIN) || !PIN_EXISTS(X2_STEP_PIN) || !PIN_EXISTS(X2_DIR_PIN))
#error DEPENDENCY ERROR: You have to set X2_ENABLE_PIN, X2_STEP_PIN and X2_DIR_PIN to a valid pin if you enable X2_IS_TMC
#endif
......@@ -1651,7 +1651,7 @@
#error DEPENDENCY ERROR: You have to set at least one SERVO?_PIN to a valid pin if you enable ENABLE_SERVOS
#endif
#if ENABLED(Z_PROBE_SLED) !PIN_EXIST(SLED_PIN)
#if ENABLED(Z_PROBE_SLED) && !PIN_EXISTS(SLED_PIN)
#error DEPENDENCY ERROR: You have to set SLED_PIN to a valid pin if you enable Z_PROBE_SLED
#endif
......
......@@ -44,7 +44,7 @@
*/
#include "elements.h"
#include "base.h"
#if HAS(SERVOS)
#include "servo.h"
......
......@@ -22,7 +22,7 @@
/* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
and Philipp Tiefenbacher. */
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
......
......@@ -19,7 +19,7 @@
along with Marlin. If not, see <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#include "stepper_indirection.h"
#if ENABLED(HAVE_TMCDRIVER)
......
......@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "elements.h"
#include "base.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
......
#include "elements.h"
#include "base.h"
#if ENABLED(ULTRA_LCD)
#include "Marlin_main.h"
......
......@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "elements.h"
#include "base.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
......
#include "elements.h"
#include "base.h"
#if ENABLED(USE_WATCHDOG)
#include <avr/wdt.h>
#include "whatchdog.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment