MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix some config builds

Browse Source
This commit is contained in:
Scott Lahteine 2021-03-01 07:10:00 -06:00 committed by Scott Lahteine
parent ef57a3e585
commit be8b547261
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/feature/caselight/M355.cpp
View File

@ -60,10 +60,12 @@ void GcodeSuite::M355() {
if (!caselight.on) if (!caselight.on)
SERIAL_ECHOLNPGM(STR_OFF); SERIAL_ECHOLNPGM(STR_OFF);
else { else {
if (TERN0(CASELIGHT_USES_BRIGHTNESS, TERN(CASE_LIGHT_USE_NEOPIXEL, true, PWM_PIN(CASE_LIGHT_PIN)))) { #if CASELIGHT_USES_BRIGHTNESS
if (TERN(CASE_LIGHT_USE_NEOPIXEL, true, PWM_PIN(CASE_LIGHT_PIN))) {
SERIAL_ECHOLN(int(caselight.brightness)); SERIAL_ECHOLN(int(caselight.brightness));
return; return;
} }
#endif
SERIAL_ECHOLNPGM(STR_ON); SERIAL_ECHOLNPGM(STR_ON);
} }
} }

2
Marlin/src/module/motion.cpp
View File

@ -1569,7 +1569,7 @@ void prepare_line_to_destination() {
if (bump) { if (bump) {
// Move away from the endstop by the axis HOMING_BUMP_MM // Move away from the endstop by the axis HOMING_BUMP_MM
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Move Away: ", -bump, "mm"); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Move Away: ", -bump, "mm");
do_homing_move(axis, -bump, TERN0(HOMING_Z_WITH_PROBE, axis == Z_AXIS) ? MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST) : 0, false); do_homing_move(axis, -bump, TERN(HOMING_Z_WITH_PROBE, (axis == Z_AXIS ? z_probe_fast_mm_s : 0), 0), false);
#if ENABLED(DETECT_BROKEN_ENDSTOP) #if ENABLED(DETECT_BROKEN_ENDSTOP)
// Check for a broken endstop // Check for a broken endstop

2
Marlin/src/module/motion.h
View File

@ -65,7 +65,9 @@ extern xyz_pos_t cartes;
#define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE() #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE()
#endif #endif
#if HAS_BED_PROBE
constexpr feedRate_t z_probe_fast_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST); constexpr feedRate_t z_probe_fast_mm_s = MMM_TO_MMS(Z_PROBE_FEEDRATE_FAST);
#endif
/** /**
* Feed rates are often configured with mm/m * Feed rates are often configured with mm/m

2
Marlin/src/pins/pins.h
View File

@ -255,7 +255,7 @@
#elif MB(OVERLORD) #elif MB(OVERLORD)
#include "mega/pins_OVERLORD.h" // ATmega2560 env:mega2560 #include "mega/pins_OVERLORD.h" // ATmega2560 env:mega2560
#elif MB(HJC2560C_REV1) #elif MB(HJC2560C_REV1)
#include "mega/pins_HJC2560C_REV1.h" // ATmega2560 env:mega2560 #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:mega2560
#elif MB(HJC2560C_REV2) #elif MB(HJC2560C_REV2)
#include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:mega2560 #include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:mega2560
#elif MB(LEAPFROG_XEED2015) #elif MB(LEAPFROG_XEED2015)

1
buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
View File

@ -18,7 +18,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
elif flag == "-T": elif flag == "-T":
env["LINKFLAGS"][i + 1] = custom_ld_script env["LINKFLAGS"][i + 1] = custom_ld_script
# Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D) # Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
def encrypt(source, target, env): def encrypt(source, target, env):
firmware = open(target[0].path, "rb") firmware = open(target[0].path, "rb")