Scott Lahteine пре 4 година
родитељ
комит
dfa33082bb

+ 6
- 4
Marlin/src/gcode/feature/caselight/M355.cpp Прегледај датотеку

60
   if (!caselight.on)
60
   if (!caselight.on)
61
     SERIAL_ECHOLNPGM(STR_OFF);
61
     SERIAL_ECHOLNPGM(STR_OFF);
62
   else {
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
     SERIAL_ECHOLNPGM(STR_ON);
69
     SERIAL_ECHOLNPGM(STR_ON);
68
   }
70
   }
69
 }
71
 }

+ 1
- 1
Marlin/src/module/motion.cpp Прегледај датотеку

1569
     if (bump) {
1569
     if (bump) {
1570
       // Move away from the endstop by the axis HOMING_BUMP_MM
1570
       // Move away from the endstop by the axis HOMING_BUMP_MM
1571
       if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Move Away: ", -bump, "mm");
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
       #if ENABLED(DETECT_BROKEN_ENDSTOP)
1574
       #if ENABLED(DETECT_BROKEN_ENDSTOP)
1575
         // Check for a broken endstop
1575
         // Check for a broken endstop

+ 3
- 1
Marlin/src/module/motion.h Прегледај датотеку

65
   #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE()
65
   #define XY_PROBE_FEEDRATE_MM_S PLANNER_XY_FEEDRATE()
66
 #endif
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
  * Feed rates are often configured with mm/m
73
  * Feed rates are often configured with mm/m

+ 1
- 1
Marlin/src/pins/pins.h Прегледај датотеку

255
 #elif MB(OVERLORD)
255
 #elif MB(OVERLORD)
256
   #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:mega2560
256
   #include "mega/pins_OVERLORD.h"               // ATmega2560                             env:mega2560
257
 #elif MB(HJC2560C_REV1)
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
 #elif MB(HJC2560C_REV2)
259
 #elif MB(HJC2560C_REV2)
260
   #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:mega2560
260
   #include "mega/pins_HJC2560C_REV2.h"          // ATmega2560                             env:mega2560
261
 #elif MB(LEAPFROG_XEED2015)
261
 #elif MB(LEAPFROG_XEED2015)

+ 0
- 1
buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py Прегледај датотеку

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

Loading…
Откажи
Сачувај