From 888443ca1eaf3427408a1337e5fa8d4548c64dd1 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Fri, 13 May 2016 21:10:23 +0900 Subject: [PATCH] Enclose all #error strings with apostrophes --- Marlin/Conditionals.h | 8 +- Marlin/Marlin.h | 2 +- Marlin/MarlinSerial.h | 2 +- Marlin/Marlin_main.cpp | 4 +- Marlin/SanityCheck.h | 208 ++++++++++++++++----------------- Marlin/Sd2Card.cpp | 2 +- Marlin/Sd2PinMap.h | 2 +- Marlin/fastio.h | 2 +- Marlin/pins.h | 2 +- Marlin/pins_5DPRINT.h | 2 +- Marlin/pins_A4JP.h | 2 +- Marlin/pins_BQ_ZUM_MEGA_3D.h | 2 +- Marlin/pins_BRAINWAVE.h | 2 +- Marlin/pins_BRAINWAVE_PRO.h | 4 +- Marlin/pins_CHEAPTRONIC.h | 2 +- Marlin/pins_ELEFU_3.h | 2 +- Marlin/pins_GEN3_MONOLITHIC.h | 2 +- Marlin/pins_GEN3_PLUS.h | 2 +- Marlin/pins_GEN6.h | 2 +- Marlin/pins_GEN7_12.h | 2 +- Marlin/pins_GEN7_14.h | 2 +- Marlin/pins_GEN7_CUSTOM.h | 2 +- Marlin/pins_LEAPFROG.h | 2 +- Marlin/pins_MEGACONTROLLER.h | 4 +- Marlin/pins_MEGATRONICS.h | 2 +- Marlin/pins_MEGATRONICS_2.h | 2 +- Marlin/pins_MEGATRONICS_3.h | 2 +- Marlin/pins_MINIRAMBO.h | 2 +- Marlin/pins_MINITRONICS.h | 2 +- Marlin/pins_OMCA.h | 2 +- Marlin/pins_OMCA_A.h | 2 +- Marlin/pins_PRINTRBOARD.h | 4 +- Marlin/pins_PRINTRBOARD_REVF.h | 4 +- Marlin/pins_RAMBO.h | 2 +- Marlin/pins_RAMPS_14.h | 2 +- Marlin/pins_RAMPS_OLD.h | 2 +- Marlin/pins_RUMBA.h | 4 +- Marlin/pins_SANGUINOLOLU_11.h | 2 +- Marlin/pins_SAV_MKI.h | 2 +- Marlin/pins_SETHI.h | 2 +- Marlin/pins_TEENSY2.h | 4 +- Marlin/pins_TEENSYLU.h | 4 +- Marlin/pins_ULTIMAIN_2.h | 2 +- Marlin/pins_ULTIMAKER.h | 2 +- Marlin/pins_ULTIMAKER_OLD.h | 2 +- Marlin/thermistortables.h | 10 +- Marlin/utf_mapper.h | 10 +- 47 files changed, 169 insertions(+), 169 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 41dcec76c..c6048b25d 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -478,7 +478,7 @@ #endif #if TEMP_SENSOR_1 <= -2 - #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_1 + #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_1" #elif TEMP_SENSOR_1 == -1 #define HEATER_1_USES_AD595 #elif TEMP_SENSOR_1 == 0 @@ -490,7 +490,7 @@ #endif #if TEMP_SENSOR_2 <= -2 - #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_2 + #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_2" #elif TEMP_SENSOR_2 == -1 #define HEATER_2_USES_AD595 #elif TEMP_SENSOR_2 == 0 @@ -502,7 +502,7 @@ #endif #if TEMP_SENSOR_3 <= -2 - #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_3 + #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_3" #elif TEMP_SENSOR_3 == -1 #define HEATER_3_USES_AD595 #elif TEMP_SENSOR_3 == 0 @@ -514,7 +514,7 @@ #endif #if TEMP_SENSOR_BED <= -2 - #error MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_BED + #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_BED" #elif TEMP_SENSOR_BED == -1 #define BED_USES_AD595 #elif TEMP_SENSOR_BED == 0 diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 1a4f04d07..1b19430cd 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -45,7 +45,7 @@ #include "pins.h" #ifndef SANITYCHECK_H - #error Your Configuration.h and Configuration_adv.h files are outdated! + #error "Your Configuration.h and Configuration_adv.h files are outdated!" #endif #include "Arduino.h" diff --git a/Marlin/MarlinSerial.h b/Marlin/MarlinSerial.h index 6af14557e..34d234615 100644 --- a/Marlin/MarlinSerial.h +++ b/Marlin/MarlinSerial.h @@ -88,7 +88,7 @@ #define RX_BUFFER_SIZE 128 #endif #if !((RX_BUFFER_SIZE == 256) ||(RX_BUFFER_SIZE == 128) ||(RX_BUFFER_SIZE == 64) ||(RX_BUFFER_SIZE == 32) ||(RX_BUFFER_SIZE == 16) ||(RX_BUFFER_SIZE == 8) ||(RX_BUFFER_SIZE == 4) ||(RX_BUFFER_SIZE == 2)) - #error RX_BUFFER_SIZE has to be a power of 2 and >= 2 + #error "RX_BUFFER_SIZE has to be a power of 2 and >= 2" #endif struct ring_buffer { diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 99786e617..966cfd5fc 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3953,10 +3953,10 @@ inline void gcode_M42() { */ #if ENABLED(Z_MIN_PROBE_ENDSTOP) #if !HAS_Z_MIN_PROBE_PIN - #error You must define Z_MIN_PROBE_PIN to enable Z probe repeatability calculation. + #error "You must define Z_MIN_PROBE_PIN to enable Z probe repeatability calculation." #endif #elif !HAS_Z_MIN - #error You must define Z_MIN_PIN to enable Z probe repeatability calculation. + #error "You must define Z_MIN_PIN to enable Z probe repeatability calculation." #endif /** diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index c2b189037..4f254cd0e 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -35,49 +35,49 @@ * action to proceed with compilation in such environments. */ #if !defined(ARDUINO) || ARDUINO < 10600 - #error Versions of Arduino IDE prior to 1.6.0 are no longer supported, please update your toolkit. + #error "Versions of Arduino IDE prior to 1.6.0 are no longer supported, please update your toolkit." #endif /** * Marlin release, version and default string */ #ifndef SHORT_BUILD_VERSION - #error SHORT_BUILD_VERSION Information must be specified + #error "SHORT_BUILD_VERSION Information must be specified" #endif #ifndef DETAILED_BUILD_VERSION - #error BUILD_VERSION Information must be specified + #error "BUILD_VERSION Information must be specified" #endif #ifndef STRING_DISTRIBUTION_DATE - #error STRING_DISTRIBUTION_DATE Information must be specified + #error "STRING_DISTRIBUTION_DATE Information must be specified" #endif #ifndef PROTOCOL_VERSION - #error PROTOCOL_VERSION Information must be specified + #error "PROTOCOL_VERSION Information must be specified" #endif #ifndef MACHINE_NAME - #error MACHINE_NAME Information must be specified + #error "MACHINE_NAME Information must be specified" #endif #ifndef SOURCE_CODE_URL - #error SOURCE_CODE_URL Information must be specified + #error "SOURCE_CODE_URL Information must be specified" #endif #ifndef DEFAULT_MACHINE_UUID - #error DEFAULT_MACHINE_UUID Information must be specified + #error "DEFAULT_MACHINE_UUID Information must be specified" #endif #ifndef WEBSITE_URL - #error WEBSITE_URL Information must be specified + #error "WEBSITE_URL Information must be specified" #endif /** * Dual Stepper Drivers */ #if ENABLED(Z_DUAL_STEPPER_DRIVERS) && ENABLED(Y_DUAL_STEPPER_DRIVERS) - #error You cannot have dual stepper drivers for both Y and Z. + #error "You cannot have dual stepper drivers for both Y and Z." #endif /** @@ -85,13 +85,13 @@ */ #if ENABLED(LCD_PROGRESS_BAR) #if DISABLED(SDSUPPORT) - #error LCD_PROGRESS_BAR requires SDSUPPORT. + #error "LCD_PROGRESS_BAR requires SDSUPPORT." #endif #if ENABLED(DOGLCD) - #error LCD_PROGRESS_BAR does not apply to graphical displays. + #error "LCD_PROGRESS_BAR does not apply to graphical displays." #endif #if ENABLED(FILAMENT_LCD_DISPLAY) - #error LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both. + #error "LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both." #endif #endif @@ -100,13 +100,13 @@ */ #if ENABLED(BABYSTEPPING) #if DISABLED(ULTRA_LCD) - #error BABYSTEPPING requires an LCD controller. + #error "BABYSTEPPING requires an LCD controller." #endif #if ENABLED(SCARA) - #error BABYSTEPPING is not implemented for SCARA yet. + #error "BABYSTEPPING is not implemented for SCARA yet." #endif #if ENABLED(DELTA) && ENABLED(BABYSTEP_XY) - #error BABYSTEPPING only implemented for Z axis on deltabots. + #error "BABYSTEPPING only implemented for Z axis on deltabots." #endif #endif @@ -114,7 +114,7 @@ * Filament Change with Extruder Runout Prevention */ #if ENABLED(FILAMENTCHANGEENABLE) && ENABLED(EXTRUDER_RUNOUT_PREVENT) - #error EXTRUDER_RUNOUT_PREVENT currently incompatible with FILAMENTCHANGE. + #error "EXTRUDER_RUNOUT_PREVENT currently incompatible with FILAMENTCHANGE." #endif /** @@ -123,23 +123,23 @@ #if EXTRUDERS > 1 #if EXTRUDERS > 4 - #error The maximum number of EXTRUDERS in Marlin is 4. + #error "The maximum number of EXTRUDERS in Marlin is 4." #endif #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) - #error EXTRUDERS must be 1 with TEMP_SENSOR_1_AS_REDUNDANT. + #error "EXTRUDERS must be 1 with TEMP_SENSOR_1_AS_REDUNDANT." #endif #if ENABLED(HEATERS_PARALLEL) - #error EXTRUDERS must be 1 with HEATERS_PARALLEL. + #error "EXTRUDERS must be 1 with HEATERS_PARALLEL." #endif #if ENABLED(Y_DUAL_STEPPER_DRIVERS) - #error EXTRUDERS must be 1 with Y_DUAL_STEPPER_DRIVERS. + #error "EXTRUDERS must be 1 with Y_DUAL_STEPPER_DRIVERS." #endif #if ENABLED(Z_DUAL_STEPPER_DRIVERS) - #error EXTRUDERS must be 1 with Z_DUAL_STEPPER_DRIVERS. + #error "EXTRUDERS must be 1 with Z_DUAL_STEPPER_DRIVERS." #endif #endif // EXTRUDERS > 1 @@ -148,16 +148,16 @@ * Limited number of servos */ #if NUM_SERVOS > 4 - #error The maximum number of SERVOS in Marlin is 4. + #error "The maximum number of SERVOS in Marlin is 4." #endif #if defined(NUM_SERVOS) && NUM_SERVOS > 0 #if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0 #if X_ENDSTOP_SERVO_NR >= NUM_SERVOS - #error X_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS. + #error "X_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS." #elif Y_ENDSTOP_SERVO_NR >= NUM_SERVOS - #error Y_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS. + #error "Y_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS." #elif Z_ENDSTOP_SERVO_NR >= NUM_SERVOS - #error Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS. + #error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS." #endif #endif #endif @@ -166,21 +166,21 @@ * Servo deactivation depends on servo endstops */ #if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_SERVO_ENDSTOPS - #error At least one of the ?_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE. + #error "At least one of the ?_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE." #endif /** * Required LCD language */ #if DISABLED(DOGLCD) && ENABLED(ULTRA_LCD) && !defined(DISPLAY_CHARSET_HD44780) - #error You must set DISPLAY_CHARSET_HD44780 to JAPANESE, WESTERN or CYRILLIC for your LCD controller. + #error "You must set DISPLAY_CHARSET_HD44780 to JAPANESE, WESTERN or CYRILLIC for your LCD controller." #endif /** * Bed Heating Options - PID vs Limit Switching */ #if ENABLED(PIDTEMPBED) && ENABLED(BED_LIMIT_SWITCHING) - #error To use BED_LIMIT_SWITCHING you must disable PIDTEMPBED. + #error "To use BED_LIMIT_SWITCHING you must disable PIDTEMPBED." #endif /** @@ -188,16 +188,16 @@ */ #if ENABLED(MESH_BED_LEVELING) #if ENABLED(DELTA) - #error MESH_BED_LEVELING does not yet support DELTA printers. + #error "MESH_BED_LEVELING does not yet support DELTA printers." #endif #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #error Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both. + #error "Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both." #endif #if MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7 - #error MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8. + #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8." #endif #elif ENABLED(MANUAL_BED_LEVELING) - #error MESH_BED_LEVELING is required for MANUAL_BED_LEVELING. + #error "MESH_BED_LEVELING is required for MANUAL_BED_LEVELING." #endif /** @@ -210,21 +210,21 @@ * A probe needs a pin */ #if !PROBE_PIN_CONFIGURED - #error A probe needs a pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN. + #error "A probe needs a pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN." #endif /** * Z_MIN_PIN and Z_MIN_PROBE_PIN can't co-exist when Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN */ #if HAS_Z_MIN && HAS_Z_MIN_PROBE_PIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) - #error A probe cannot have more than one pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN. + #error "A probe cannot have more than one pin! Use Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN or Z_MIN_PROBE_PIN." #endif /** * Make sure the plug is enabled if it's used */ #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && DISABLED(USE_ZMIN_PLUG) - #error You must enable USE_ZMIN_PLUG if any probe or endstop is connected to the ZMIN plug. + #error "You must enable USE_ZMIN_PLUG if any probe or endstop is connected to the ZMIN plug." #endif /** @@ -233,7 +233,7 @@ #if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \ || (ENABLED(MECHANICAL_PROBE) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \ || (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED)) - #error Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE. + #error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #endif /** @@ -244,7 +244,7 @@ #elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) && ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) #error "Don't enable DISABLE_Z_MIN_PROBE_ENDSTOP with Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN." #elif ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP) && DISABLED(Z_MIN_PROBE_ENDSTOP) - #error DISABLE_Z_MIN_PROBE_ENDSTOP requires Z_MIN_PROBE_ENDSTOP to be set. + #error "DISABLE_Z_MIN_PROBE_ENDSTOP requires Z_MIN_PROBE_ENDSTOP to be set." #endif /** @@ -256,16 +256,16 @@ #endif // Forcing Servo definitions can break some hall effect sensor setups. Leaving these here for further comment. //#ifndef NUM_SERVOS - // #error You must have NUM_SERVOS defined and there must be at least 1 configured to use Z_MIN_PROBE_ENDSTOP. + // #error "You must have NUM_SERVOS defined and there must be at least 1 configured to use Z_MIN_PROBE_ENDSTOP." //#endif //#if defined(NUM_SERVOS) && NUM_SERVOS < 1 - // #error You must have at least 1 servo defined for NUM_SERVOS to use Z_MIN_PROBE_ENDSTOP. + // #error "You must have at least 1 servo defined for NUM_SERVOS to use Z_MIN_PROBE_ENDSTOP." //#endif //#if Z_ENDSTOP_SERVO_NR < 0 - // #error You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_MIN_PROBE_ENDSTOP. + // #error "You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_MIN_PROBE_ENDSTOP." //#endif //#ifndef SERVO_ENDSTOP_ANGLES - // #error You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_MIN_PROBE_ENDSTOP. + // #error "You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_MIN_PROBE_ENDSTOP." //#endif #endif @@ -275,7 +275,7 @@ * Require some kind of probe for bed leveling */ #if ENABLED(AUTO_BED_LEVELING_FEATURE) - #error AUTO_BED_LEVELING_FEATURE requires a probe! Define a Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE. + #error "AUTO_BED_LEVELING_FEATURE requires a probe! Define a Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE." #endif #endif @@ -291,9 +291,9 @@ #if !PIN_EXISTS(Z_MIN) #if !PIN_EXISTS(Z_MIN_PROBE) || (DISABLED(Z_MIN_PROBE_ENDSTOP) || ENABLED(DISABLE_Z_MIN_PROBE_ENDSTOP)) // It's possible for someone to set a pin for the Z probe, but not enable it. #if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST) - #error You must have a Z_MIN or Z_PROBE endstop to enable Z_MIN_PROBE_REPEATABILITY_TEST. + #error "You must have a Z_MIN or Z_PROBE endstop to enable Z_MIN_PROBE_REPEATABILITY_TEST." #else - #error AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin. + #error "AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_MIN_PROBE_PIN must point to a valid hardware pin." #endif #endif #endif @@ -305,9 +305,9 @@ #ifndef DELTA_PROBEABLE_RADIUS // Be sure points are in the right order #if LEFT_PROBE_BED_POSITION > RIGHT_PROBE_BED_POSITION - #error LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION. + #error "LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION." #elif FRONT_PROBE_BED_POSITION > BACK_PROBE_BED_POSITION - #error FRONT_PROBE_BED_POSITION must be less than BACK_PROBE_BED_POSITION. + #error "FRONT_PROBE_BED_POSITION must be less than BACK_PROBE_BED_POSITION." #endif // Make sure probing points are reachable #if LEFT_PROBE_BED_POSITION < MIN_PROBE_X @@ -345,7 +345,7 @@ * Filament Width Sensor */ #if ENABLED(FILAMENT_WIDTH_SENSOR) && !HAS_FILAMENT_WIDTH_SENSOR - #error FILAMENT_WIDTH_SENSOR requires a FILWIDTH_PIN to be defined. + #error "FILAMENT_WIDTH_SENSOR requires a FILWIDTH_PIN to be defined." #endif @@ -353,11 +353,11 @@ * ULTIPANEL encoder */ #if ENABLED(ULTIPANEL) && DISABLED(NEWPANEL) && DISABLED(SR_LCD_2W_NL) && !defined(SHIFT_CLK) - #error ULTIPANEL requires some kind of encoder. + #error "ULTIPANEL requires some kind of encoder." #endif #if ENCODER_PULSES_PER_STEP < 0 - #error ENCODER_PULSES_PER_STEP should not be negative, use REVERSE_MENU_DIRECTION instead + #error "ENCODER_PULSES_PER_STEP should not be negative, use REVERSE_MENU_DIRECTION instead" #endif /** @@ -368,11 +368,11 @@ #if ENABLED(AUTO_BED_LEVELING_FEATURE) #if DISABLED(AUTO_BED_LEVELING_GRID) - #error Only AUTO_BED_LEVELING_GRID is supported with DELTA. + #error "Only AUTO_BED_LEVELING_GRID is supported with DELTA." #endif #if ENABLED(Z_PROBE_SLED) - #error You cannot use Z_PROBE_SLED with DELTA. + #error "You cannot use Z_PROBE_SLED with DELTA." #endif #endif @@ -383,7 +383,7 @@ * Allen Key Z probe requires Auto Bed Leveling grid and Delta */ #if ENABLED(Z_PROBE_ALLEN_KEY) && !(ENABLED(AUTO_BED_LEVELING_GRID) && ENABLED(DELTA)) - #error Invalid use of Z_PROBE_ALLEN_KEY. + #error "Invalid use of Z_PROBE_ALLEN_KEY." #endif /** @@ -394,10 +394,10 @@ || !HAS_X2_ENABLE || !HAS_X2_STEP || !HAS_X2_DIR \ || !defined(X2_HOME_POS) || !defined(X2_MIN_POS) || !defined(X2_MAX_POS) \ || !HAS_X_MAX - #error Missing or invalid definitions for DUAL_X_CARRIAGE mode. + #error "Missing or invalid definitions for DUAL_X_CARRIAGE mode." #endif #if X_HOME_DIR != -1 || X2_HOME_DIR != 1 - #error Please use canonical x-carriage assignment. + #error "Please use canonical x-carriage assignment." #endif #endif // DUAL_X_CARRIAGE @@ -407,30 +407,30 @@ #if HAS_AUTO_FAN #if HAS_FAN0 #if EXTRUDER_0_AUTO_FAN_PIN == FAN_PIN - #error You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to FAN_PIN. + #error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to FAN_PIN." #elif EXTRUDER_1_AUTO_FAN_PIN == FAN_PIN - #error You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to FAN_PIN. + #error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to FAN_PIN." #elif EXTRUDER_2_AUTO_FAN_PIN == FAN_PIN - #error You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to FAN_PIN. + #error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to FAN_PIN." #elif EXTRUDER_3_AUTO_FAN_PIN == FAN_PIN - #error You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to FAN_PIN. + #error "You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to FAN_PIN." #endif #endif #endif #if HAS_FAN0 && CONTROLLERFAN_PIN == FAN_PIN - #error You cannot set CONTROLLERFAN_PIN equal to FAN_PIN. + #error "You cannot set CONTROLLERFAN_PIN equal to FAN_PIN." #endif #if HAS_CONTROLLERFAN #if EXTRUDER_0_AUTO_FAN_PIN == CONTROLLERFAN_PIN - #error You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN. + #error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN." #elif EXTRUDER_1_AUTO_FAN_PIN == CONTROLLERFAN_PIN - #error You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN. + #error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN." #elif EXTRUDER_2_AUTO_FAN_PIN == CONTROLLERFAN_PIN - #error You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN. + #error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN." #elif EXTRUDER_3_AUTO_FAN_PIN == CONTROLLERFAN_PIN - #error You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN. + #error "You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN." #endif #endif @@ -439,110 +439,110 @@ */ #if EXTRUDERS > 3 #if TEMP_SENSOR_3 == 0 - #error TEMP_SENSOR_3 is required with 4 EXTRUDERS. + #error "TEMP_SENSOR_3 is required with 4 EXTRUDERS." #elif !HAS_HEATER_3 - #error HEATER_3_PIN not defined for this board. + #error "HEATER_3_PIN not defined for this board." #elif !PIN_EXISTS(TEMP_3) - #error TEMP_3_PIN not defined for this board. + #error "TEMP_3_PIN not defined for this board." #elif !PIN_EXISTS(E3_STEP) || !PIN_EXISTS(E3_DIR) || !PIN_EXISTS(E3_ENABLE) - #error E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board. + #error "E3_STEP_PIN, E3_DIR_PIN, or E3_ENABLE_PIN not defined for this board." #endif #elif EXTRUDERS > 2 #if TEMP_SENSOR_2 == 0 - #error TEMP_SENSOR_2 is required with 3 or more EXTRUDERS. + #error "TEMP_SENSOR_2 is required with 3 or more EXTRUDERS." #elif !HAS_HEATER_2 - #error HEATER_2_PIN not defined for this board. + #error "HEATER_2_PIN not defined for this board." #elif !PIN_EXISTS(TEMP_2) - #error TEMP_2_PIN not defined for this board. + #error "TEMP_2_PIN not defined for this board." #elif !PIN_EXISTS(E2_STEP) || !PIN_EXISTS(E2_DIR) || !PIN_EXISTS(E2_ENABLE) - #error E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board. + #error "E2_STEP_PIN, E2_DIR_PIN, or E2_ENABLE_PIN not defined for this board." #endif #elif EXTRUDERS > 1 #if TEMP_SENSOR_1 == 0 - #error TEMP_SENSOR_1 is required with 2 or more EXTRUDERS. + #error "TEMP_SENSOR_1 is required with 2 or more EXTRUDERS." #elif !PIN_EXISTS(TEMP_1) - #error TEMP_1_PIN not defined for this board. + #error "TEMP_1_PIN not defined for this board." #elif !PIN_EXISTS(E1_STEP) || !PIN_EXISTS(E1_DIR) || !PIN_EXISTS(E1_ENABLE) - #error E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board. + #error "E1_STEP_PIN, E1_DIR_PIN, or E1_ENABLE_PIN not defined for this board." #endif #endif #if EXTRUDERS > 1 || ENABLED(HEATERS_PARALLEL) #if !HAS_HEATER_1 - #error HEATER_1_PIN not defined for this board. + #error "HEATER_1_PIN not defined for this board." #endif #endif #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) && TEMP_SENSOR_1 == 0 - #error TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT. + #error "TEMP_SENSOR_1 is required with TEMP_SENSOR_1_AS_REDUNDANT." #endif #if !HAS_HEATER_0 - #error HEATER_0_PIN not defined for this board. + #error "HEATER_0_PIN not defined for this board." #elif !PIN_EXISTS(TEMP_0) - #error TEMP_0_PIN not defined for this board. + #error "TEMP_0_PIN not defined for this board." #elif !PIN_EXISTS(E0_STEP) || !PIN_EXISTS(E0_DIR) || !PIN_EXISTS(E0_ENABLE) - #error E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board. + #error "E0_STEP_PIN, E0_DIR_PIN, or E0_ENABLE_PIN not defined for this board." #elif TEMP_SENSOR_0 == 0 - #error TEMP_SENSOR_0 is required. + #error "TEMP_SENSOR_0 is required." #endif /** * Endstops */ #if DISABLED(USE_XMIN_PLUG) && DISABLED(USE_XMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _XMAX_ && Z2_USE_ENDSTOP <= _XMIN_) - #error You must enable USE_XMIN_PLUG or USE_XMAX_PLUG + #error "You must enable USE_XMIN_PLUG or USE_XMAX_PLUG" #elif DISABLED(USE_YMIN_PLUG) && DISABLED(USE_YMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _YMAX_ && Z2_USE_ENDSTOP <= _YMIN_) - #error You must enable USE_YMIN_PLUG or USE_YMAX_PLUG + #error "You must enable USE_YMIN_PLUG or USE_YMAX_PLUG" #elif DISABLED(USE_ZMIN_PLUG) && DISABLED(USE_ZMAX_PLUG) && !(ENABLED(Z_DUAL_ENDSTOPS) && Z2_USE_ENDSTOP >= _ZMAX_ && Z2_USE_ENDSTOP <= _ZMIN_) - #error You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG + #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG" #elif ENABLED(Z_DUAL_ENDSTOPS) && !Z2_USE_ENDSTOP - #error You must set Z2_USE_ENDSTOP with Z_DUAL_ENDSTOPS + #error "You must set Z2_USE_ENDSTOP with Z_DUAL_ENDSTOPS" #endif /** * Warnings for old configurations */ #if WATCH_TEMP_PERIOD > 500 - #error WATCH_TEMP_PERIOD now uses seconds instead of milliseconds. + #error "WATCH_TEMP_PERIOD now uses seconds instead of milliseconds." #elif DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD)) - #error Thermal Runaway Protection for hotends is now enabled with THERMAL_PROTECTION_HOTENDS. + #error "Thermal Runaway Protection for hotends is now enabled with THERMAL_PROTECTION_HOTENDS." #elif DISABLED(THERMAL_PROTECTION_BED) && defined(THERMAL_PROTECTION_BED_PERIOD) - #error Thermal Runaway Protection for the bed is now enabled with THERMAL_PROTECTION_BED. + #error "Thermal Runaway Protection for the bed is now enabled with THERMAL_PROTECTION_BED." #elif ENABLED(COREXZ) && ENABLED(Z_LATE_ENABLE) #error "Z_LATE_ENABLE can't be used with COREXZ." #elif defined(X_HOME_RETRACT_MM) - #error [XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM. + #error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM." #elif defined(PROBE_SERVO_DEACTIVATION_DELAY) - #error PROBE_SERVO_DEACTIVATION_DELAY has been replaced with DEACTIVATE_SERVOS_AFTER_MOVE and SERVO_DEACTIVATION_DELAY. + #error "PROBE_SERVO_DEACTIVATION_DELAY has been replaced with DEACTIVATE_SERVOS_AFTER_MOVE and SERVO_DEACTIVATION_DELAY." #elif defined(BEEPER) - #error BEEPER is now BEEPER_PIN. Please update your pins definitions. + #error "BEEPER is now BEEPER_PIN. Please update your pins definitions." #elif defined(SDCARDDETECT) - #error SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions. + #error "SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions." #elif defined(SDCARDDETECTINVERTED) - #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration. + #error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration." #elif defined(BTENABLED) - #error BTENABLED is now BLUETOOTH. Please update your configuration. + #error "BTENABLED is now BLUETOOTH. Please update your configuration." #elif defined(CUSTOM_MENDEL_NAME) - #error CUSTOM_MENDEL_NAME is now CUSTOM_MACHINE_NAME. Please update your configuration. + #error "CUSTOM_MENDEL_NAME is now CUSTOM_MACHINE_NAME. Please update your configuration." #elif defined(HAS_AUTOMATIC_VERSIONING) - #error HAS_AUTOMATIC_VERSIONING is now USE_AUTOMATIC_VERSIONING. Please update your configuration. + #error "HAS_AUTOMATIC_VERSIONING is now USE_AUTOMATIC_VERSIONING. Please update your configuration." #elif defined(ENABLE_AUTO_BED_LEVELING) - #error ENABLE_AUTO_BED_LEVELING is now AUTO_BED_LEVELING_FEATURE. Please update your configuration. + #error "ENABLE_AUTO_BED_LEVELING is now AUTO_BED_LEVELING_FEATURE. Please update your configuration." #elif defined(SDSLOW) - #error SDSLOW deprecated. Set SPI_SPEED to SPI_HALF_SPEED instead. + #error "SDSLOW deprecated. Set SPI_SPEED to SPI_HALF_SPEED instead." #elif defined(SDEXTRASLOW) - #error SDEXTRASLOW deprecated. Set SPI_SPEED to SPI_QUARTER_SPEED instead. + #error "SDEXTRASLOW deprecated. Set SPI_SPEED to SPI_QUARTER_SPEED instead." #elif defined(Z_RAISE_BEFORE_HOMING) - #error Z_RAISE_BEFORE_HOMING is deprecated. Use MIN_Z_HEIGHT_FOR_HOMING instead. + #error "Z_RAISE_BEFORE_HOMING is deprecated. Use MIN_Z_HEIGHT_FOR_HOMING instead." #elif defined(FILAMENT_SENSOR) - #error FILAMENT_SENSOR is deprecated. Use FILAMENT_WIDTH_SENSOR instead. + #error "FILAMENT_SENSOR is deprecated. Use FILAMENT_WIDTH_SENSOR instead." #elif defined(DISABLE_MAX_ENDSTOPS) || defined(DISABLE_MIN_ENDSTOPS) - #error DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead. + #error "DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead." #elif ENABLED(Z_DUAL_ENDSTOPS) && !defined(Z2_USE_ENDSTOP) - #error Z_DUAL_ENDSTOPS settings are simplified. Just set Z2_USE_ENDSTOP to the endstop you want to repurpose for Z2 + #error "Z_DUAL_ENDSTOPS settings are simplified. Just set Z2_USE_ENDSTOP to the endstop you want to repurpose for Z2" #elif defined(LANGUAGE_INCLUDE) - #error LANGUAGE_INCLUDE has been replaced by LCD_LANGUAGE. Please update your configuration. + #error "LANGUAGE_INCLUDE has been replaced by LCD_LANGUAGE. Please update your configuration." #endif #endif //SANITYCHECK_H diff --git a/Marlin/Sd2Card.cpp b/Marlin/Sd2Card.cpp index 49be3c066..f077e9e77 100644 --- a/Marlin/Sd2Card.cpp +++ b/Marlin/Sd2Card.cpp @@ -36,7 +36,7 @@ //------------------------------------------------------------------------------ // make sure SPCR rate is in expected bits #if (SPR0 != 0 || SPR1 != 1) - #error unexpected SPCR bits + #error "unexpected SPCR bits" #endif /** * Initialize hardware SPI diff --git a/Marlin/Sd2PinMap.h b/Marlin/Sd2PinMap.h index 7490f3474..3ad6b795a 100644 --- a/Marlin/Sd2PinMap.h +++ b/Marlin/Sd2PinMap.h @@ -393,7 +393,7 @@ static const pin_map_t digitalPinMap[] = { {&DDRG, &PING, &PORTG, 0}, // G0 50 }; #else // defined(__AVR_ATmega1280__) -#error unknown chip +#error "unknown chip" #endif // defined(__AVR_ATmega1280__) //------------------------------------------------------------------------------ static const uint8_t digitalPinCount = COUNT(digitalPinMap); diff --git a/Marlin/fastio.h b/Marlin/fastio.h index fe8fa70e9..10464bf50 100644 --- a/Marlin/fastio.h +++ b/Marlin/fastio.h @@ -4038,7 +4038,7 @@ #endif #ifndef DIO0_PIN - #error pins for this chip not defined in arduino.h! If you write an appropriate pin definition and have this firmware work on your chip, please submit a pull request + #error "pins for this chip not defined in arduino.h! If you write an appropriate pin definition and have this firmware work on your chip, please submit a pull request" #endif #endif /* _FASTIO_ARDUINO_H */ diff --git a/Marlin/pins.h b/Marlin/pins.h index a13df540c..f4e660133 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -154,7 +154,7 @@ #elif MB(SAINSMART_2IN1) #include "pins_SAINSMART_2IN1.h" #else - #error Unknown MOTHERBOARD value set in Configuration.h + #error "Unknown MOTHERBOARD value set in Configuration.h" #endif // List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those! diff --git a/Marlin/pins_5DPRINT.h b/Marlin/pins_5DPRINT.h index 170717870..20c6ed51a 100644 --- a/Marlin/pins_5DPRINT.h +++ b/Marlin/pins_5DPRINT.h @@ -27,7 +27,7 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #define DEFAULT_MACHINE_NAME "Makibox" diff --git a/Marlin/pins_A4JP.h b/Marlin/pins_A4JP.h index 5cd0d3897..956ddbd67 100644 --- a/Marlin/pins_A4JP.h +++ b/Marlin/pins_A4JP.h @@ -25,7 +25,7 @@ ************************************************/ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #endif // Servo support diff --git a/Marlin/pins_BQ_ZUM_MEGA_3D.h b/Marlin/pins_BQ_ZUM_MEGA_3D.h index d8ea11461..c6b53d870 100644 --- a/Marlin/pins_BQ_ZUM_MEGA_3D.h +++ b/Marlin/pins_BQ_ZUM_MEGA_3D.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #endif #include "pins_RAMPS_13.h" diff --git a/Marlin/pins_BRAINWAVE.h b/Marlin/pins_BRAINWAVE.h index a02b6515f..e4ab626c3 100644 --- a/Marlin/pins_BRAINWAVE.h +++ b/Marlin/pins_BRAINWAVE.h @@ -28,7 +28,7 @@ */ #ifndef __AVR_AT90USB646__ - #error Oops! Make sure you have 'Brainwave' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Brainwave' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 27 diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h index c79f04eb6..34dc8bbe0 100644 --- a/Marlin/pins_BRAINWAVE_PRO.h +++ b/Marlin/pins_BRAINWAVE_PRO.h @@ -28,13 +28,13 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Brainwave Pro' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Brainwave Pro' selected from the 'Tools -> Boards' menu." #endif #include "fastio.h" #ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical. - #error Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config + #error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config" #endif #define LARGE_FLASH true diff --git a/Marlin/pins_CHEAPTRONIC.h b/Marlin/pins_CHEAPTRONIC.h index 1bbd97952..88f772382 100644 --- a/Marlin/pins_CHEAPTRONIC.h +++ b/Marlin/pins_CHEAPTRONIC.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/pins_ELEFU_3.h index 23f8b944f..008e567aa 100644 --- a/Marlin/pins_ELEFU_3.h +++ b/Marlin/pins_ELEFU_3.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 49 diff --git a/Marlin/pins_GEN3_MONOLITHIC.h b/Marlin/pins_GEN3_MONOLITHIC.h index ba61fd2a6..6bb7208c8 100644 --- a/Marlin/pins_GEN3_MONOLITHIC.h +++ b/Marlin/pins_GEN3_MONOLITHIC.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega644P__ - #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #endif #define DEBUG_PIN 0 diff --git a/Marlin/pins_GEN3_PLUS.h b/Marlin/pins_GEN3_PLUS.h index 15241bfb5..381b91242 100644 --- a/Marlin/pins_GEN3_PLUS.h +++ b/Marlin/pins_GEN3_PLUS.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 15 diff --git a/Marlin/pins_GEN6.h b/Marlin/pins_GEN6.h index 6d1ce468d..771c965f0 100644 --- a/Marlin/pins_GEN6.h +++ b/Marlin/pins_GEN6.h @@ -26,7 +26,7 @@ #ifndef __AVR_ATmega644P__ #ifndef __AVR_ATmega1284P__ - #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #endif #endif diff --git a/Marlin/pins_GEN7_12.h b/Marlin/pins_GEN7_12.h index 0c23c0648..851ecd2ef 100644 --- a/Marlin/pins_GEN7_12.h +++ b/Marlin/pins_GEN7_12.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #endif #ifndef GEN7_VERSION diff --git a/Marlin/pins_GEN7_14.h b/Marlin/pins_GEN7_14.h index 04a4fce1a..37b070082 100644 --- a/Marlin/pins_GEN7_14.h +++ b/Marlin/pins_GEN7_14.h @@ -27,7 +27,7 @@ #define GEN7_VERSION 14 // v1.4 #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #endif //x axis pins diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h index 9150a41b9..89a5320d5 100644 --- a/Marlin/pins_GEN7_CUSTOM.h +++ b/Marlin/pins_GEN7_CUSTOM.h @@ -28,7 +28,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu." #endif //x axis pins diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/pins_LEAPFROG.h index 8d1a2401a..df7ba191e 100644 --- a/Marlin/pins_LEAPFROG.h +++ b/Marlin/pins_LEAPFROG.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 28 diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h index 61cd91be0..a82d4f647 100644 --- a/Marlin/pins_MEGACONTROLLER.h +++ b/Marlin/pins_MEGACONTROLLER.h @@ -25,11 +25,11 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #if EXTRUDERS > 2 - #error Mega Controller supports up to 2 extruders. Comment this line to keep going. + #error "Mega Controller supports up to 2 extruders. Comment this line to keep going." #endif #define SERVO0_PIN 30 diff --git a/Marlin/pins_MEGATRONICS.h b/Marlin/pins_MEGATRONICS.h index e25cf8a55..d8b957c78 100644 --- a/Marlin/pins_MEGATRONICS.h +++ b/Marlin/pins_MEGATRONICS.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/pins_MEGATRONICS_2.h index 186f15427..0fc1b4852 100644 --- a/Marlin/pins_MEGATRONICS_2.h +++ b/Marlin/pins_MEGATRONICS_2.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h index 46f98807b..093f65373 100644 --- a/Marlin/pins_MEGATRONICS_3.h +++ b/Marlin/pins_MEGATRONICS_3.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_MINIRAMBO.h b/Marlin/pins_MINIRAMBO.h index a67dd9c3a..c26142f88 100644 --- a/Marlin/pins_MINIRAMBO.h +++ b/Marlin/pins_MINIRAMBO.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/pins_MINITRONICS.h index 8bd7b5fc1..0ffa9f063 100644 --- a/Marlin/pins_MINITRONICS.h +++ b/Marlin/pins_MINITRONICS.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega1281__ - #error Oops! Make sure you have 'Minitronics' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Minitronics' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_OMCA.h b/Marlin/pins_OMCA.h index e98439608..eeeaecc45 100644 --- a/Marlin/pins_OMCA.h +++ b/Marlin/pins_OMCA.h @@ -52,7 +52,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) - #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. (Final OMCA board) + #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. (Final OMCA board)" #endif #define X_STEP_PIN 26 diff --git a/Marlin/pins_OMCA_A.h b/Marlin/pins_OMCA_A.h index 147006de7..53ebc90d3 100644 --- a/Marlin/pins_OMCA_A.h +++ b/Marlin/pins_OMCA_A.h @@ -51,7 +51,7 @@ */ #ifndef __AVR_ATmega644__ - #error Oops! Make sure you have 'SanguinoA' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'SanguinoA' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 21 diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index bd269fc92..c1febdfc5 100644 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -28,11 +28,11 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional. - #error These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h + #error "These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h" #endif #define LARGE_FLASH true diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h index bf4e2b4a4..54f52e5a8 100644 --- a/Marlin/pins_PRINTRBOARD_REVF.h +++ b/Marlin/pins_PRINTRBOARD_REVF.h @@ -28,11 +28,11 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional. - #error These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h + #error "These Printrboard assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h" #endif #define LARGE_FLASH true diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index 39da6c75d..52df222c8 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_RAMPS_14.h b/Marlin/pins_RAMPS_14.h index dc1f219d3..721e63e13 100644 --- a/Marlin/pins_RAMPS_14.h +++ b/Marlin/pins_RAMPS_14.h @@ -45,7 +45,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define LARGE_FLASH true diff --git a/Marlin/pins_RAMPS_OLD.h b/Marlin/pins_RAMPS_OLD.h index 25193c8ed..a5d2abb1e 100644 --- a/Marlin/pins_RAMPS_OLD.h +++ b/Marlin/pins_RAMPS_OLD.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif // Uncomment the following line for RAMPS v1.0 diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h index 8464190c7..accbce0ad 100644 --- a/Marlin/pins_RUMBA.h +++ b/Marlin/pins_RUMBA.h @@ -25,11 +25,11 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #if EXTRUDERS > 3 - #error RUMBA supports up to 3 extruders. Comment this line to keep going. + #error "RUMBA supports up to 3 extruders. Comment this line to keep going." #endif #define DEFAULT_MACHINE_NAME "Rumba" diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h index d84854878..11a94c146 100644 --- a/Marlin/pins_SANGUINOLOLU_11.h +++ b/Marlin/pins_SANGUINOLOLU_11.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu." #endif #define X_STEP_PIN 15 diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h index 579d653e0..52a558c7f 100644 --- a/Marlin/pins_SAV_MKI.h +++ b/Marlin/pins_SAV_MKI.h @@ -28,7 +28,7 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #define DEFAULT_MACHINE_NAME "SAV MkI" diff --git a/Marlin/pins_SETHI.h b/Marlin/pins_SETHI.h index e16b45cea..fd9d9fd31 100644 --- a/Marlin/pins_SETHI.h +++ b/Marlin/pins_SETHI.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) - #error Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu." #endif #ifndef GEN7_VERSION diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h index eb27ae97d..5df4fb047 100644 --- a/Marlin/pins_TEENSY2.h +++ b/Marlin/pins_TEENSY2.h @@ -66,11 +66,11 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #ifndef AT90USBxx_TEENSYPP_ASSIGNMENTS // use Teensyduino Teensy++2.0 pin assignments instead of Marlin alphabetical. - #error Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config + #error "Uncomment #define AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h for this config" // (or build from command line) #endif diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/pins_TEENSYLU.h index ea1492429..4959b5fff 100644 --- a/Marlin/pins_TEENSYLU.h +++ b/Marlin/pins_TEENSYLU.h @@ -28,11 +28,11 @@ */ #ifndef __AVR_AT90USB1286__ - #error Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu." #endif #if ENABLED(AT90USBxx_TEENSYPP_ASSIGNMENTS) // use Teensyduino Teensy++2.0 pin assignments instead of Marlin traditional. - #error These Teensylu assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h + #error "These Teensylu assignments depend on traditional Marlin assignments, not AT90USBxx_TEENSYPP_ASSIGNMENTS in fastio.h" #endif #define LARGE_FLASH true diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/pins_ULTIMAIN_2.h index 8682a54fc..61be6d7f1 100644 --- a/Marlin/pins_ULTIMAIN_2.h +++ b/Marlin/pins_ULTIMAIN_2.h @@ -25,7 +25,7 @@ */ #ifndef __AVR_ATmega2560__ - #error Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu." #endif #define DEFAULT_MACHINE_NAME "Ultimaker" diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h index ab7a5da83..b101a70c9 100644 --- a/Marlin/pins_ULTIMAKER.h +++ b/Marlin/pins_ULTIMAKER.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define DEFAULT_MACHINE_NAME "Ultimaker" diff --git a/Marlin/pins_ULTIMAKER_OLD.h b/Marlin/pins_ULTIMAKER_OLD.h index e2d48e67d..1511923eb 100644 --- a/Marlin/pins_ULTIMAKER_OLD.h +++ b/Marlin/pins_ULTIMAKER_OLD.h @@ -25,7 +25,7 @@ */ #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) - #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. + #error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu." #endif #define DEFAULT_MACHINE_NAME "Ultimaker" diff --git a/Marlin/thermistortables.h b/Marlin/thermistortables.h index aeef2c7f7..370ed342f 100644 --- a/Marlin/thermistortables.h +++ b/Marlin/thermistortables.h @@ -1177,7 +1177,7 @@ const short temptable_1047[][2] PROGMEM = { #define HEATER_0_TEMPTABLE_LEN COUNT(HEATER_0_TEMPTABLE) #else #ifdef HEATER_0_USES_THERMISTOR - #error No heater 0 thermistor table specified + #error "No heater 0 thermistor table specified" #else // HEATER_0_USES_THERMISTOR #define HEATER_0_TEMPTABLE NULL #define HEATER_0_TEMPTABLE_LEN 0 @@ -1200,7 +1200,7 @@ const short temptable_1047[][2] PROGMEM = { #define HEATER_1_TEMPTABLE_LEN COUNT(HEATER_1_TEMPTABLE) #else #ifdef HEATER_1_USES_THERMISTOR - #error No heater 1 thermistor table specified + #error "No heater 1 thermistor table specified" #else // HEATER_1_USES_THERMISTOR #define HEATER_1_TEMPTABLE NULL #define HEATER_1_TEMPTABLE_LEN 0 @@ -1223,7 +1223,7 @@ const short temptable_1047[][2] PROGMEM = { #define HEATER_2_TEMPTABLE_LEN COUNT(HEATER_2_TEMPTABLE) #else #ifdef HEATER_2_USES_THERMISTOR - #error No heater 2 thermistor table specified + #error "No heater 2 thermistor table specified" #else // HEATER_2_USES_THERMISTOR #define HEATER_2_TEMPTABLE NULL #define HEATER_2_TEMPTABLE_LEN 0 @@ -1246,7 +1246,7 @@ const short temptable_1047[][2] PROGMEM = { #define HEATER_3_TEMPTABLE_LEN COUNT(HEATER_3_TEMPTABLE) #else #ifdef HEATER_3_USES_THERMISTOR - #error No heater 3 thermistor table specified + #error "No heater 3 thermistor table specified" #else // HEATER_3_USES_THERMISTOR #define HEATER_3_TEMPTABLE NULL #define HEATER_3_TEMPTABLE_LEN 0 @@ -1269,7 +1269,7 @@ const short temptable_1047[][2] PROGMEM = { #define BEDTEMPTABLE_LEN COUNT(BEDTEMPTABLE) #else #ifdef BED_USES_THERMISTOR - #error No bed thermistor table specified + #error "No bed thermistor table specified" #endif // BED_USES_THERMISTOR #endif diff --git a/Marlin/utf_mapper.h b/Marlin/utf_mapper.h index 22d5d406c..bb53fad4c 100644 --- a/Marlin/utf_mapper.h +++ b/Marlin/utf_mapper.h @@ -74,7 +74,7 @@ // ヰ ヱ ヲ ン フ ? ? ? ? ? ヲ ・ ー ヽ ヽ ? }; #elif ENABLED(MAPPER_D0D1) - #error( "Cyrillic on a japanese dsplay makes no sense. There are no matching symbols."); + #error "Cyrillic on a japanese dsplay makes no sense. There are no matching symbols." #endif #elif DISPLAY_CHARSET_HD44780 == WESTERN @@ -108,7 +108,7 @@ // p c T y Ф x Ч ч Ш Щ Ъ Ы b Э Ю Я }; #elif ENABLED(MAPPER_E382E383) - #error( "Katakana on a western display makes no sense. There are no matching symbols." ); + #error "Katakana on a western display makes no sense. There are no matching symbols." #endif #elif DISPLAY_CHARSET_HD44780 == CYRILLIC @@ -135,12 +135,12 @@ // ш щ ъ ы ь э ю я // 7 Ѱ ѱ Ѳ ѳ Ѵ ѵ Ѷ ѷ }; // ѻ ѹ Ѻ ѻ Ѽ ѽ Ѿ ѿ #elif ENABLED(MAPPER_C2C3) - #error( "Western languages on a cyrillic display makes no sense. There are no matching symbols." ); + #error "Western languages on a cyrillic display makes no sense. There are no matching symbols." #elif ENABLED(MAPPER_E382E383) - #error( "Katakana on a cyrillic display makes no sense. There are no matching symbols." ); + #error "Katakana on a cyrillic display makes no sense. There are no matching symbols." #endif #else - #error("Something went wrong in the setting of DISPLAY_CHARSET_HD44780"); + #error "Something went wrong in the setting of DISPLAY_CHARSET_HD44780" #endif // DISPLAY_CHARSET_HD44780 #endif // SIMULATE_ROMFONT