Skip to content

M
MarlinKimbra
Commit 951e0e16 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents dd7184a2 8fb8e0b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 106 deletions
MK/Configuration_Pins.h
View file @ 951e0e16
...@@ -4,72 +4,75 @@ ...@@ -4,72 +4,75 @@
//=================================== BASIC ================================== //=================================== BASIC ==================================
// X axis pins // X axis pins
#define X_STEP_PIN ORIG_X_STEP_PIN #define X_STEP_PIN ORIG_X_STEP_PIN
#define X_DIR_PIN ORIG_X_DIR_PIN #define X_DIR_PIN ORIG_X_DIR_PIN
#define X_ENABLE_PIN ORIG_X_ENABLE_PIN #define X_ENABLE_PIN ORIG_X_ENABLE_PIN
// Y axis pins // Y axis pins
#define Y_STEP_PIN ORIG_Y_STEP_PIN #define Y_STEP_PIN ORIG_Y_STEP_PIN
#define Y_DIR_PIN ORIG_Y_DIR_PIN #define Y_DIR_PIN ORIG_Y_DIR_PIN
#define Y_ENABLE_PIN ORIG_Y_ENABLE_PIN #define Y_ENABLE_PIN ORIG_Y_ENABLE_PIN
// Z axis pins // Z axis pins
#define Z_STEP_PIN ORIG_Z_STEP_PIN #define Z_STEP_PIN ORIG_Z_STEP_PIN
#define Z_DIR_PIN ORIG_Z_DIR_PIN #define Z_DIR_PIN ORIG_Z_DIR_PIN
#define Z_ENABLE_PIN ORIG_Z_ENABLE_PIN #define Z_ENABLE_PIN ORIG_Z_ENABLE_PIN
// E axis pins // E axis pins
#if DRIVER_EXTRUDERS > 0 #if DRIVER_EXTRUDERS > 0
#define E0_STEP_PIN ORIG_E0_STEP_PIN #define E0_STEP_PIN ORIG_E0_STEP_PIN
#define E0_DIR_PIN ORIG_E0_DIR_PIN #define E0_DIR_PIN ORIG_E0_DIR_PIN
#define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN #define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 1 #if DRIVER_EXTRUDERS > 1
#define E1_STEP_PIN ORIG_E1_STEP_PIN #define E1_STEP_PIN ORIG_E1_STEP_PIN
#define E1_DIR_PIN ORIG_E1_DIR_PIN #define E1_DIR_PIN ORIG_E1_DIR_PIN
#define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN #define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 2 #if DRIVER_EXTRUDERS > 2
#define E2_STEP_PIN ORIG_E2_STEP_PIN #define E2_STEP_PIN ORIG_E2_STEP_PIN
#define E2_DIR_PIN ORIG_E2_DIR_PIN #define E2_DIR_PIN ORIG_E2_DIR_PIN
#define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN #define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN
#endif #endif
#if DRIVER_EXTRUDERS > 3 #if DRIVER_EXTRUDERS > 3
#define E3_STEP_PIN ORIG_E3_STEP_PIN #define E3_STEP_PIN ORIG_E3_STEP_PIN
#define E3_DIR_PIN ORIG_E3_DIR_PIN #define E3_DIR_PIN ORIG_E3_DIR_PIN
#define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN #define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN
#endif #endif
// ENDSTOP pin // ENDSTOP pin
#define X_MIN_PIN ORIG_X_MIN_PIN #define X_MIN_PIN ORIG_X_MIN_PIN
#define X_MAX_PIN ORIG_X_MAX_PIN #define X_MAX_PIN ORIG_X_MAX_PIN
#define Y_MIN_PIN ORIG_Y_MIN_PIN #define Y_MIN_PIN ORIG_Y_MIN_PIN
#define Y_MAX_PIN ORIG_Y_MAX_PIN #define Y_MAX_PIN ORIG_Y_MAX_PIN
#define Z_MIN_PIN ORIG_Z_MIN_PIN #define Z_MIN_PIN ORIG_Z_MIN_PIN
#define Z_MAX_PIN ORIG_Z_MAX_PIN #define Z_MAX_PIN ORIG_Z_MAX_PIN
// HEATER pin // HEATER pin
#define HEATER_0_PIN ORIG_HEATER_0_PIN #define HEATER_0_PIN ORIG_HEATER_0_PIN
#define HEATER_1_PIN ORIG_HEATER_1_PIN #define HEATER_1_PIN ORIG_HEATER_1_PIN
#define HEATER_2_PIN ORIG_HEATER_2_PIN #define HEATER_2_PIN ORIG_HEATER_2_PIN
#define HEATER_3_PIN ORIG_HEATER_3_PIN #define HEATER_3_PIN ORIG_HEATER_3_PIN
#define HEATER_BED_PIN ORIG_HEATER_BED_PIN #define HEATER_BED_PIN ORIG_HEATER_BED_PIN
// TEMP pin // TEMP pin
#define TEMP_0_PIN ORIG_TEMP_0_PIN #define TEMP_0_PIN ORIG_TEMP_0_PIN
#define TEMP_1_PIN ORIG_TEMP_1_PIN #define TEMP_1_PIN ORIG_TEMP_1_PIN
#define TEMP_2_PIN ORIG_TEMP_2_PIN #define TEMP_2_PIN ORIG_TEMP_2_PIN
#define TEMP_3_PIN ORIG_TEMP_3_PIN #define TEMP_3_PIN ORIG_TEMP_3_PIN
#define TEMP_BED_PIN ORIG_TEMP_BED_PIN #define TEMP_BED_PIN ORIG_TEMP_BED_PIN
// FAN pin // FAN pin
#define FAN_PIN ORIG_FAN_PIN #define FAN_PIN ORIG_FAN_PIN
// PS ON pin // PS ON pin
#define PS_ON_PIN ORIG_PS_ON_PIN #define PS_ON_PIN ORIG_PS_ON_PIN
// BEEPER pin
#define BEEPER_PIN ORIG_BEEPER_PIN
//============================================================================ //============================================================================
......
MK/Pins.h
View file @ 951e0e16
This diff is collapsed.
MK/sd_card_menu/Music/imperial_march.gcode 0 → 100644
View file @ 951e0e16
M300 S220 P500
M300 S220 P500
M300 S220 P500
M300 S174.61 P375
M300 S261.63 P125
M300 S220 P500
M300 S174.61 P375
M300 S261.63 P125
M300 S220 P1000
M300 S329.63 P500
M300 S329.63 P500
M300 S329.63 P500
M300 S349.23 P375
M300 S261.63 P125
M300 S207.65 P500
M300 S174.61 P375
M300 S261.63 P125
M300 S220 P1000
M300 S440 P500
M300 S220 P375
M300 S220 P125
M300 S440 P500
M300 S415.30 P375
M300 S392 P125
M300 S370 P125
M300 S329.63 P125
M300 S349.23 P250
M300 S233.08 P250
M300 S311.13 P500
M300 S293.66 P375
M300 S277.18 P125
M300 S261.63 P125
M300 S246.94 P125
M300 S261.63 P250
M300 S174.61 P250
M300 S207.65 P500
M300 S174.61 P375
M300 S220 P125
M300 S261.63 P500
M300 S220 P375
M300 S261.63 P125
M300 S329.63 P1000
M300 S440 P500
M300 S220 P375
M300 S220 P125
M300 S440 P500
M300 S415.30 P375
M300 S392 P125
M300 S370 P125
M300 S329.63 P125
M300 S349.23 P250
M300 S233.08 P250
M300 S311.13 P500
M300 S293.66 P375
M300 S277.18 P125
M300 S261.63 P125
M300 S246.94 P125
M300 S261.63 P250
M300 S174.61 P250
M300 S207.65 P500
M300 S174.61 P375
M300 S261.63 P125
M300 S220 P500
M300 S174.61 P375
M300 S261.63 P125
M300 S220 P1000
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment