zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4119 from thinkyhead/fix_stepper_compile_error

Browse source 
Fix stepper compile error with motor_current_setting
This commit is contained in:
Scott Lahteine 2016-06-21 20:25:27 -07:00 committed by GitHub
parent 111260f407 528df1b02d
commit 937123ab32
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

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

2
Marlin/stepper.h
View file

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