浏览代码

General code cleanup

Scott Lahteine 4 年前
父节点
当前提交
c083728e4c
共有 3 个文件被更改,包括 5 次插入9 次删除
  1. 3
    7
      Marlin/src/gcode/feature/advance/M900.cpp
  2. 1
    1
      Marlin/src/lcd/ultralcd.cpp
  3. 1
    1
      buildroot/share/tests/mega2560-tests

+ 3
- 7
Marlin/src/gcode/feature/advance/M900.cpp 查看文件

59
     }
59
     }
60
   #endif
60
   #endif
61
 
61
 
62
-  float &kref = planner.extruder_advance_K[tool_index];
62
+  float &kref = planner.extruder_advance_K[tool_index], newK = kref;
63
+  const float oldK = newK;
63
 
64
 
64
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
65
   #if ENABLED(EXTRA_LIN_ADVANCE_K)
65
-    float &lref = other_extruder_advance_K[tool_index];
66
-  #endif
67
-
68
-  const float oldK = kref;
69
-  float newK = oldK;
70
 
66
 
71
-  #if ENABLED(EXTRA_LIN_ADVANCE_K)
67
+    float &lref = other_extruder_advance_K[tool_index];
72
 
68
 
73
     const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
69
     const bool old_slot = TEST(lin_adv_slot, tool_index), // The tool's current slot (0 or 1)
74
                new_slot = parser.boolval('S', old_slot);  // The passed slot (default = current)
70
                new_slot = parser.boolval('S', old_slot);  // The passed slot (default = current)

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp 查看文件

1245
         }
1245
         }
1246
       #endif
1246
       #endif
1247
 
1247
 
1248
-      #if HAS_SHIFT_ENCODER      
1248
+      #if HAS_SHIFT_ENCODER
1249
         /**
1249
         /**
1250
          * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
1250
          * Set up Rotary Encoder bit values (for two pin encoders to indicate movement).
1251
          * These values are independent of which pins are used for EN_A / EN_B indications.
1251
          * These values are independent of which pins are used for EN_A / EN_B indications.

+ 1
- 1
buildroot/share/tests/mega2560-tests 查看文件

45
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
45
            BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
46
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
46
            FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
47
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
47
            PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
48
-          SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
48
+           SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
49
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
49
            HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
50
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
50
 exec_test $1 $2 "RAMPS | EXTRUDERS 2 | CHAR LCD + SD | FIX Probe | ABL-Linear | Advanced Pause | PLR | LEDs ..."
51
 
51
 

正在加载...
取消
保存