Browse Source

Merge pull request #4119 from thinkyhead/fix_stepper_compile_error

Fix stepper compile error with motor_current_setting
pull/1/head
Scott Lahteine 9 years ago
committed by GitHub
parent
commit
937123ab32
  1. 6
      .travis.yml
  2. 2
      Marlin/stepper.h

6
.travis.yml

@ -155,6 +155,12 @@ script:
- opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
- build_marlin
#
# Test MINIRAMBO for PWM_MOTOR_CURRENT
#
- restore_configs
- opt_set MOTHERBOARD BOARD_MINIRAMBO
- build_marlin
#
# Enable FILAMENTCHANGEENABLE
#
- restore_configs

2
Marlin/stepper.h

@ -134,7 +134,7 @@ class Stepper {
#ifndef PWM_MOTOR_CURRENT
#define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
#endif
const int motor_current_setting[3] = PWM_MOTOR_CURRENT;
static constexpr int motor_current_setting[3] = PWM_MOTOR_CURRENT;
#endif
//

Loading…
Cancel
Save