Apply standards for whole-file conditions
This commit is contained in:
parent
5054c53901
commit
21bfbb9d44
|
@ -45,13 +45,18 @@
|
||||||
*
|
*
|
||||||
* Initial version by Roxy-3D
|
* Initial version by Roxy-3D
|
||||||
*/
|
*/
|
||||||
#define M100_FREE_MEMORY_DUMPER // Enable for the `M110 D` Dump sub-command
|
|
||||||
#define M100_FREE_MEMORY_CORRUPTOR // Enable for the `M100 C` Corrupt sub-command
|
|
||||||
|
|
||||||
#include "MarlinConfig.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(M100_FREE_MEMORY_WATCHER)
|
#if ENABLED(M100_FREE_MEMORY_WATCHER)
|
||||||
|
|
||||||
|
#define M100_FREE_MEMORY_DUMPER // Enable for the `M110 D` Dump sub-command
|
||||||
|
#define M100_FREE_MEMORY_CORRUPTOR // Enable for the `M100 C` Corrupt sub-command
|
||||||
|
|
||||||
|
#include "Marlin.h"
|
||||||
|
#include "gcode.h"
|
||||||
|
#include "hex_print_routines.h"
|
||||||
|
|
||||||
#define TEST_BYTE ((char) 0xE5)
|
#define TEST_BYTE ((char) 0xE5)
|
||||||
|
|
||||||
extern char command_queue[BUFSIZE][MAX_CMD_SIZE];
|
extern char command_queue[BUFSIZE][MAX_CMD_SIZE];
|
||||||
|
@ -60,10 +65,6 @@ extern char* __brkval;
|
||||||
extern size_t __heap_start, __heap_end, __flp;
|
extern size_t __heap_start, __heap_end, __flp;
|
||||||
extern char __bss_end;
|
extern char __bss_end;
|
||||||
|
|
||||||
#include "Marlin.h"
|
|
||||||
#include "gcode.h"
|
|
||||||
#include "hex_print_routines.h"
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Utility functions
|
// Utility functions
|
||||||
//
|
//
|
||||||
|
|
|
@ -417,6 +417,7 @@ void report_current_position();
|
||||||
|
|
||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
extern float zprobe_zoffset;
|
extern float zprobe_zoffset;
|
||||||
|
bool set_probe_deployed(const bool deploy);
|
||||||
#define DEPLOY_PROBE() set_probe_deployed(true)
|
#define DEPLOY_PROBE() set_probe_deployed(true)
|
||||||
#define STOW_PROBE() set_probe_deployed(false)
|
#define STOW_PROBE() set_probe_deployed(false)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -350,8 +350,6 @@
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
#include "ubl.h"
|
#include "ubl.h"
|
||||||
extern bool defer_return_to_status;
|
|
||||||
unified_bed_leveling ubl;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
||||||
|
@ -2069,7 +2067,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
#endif // BLTOUCH
|
#endif // BLTOUCH
|
||||||
|
|
||||||
// returns false for ok and true for failure
|
// returns false for ok and true for failure
|
||||||
bool set_probe_deployed(bool deploy) {
|
bool set_probe_deployed(const bool deploy) {
|
||||||
|
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
if (DEBUGGING(LEVELING)) {
|
if (DEBUGGING(LEVELING)) {
|
||||||
|
|
|
@ -30,11 +30,13 @@
|
||||||
* http://arduino.cc/forum/index.php/topic,51842.0.html
|
* http://arduino.cc/forum/index.php/topic,51842.0.html
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dac_mcp4728.h"
|
#include "MarlinConfig.h"
|
||||||
#include "enum.h"
|
|
||||||
|
|
||||||
#if ENABLED(DAC_STEPPER_CURRENT)
|
#if ENABLED(DAC_STEPPER_CURRENT)
|
||||||
|
|
||||||
|
#include "dac_mcp4728.h"
|
||||||
|
#include "enum.h"
|
||||||
|
|
||||||
uint16_t mcp4728_values[XYZE];
|
uint16_t mcp4728_values[XYZE];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -19,11 +19,13 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "Marlin.h"
|
|
||||||
#include "gcode.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(M100_FREE_MEMORY_WATCHER) || ENABLED(DEBUG_GCODE_PARSER)
|
#if ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(M100_FREE_MEMORY_WATCHER) || ENABLED(DEBUG_GCODE_PARSER)
|
||||||
|
|
||||||
|
#include "Marlin.h"
|
||||||
|
#include "gcode.h"
|
||||||
#include "hex_print_routines.h"
|
#include "hex_print_routines.h"
|
||||||
|
|
||||||
static char _hex[7] = "0x0000";
|
static char _hex[7] = "0x0000";
|
||||||
|
|
|
@ -27,13 +27,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(BEZIER_CURVE_SUPPORT)
|
#if ENABLED(BEZIER_CURVE_SUPPORT)
|
||||||
|
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
#include "language.h"
|
#include "language.h"
|
||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
|
#include "Marlin.h"
|
||||||
|
|
||||||
// See the meaning in the documentation of cubic_b_spline().
|
// See the meaning in the documentation of cubic_b_spline().
|
||||||
#define MIN_STEP 0.002
|
#define MIN_STEP 0.002
|
||||||
|
|
|
@ -20,6 +20,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
|
#if ENABLED(PRINTCOUNTER)
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "Marlin.h"
|
||||||
#include "printcounter.h"
|
#include "printcounter.h"
|
||||||
#include "duration_t.h"
|
#include "duration_t.h"
|
||||||
|
@ -232,3 +236,5 @@ void PrintCounter::reset() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // PRINTCOUNTER
|
||||||
|
|
|
@ -20,12 +20,13 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if ENABLED(EXPERIMENTAL_I2CBUS)
|
#if ENABLED(EXPERIMENTAL_I2CBUS)
|
||||||
|
|
||||||
#include "twibus.h"
|
#include "twibus.h"
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
|
#include "Marlin.h"
|
||||||
|
|
||||||
TWIBus::TWIBus() {
|
TWIBus::TWIBus() {
|
||||||
#if I2C_SLAVE_ADDRESS == 0
|
#if I2C_SLAVE_ADDRESS == 0
|
||||||
|
|
|
@ -20,15 +20,18 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Marlin.h"
|
#include "MarlinConfig.h"
|
||||||
#include "math.h"
|
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
||||||
|
|
||||||
|
#include "Marlin.h"
|
||||||
#include "ubl.h"
|
#include "ubl.h"
|
||||||
#include "hex_print_routines.h"
|
#include "hex_print_routines.h"
|
||||||
#include "temperature.h"
|
#include "temperature.h"
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
|
#include "math.h"
|
||||||
|
|
||||||
|
unified_bed_leveling ubl;
|
||||||
|
|
||||||
uint8_t ubl_cnt = 0;
|
uint8_t ubl_cnt = 0;
|
||||||
|
|
||||||
|
|
|
@ -38,11 +38,14 @@
|
||||||
License along with this library; if not, write to the Free Software
|
License along with this library; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
#include <math.h>
|
|
||||||
#include "Marlin.h"
|
#include "MarlinConfig.h"
|
||||||
|
|
||||||
#if HAS_ABL
|
#if HAS_ABL
|
||||||
|
|
||||||
#include "vector_3.h"
|
#include "vector_3.h"
|
||||||
|
#include "serial.h"
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
vector_3::vector_3() : x(0), y(0), z(0) { }
|
vector_3::vector_3() : x(0), y(0), z(0) { }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user