Browse Source

Fix some config builds

Scott Lahteine 3 years ago
parent
commit
dfa33082bb

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

@@ -60,10 +60,12 @@ void GcodeSuite::M355() {
60 60
   if (!caselight.on)
61 61
     SERIAL_ECHOLNPGM(STR_OFF);
62 62
   else {
63
-    if (TERN0(CASELIGHT_USES_BRIGHTNESS, TERN(CASE_LIGHT_USE_NEOPIXEL, true, PWM_PIN(CASE_LIGHT_PIN)))) {
64
-      SERIAL_ECHOLN(int(caselight.brightness));
65
-      return;
66
-    }
63
+    #if CASELIGHT_USES_BRIGHTNESS
64
+      if (TERN(CASE_LIGHT_USE_NEOPIXEL, true, PWM_PIN(CASE_LIGHT_PIN))) {
65
+        SERIAL_ECHOLN(int(caselight.brightness));
66
+        return;
67
+      }
68
+    #endif
67 69
     SERIAL_ECHOLNPGM(STR_ON);
68 70
   }
69 71
 }

+ 1
- 1
Marlin/src/module/motion.cpp View File

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

+ 3
- 1
Marlin/src/module/motion.h View File

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

+ 1
- 1
Marlin/src/pins/pins.h View File

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

+ 0
- 1
buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py View File

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

Loading…
Cancel
Save