update to v0.18.0 (#76)

Co-authored-by: Javier97sm <[email protected]>

Marlin/Configuration.h

@@ -95,7 +95,7 @@
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 // build by the user have been successfully uploaded into firmware.
-#define STRING_CONFIG_H_AUTHOR "(J Monell, Epsilon config)" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "(BCN3D, Epsilon config)" // Who made the changes.
 #define SHOW_BOOTSCREEN
 #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
 #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
@@ -847,7 +847,7 @@
  *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
  */
 #define Z_CLEARANCE_DEPLOY_PROBE	7 // Z Clearance for Deploy/Stow
-#define Z_CLEARANCE_BETWEEN_PROBES	7 // Z Clearance between probe points
+#define Z_CLEARANCE_BETWEEN_PROBES	3 // Z Clearance between probe points
 #define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
 #define Z_AFTER_PROBING				5 // Z position after probing is done
 
@@ -1114,7 +1114,7 @@
   //=================================== Mesh ==================================
   //===========================================================================
 
-  #define MESH_INSET 10          // Set Mesh bounds as an inset region of the bed
+  #define MESH_INSET 20          // Set Mesh bounds as an inset region of the bed
   #define GRID_MAX_POINTS_X 3    // Don't use more than 7 points per axis, implementation limited.
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
 
@@ -1189,7 +1189,7 @@
 #endif
 
 // Homing speeds (mm/m)
-#define HOMING_FEEDRATE_XY (90*60)
+#define HOMING_FEEDRATE_XY (110*60)
 #define HOMING_FEEDRATE_Z  (8*50)
 
 // @section calibrate

Marlin/Door_Monitoring.cpp

@@ -6,20 +6,26 @@
 
 Door_Monitoring door_monitor;
 
-uint8_t Door_Monitoring::door_count = 0; // = 0
-bool Door_Monitoring::door_state = false; // = false
+uint8_t Door_Monitoring::door_count = 0;
+bool Door_Monitoring::door_state = false;
+uint8_t Door_Monitoring::safe_stop_pinout = SAFE_STOP_PIN;
 
 void Door_Monitoring::setup() {
 
 	#define INIT_DOOR_PIN(P) pinMode(P, INPUT)
 
-	INIT_DOOR_PIN(SAFE_STOP_PIN);
+	INIT_DOOR_PIN(safe_stop_pinout);
 
 }
+
 void Door_Monitoring::report(){
 	SERIAL_PROTOCOLPGM("door: ");
 	SERIAL_PROTOCOLLN(Door_Monitoring::door_state);
 }
 
+void Door_Monitoring::updatePin(bool hasNewElectronics){
+	if (hasNewElectronics) safe_stop_pinout = SAFE_STOP_PIN_PHERIPHERALS_BOARD;
+	else safe_stop_pinout = SAFE_STOP_PIN;
+}
 
 #endif // BCN3D mod

Marlin/Door_Monitoring.h

@@ -18,6 +18,8 @@ class Door_Monitoring {
 	static void setup();
 
 	static void report();
+
+    static void updatePin(bool hasNewElectronics);
 
 	FORCE_INLINE static void run() {
 
@@ -31,11 +33,12 @@ class Door_Monitoring {
 	private:
 	static uint8_t door_count;
 	static bool door_state;
+	static uint8_t safe_stop_pinout;
 
 	FORCE_INLINE static bool check() {
 
 		// Read the sensor for the active extruder
-		bool is_out = digitalRead(SAFE_STOP_PIN) == false; 
+		bool is_out = digitalRead(safe_stop_pinout) == false; 
 
 		if(is_out){
 

Marlin/FRS_Monitoring.cpp

@@ -9,21 +9,26 @@ FRS_Monitoring frs_monitor;
 
 uint8_t FRS_Monitoring::runout_count[EXTRUDERS]={ 0 }; // = 0
 bool FRS_Monitoring::runout_state[EXTRUDERS]={ false, false }; // = 0
+bool FRS_Monitoring::invert_pins = false; //for new electronics Peripherals
 
 void FRS_Monitoring::setup() {
 
 	#define INIT_RUNOUT_PIN(P) pinMode(P, INPUT)
 
 	INIT_RUNOUT_PIN(FIL_RUNOUT_PIN);
 	INIT_RUNOUT_PIN(FIL_RUNOUT2_PIN);
-
 }
+
 void FRS_Monitoring::report(){
 	SERIAL_PROTOCOLPGM("frsID0: ");
 	SERIAL_PROTOCOL(FRS_Monitoring::runout_state[0]);
 	SERIAL_PROTOCOLPGM(" frsID1: ");
 	SERIAL_PROTOCOLLN(FRS_Monitoring::runout_state[1]);	
 }
+
+void FRS_Monitoring::updatePins(const bool hasNewElectronics) {
+	invert_pins = hasNewElectronics;
+}
 
 
 #endif // BCN3D mod

Marlin/FRS_Monitoring.h

@@ -19,6 +19,8 @@ class FRS_Monitoring {
 	static void setup();
 
 	static void report();
+
+    static void updatePins(const bool hasNewElectronics);
 
 	FORCE_INLINE static void run() {
 		bool change = false;
@@ -34,14 +36,15 @@ class FRS_Monitoring {
 	private:
 	static uint8_t runout_count[EXTRUDERS];
 	static bool runout_state[EXTRUDERS];
+	static bool invert_pins;
 
 	FORCE_INLINE static bool check(uint8_t extruder) {
 
 		// Read the sensor for the active extruder
 		bool is_out;
 		switch (extruder) {
-			case 0: is_out = digitalRead(FIL_RUNOUT_PIN) == true; break;
-			case 1: is_out = digitalRead(FIL_RUNOUT2_PIN) == true; break;
+			case 0: is_out = digitalRead(FIL_RUNOUT_PIN) == !invert_pins; break;
+			case 1: is_out = digitalRead(FIL_RUNOUT2_PIN) == !invert_pins; break;
 		}
 
 		if(is_out){

Marlin/Marlin.h

@@ -250,6 +250,8 @@ void setup_for_endstop_or_probe_move();
 bool G40_run_probe(float xPos, float yPos);
 void clean_up_after_endstop_or_probe_move();
 
+void set_current_from_steppers_for_axis(const AxisEnum axis);
+
 #if IS_KINEMATIC
   void sync_plan_position_kinematic();
   #define SYNC_PLAN_POSITION_KINEMATIC() sync_plan_position_kinematic()