diff --git a/g2core/controller.cpp b/g2core/controller.cpp index 1925fb2a..419c8a53 100644 --- a/g2core/controller.cpp +++ b/g2core/controller.cpp @@ -324,7 +324,9 @@ void _reset_comms_mode() { // reset the communications mode cs.comm_mode = COMM_MODE; js.json_mode = (COMM_MODE < AUTO_MODE) ? COMM_MODE : JSON_MODE; +#if MARLIN_COMPAT_ENABLED == true mst.marlin_flavor = false; +#endif sr.status_report_verbosity = STATUS_REPORT_VERBOSITY; qr.queue_report_verbosity = QUEUE_REPORT_VERBOSITY; } diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h index dead597e..1316d84a 100644 --- a/g2core/settings/settings_default.h +++ b/g2core/settings/settings_default.h @@ -937,6 +937,9 @@ #ifndef H1_DEFAULT_D #define H1_DEFAULT_D 400.0 #endif +#ifndef H1_DEFAULT_F +#define H1_DEFAULT_F 0.0 +#endif #ifndef H2_DEFAULT_ENABLE #define H2_DEFAULT_ENABLE false @@ -950,6 +953,9 @@ #ifndef H2_DEFAULT_D #define H2_DEFAULT_D 400.0 #endif +#ifndef H2_DEFAULT_F +#define H2_DEFAULT_F 0.0 +#endif #ifndef H3_DEFAULT_ENABLE #define H3_DEFAULT_ENABLE false @@ -963,6 +969,9 @@ #ifndef H3_DEFAULT_D #define H3_DEFAULT_D 400.0 #endif +#ifndef H3_DEFAULT_F +#define H3_DEFAULT_F 0.0 +#endif // *** DEFAULT COORDINATE SYSTEM OFFSETS *** diff --git a/g2core/temperature.cpp b/g2core/temperature.cpp index 6402e0da..a218ebfa 100755 --- a/g2core/temperature.cpp +++ b/g2core/temperature.cpp @@ -52,14 +52,12 @@ #define HAS_TEMPERATURE_SENSOR_3 false #endif #ifndef EXTRUDER_1_OUTPUT_PIN -#warning using default extruder 1 output pin #define EXTRUDER_1_OUTPUT_PIN kOutput1_PinNumber #endif #ifndef EXTRUDER_1_FAN_PIN #define EXTRUDER_1_FAN_PIN kOutput3_PinNumber #endif #ifndef EXTRUDER_2_OUTPUT_PIN -#warning using default extruder 2 output pin #define EXTRUDER_2_OUTPUT_PIN kOutput2_PinNumber #endif #ifndef BED_OUTPUT_PIN