Browse Source

Merge pull request #4119 from thinkyhead/fix_stepper_compile_error

Fix stepper compile error with motor_current_setting
Scott Lahteine 9 years ago
parent
commit
937123ab32
2 changed files with 7 additions and 1 deletions
  1. 6
    0
      .travis.yml
  2. 1
    1
      Marlin/stepper.h

+ 6
- 0
.travis.yml View File

155
   - opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
155
   - opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
156
   - build_marlin
156
   - build_marlin
157
   #
157
   #
158
+  # Test MINIRAMBO for PWM_MOTOR_CURRENT
159
+  #
160
+  - restore_configs
161
+  - opt_set MOTHERBOARD BOARD_MINIRAMBO
162
+  - build_marlin
163
+  #
158
   # Enable FILAMENTCHANGEENABLE
164
   # Enable FILAMENTCHANGEENABLE
159
   #
165
   #
160
   - restore_configs
166
   - restore_configs

+ 1
- 1
Marlin/stepper.h View File

134
       #ifndef PWM_MOTOR_CURRENT
134
       #ifndef PWM_MOTOR_CURRENT
135
         #define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
135
         #define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
136
       #endif
136
       #endif
137
-      const int motor_current_setting[3] = PWM_MOTOR_CURRENT;
137
+      static constexpr int motor_current_setting[3] = PWM_MOTOR_CURRENT;
138
     #endif
138
     #endif
139
 
139
 
140
     //
140
     //

Loading…
Cancel
Save