Преглед изворни кода

Merge pull request #3665 from thinkyhead/rc_stepper_babystep

Fix BABYSTEPPING, add it to Travis test
Scott Lahteine пре 9 година
родитељ
комит
6bb664c690
3 измењених фајлова са 10 додато и 10 уклоњено
  1. 2
    2
      .travis.yml
  2. 6
    6
      Marlin/planner.cpp
  3. 2
    2
      Marlin/temperature.cpp

+ 2
- 2
.travis.yml Прегледај датотеку

@@ -105,10 +105,10 @@ script:
105 105
   #- opt_enable MAKRPANEL
106 106
   #- build_marlin
107 107
   #
108
-  # REPRAP_DISCOUNT_SMART_CONTROLLER
108
+  # REPRAP_DISCOUNT_SMART_CONTROLLER, SDSUPPORT, and BABYSTEPPING
109 109
   #
110 110
   - restore_configs
111
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
111
+  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING
112 112
   - build_marlin
113 113
   #
114 114
   # G3D_PANEL

+ 6
- 6
Marlin/planner.cpp Прегледај датотеку

@@ -1025,18 +1025,18 @@ void Planner::check_axes_activity() {
1025 1025
    * On CORE machines XYZ is derived from ABC.
1026 1026
    */
1027 1027
   vector_3 Planner::adjusted_position() {
1028
-    vector_3 position = vector_3(stepper.get_axis_position_mm(X_AXIS), stepper.get_axis_position_mm(Y_AXIS), stepper.get_axis_position_mm(Z_AXIS));
1028
+    vector_3 pos = vector_3(stepper.get_axis_position_mm(X_AXIS), stepper.get_axis_position_mm(Y_AXIS), stepper.get_axis_position_mm(Z_AXIS));
1029 1029
 
1030
-    //position.debug("in Planner::position");
1031
-    //bed_level_matrix.debug("in Planner::position");
1030
+    //pos.debug("in Planner::adjusted_position");
1031
+    //bed_level_matrix.debug("in Planner::adjusted_position");
1032 1032
 
1033 1033
     matrix_3x3 inverse = matrix_3x3::transpose(bed_level_matrix);
1034 1034
     //inverse.debug("in Planner::inverse");
1035 1035
 
1036
-    position.apply_rotation(inverse);
1037
-    //position.debug("after rotation");
1036
+    pos.apply_rotation(inverse);
1037
+    //pos.debug("after rotation");
1038 1038
 
1039
-    return position;
1039
+    return pos;
1040 1040
   }
1041 1041
 
1042 1042
 #endif // AUTO_BED_LEVELING_FEATURE && !DELTA

+ 2
- 2
Marlin/temperature.cpp Прегледај датотеку

@@ -1835,11 +1835,11 @@ ISR(TIMER0_COMPB_vect) {
1835 1835
       int curTodo = babystepsTodo[axis]; //get rid of volatile for performance
1836 1836
 
1837 1837
       if (curTodo > 0) {
1838
-        babystep(axis,/*fwd*/true);
1838
+        stepper.babystep(axis,/*fwd*/true);
1839 1839
         babystepsTodo[axis]--; //fewer to do next time
1840 1840
       }
1841 1841
       else if (curTodo < 0) {
1842
-        babystep(axis,/*fwd*/false);
1842
+        stepper.babystep(axis,/*fwd*/false);
1843 1843
         babystepsTodo[axis]++; //fewer to do next time
1844 1844
       }
1845 1845
     }

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