From d049d096233abafe1439b7436f5b86bc72a757fb Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 28 Aug 2022 17:54:56 +0300 Subject: [PATCH] Isolate FARM_DEFAULT_SAFETYTIMER_TIME_ms --- Firmware/Prusa_farm.h | 2 ++ Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 - Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 1 - Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 1 - 9 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Firmware/Prusa_farm.h b/Firmware/Prusa_farm.h index 40066db9c..3e326b63b 100644 --- a/Firmware/Prusa_farm.h +++ b/Firmware/Prusa_farm.h @@ -3,6 +3,8 @@ #include #include "Configuration.h" +#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) + #ifdef PRUSA_FARM extern uint8_t farm_mode; #else diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 447776f7f..931314333 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -118,7 +118,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Online crash dumper #define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 42937a3d5..5c06e2274 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -119,7 +119,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Online crash dumper #define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index f0bdf23cc..26d60622e 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -118,7 +118,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Online crash dumper #define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 39eac9300..83ba541fd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -119,7 +119,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Online crash dumper #define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index f6b483e64..0f5594da3 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -138,7 +138,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Offline crash dumper #define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index b3cbd1e7f..82f8d4d83 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -140,7 +140,6 @@ // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) // Offline crash dumper #define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 6565ee30a..4976a069a 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -429,7 +429,6 @@ THERMISTORS SETTINGS // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) #define M600_TIMEOUT 600 //seconds diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 93006d4a2..59e16429e 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -418,7 +418,6 @@ THERMISTORS SETTINGS // Safety timer #define SAFETYTIMER #define DEFAULT_SAFETYTIMER_TIME_MINS 30 -#define FARM_DEFAULT_SAFETYTIMER_TIME_ms (45*60*1000ul) #define M600_TIMEOUT 600 //seconds