Browse Source

[1.1.x] Fix compilation warnings (#8395)

* Fix up Travis CI and compile warnings/errors

* No ULTRA_LCD with REPRAP_DISCOUNT_SMART_CONTROLLER

* No point in setting all the endstop plugs
Rowan Meara 7 years ago
parent
commit
d2df00bfca
3 changed files with 33 additions and 27 deletions
  1. 28
    21
      .travis.yml
  2. 2
    3
      Marlin/Marlin_main.cpp
  3. 3
    3
      Marlin/temperature.cpp

+ 28
- 21
.travis.yml View File

@@ -131,7 +131,12 @@ script:
131 131
   - opt_enable MESH_BED_LEVELING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER
132 132
   - build_marlin
133 133
   #
134
-  # Test PROBE_MANUALLY feature, with LCD support,
134
+  # Test MINIRAMBO for PWM_MOTOR_CURRENT
135
+  #      PROBE_MANUALLY feature, with LCD support,
136
+  #      ULTIMAKERCONTROLLER, FILAMENT_LCD_DISPLAY, FILAMENT_WIDTH_SENSOR,
137
+  #      PRINTCOUNTER, NOZZLE_PARK_FEATURE, NOZZLE_CLEAN_FEATURE, PCA9632,
138
+  #      Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS,
139
+  #      ADVANCED_PAUSE_FEATURE, PARK_HEAD_ON_PAUSE, LCD_INFO_MENU,
135 140
   #      EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER,
136 141
   #      INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT
137 142
   #
@@ -139,6 +144,12 @@ script:
139 144
   - opt_set MOTHERBOARD BOARD_MINIRAMBO
140 145
   - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR LCD_BED_LEVELING ULTIMAKERCONTROLLER
141 146
   - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
147
+  - opt_enable ULTIMAKERCONTROLLER SDSUPPORT
148
+  - opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 USE_XMAX_PLUG
149
+  - opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS
150
+  - opt_enable_adv ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE LCD_INFO_MENU
151
+  - opt_set_adv PWM_MOTOR_CURRENT {1300,1300,1250}
152
+  - opt_set_adv I2C_SLAVE_ADDRESS 63
142 153
   - build_marlin
143 154
   #
144 155
   # Test 5 extruders on AZTEEG_X3_PRO (can use any board with >=5 extruders defined)
@@ -191,33 +202,29 @@ script:
191 202
   - opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
192 203
   - build_marlin
193 204
   #
194
-  # Test MINIRAMBO for PWM_MOTOR_CURRENT
195
-  #      ULTIMAKERCONTROLLER, FILAMENT_LCD_DISPLAY, FILAMENT_WIDTH_SENSOR,
196
-  #      PRINTCOUNTER, NOZZLE_PARK_FEATURE, NOZZLE_CLEAN_FEATURE, PCA9632,
197
-  #      Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS,
198
-  #      ADVANCED_PAUSE_FEATURE, PARK_HEAD_ON_PAUSE, LCD_INFO_MENU,
199
-  #
200
-  - restore_configs
201
-  - opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR SDSUPPORT
202
-  - opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 USE_XMAX_PLUG
203
-  - opt_enable_adv Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS
204
-  - opt_set_adv I2C_SLAVE_ADDRESS 63
205
-  - opt_enable_adv ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE LCD_INFO_MENU
206
-  - opt_add_adv Z2_MIN_PIN 2
207
-  - build_marlin
208
-  #
209 205
   # Enable COREXY
210 206
   #
211 207
   - restore_configs
212 208
   - opt_enable COREXY
213 209
   - build_marlin
214 210
   #
215
-  # Enable COREYX (swapped)
216
-  #
217
-  #- restore_configs
218
-  #- opt_enable COREYX
219
-  #- build_marlin
211
+  # Test many less common options
220 212
   #
213
+  - restore_configs
214
+  - opt_enable COREYX
215
+  - opt_set_adv FAN_MIN_PWM 50
216
+  - opt_set_adv FAN_KICKSTART_TIME 100
217
+  - opt_set_adv XY_FREQUENCY_LIMIT  15
218
+  - opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER
219
+  - opt_enable_adv ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK
220
+  - opt_enable_adv VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL
221
+  - opt_enable_adv EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
222
+  - opt_enable_adv MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
223
+  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER
224
+  - opt_enable FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR
225
+  - opt_enable ENDSTOP_INTERRUPTS_FEATURE FAN_SOFT_PWM SDSUPPORT
226
+  - opt_enable USE_XMAX_PLUG
227
+  - build_marlin
221 228
   #
222 229
   ######## Other Standard LCD/Panels ##############
223 230
   #

+ 2
- 3
Marlin/Marlin_main.cpp View File

@@ -7790,7 +7790,6 @@ inline void gcode_M105() {
7790 7790
     if (p < FAN_COUNT) {
7791 7791
       #if ENABLED(EXTRA_FAN_SPEED)
7792 7792
         const int16_t t = parser.intval('T');
7793
-        NOMORE(t, 255);
7794 7793
         if (t > 0) {
7795 7794
           switch (t) {
7796 7795
             case 1:
@@ -7801,7 +7800,7 @@ inline void gcode_M105() {
7801 7800
               fanSpeeds[p] = new_fanSpeeds[p];
7802 7801
               break;
7803 7802
             default:
7804
-              new_fanSpeeds[p] = t;
7803
+              new_fanSpeeds[p] = min(t, 255);
7805 7804
               break;
7806 7805
           }
7807 7806
           return;
@@ -9323,7 +9322,7 @@ inline void gcode_M226() {
9323 9322
           zprobe_zoffset += offs;
9324 9323
           refresh_zprobe_zoffset(); // This will babystep the axis
9325 9324
         #else
9326
-          thermalManager.babystep_axis(Z_AXIS, parser.value_axis_units(Z_AXIS) * planner.axis_steps_per_mm[Z_AXIS]);
9325
+          thermalManager.babystep_axis(Z_AXIS, offs * planner.axis_steps_per_mm[Z_AXIS]);
9327 9326
         #endif
9328 9327
       }
9329 9328
     #endif

+ 3
- 3
Marlin/temperature.cpp View File

@@ -1746,15 +1746,15 @@ void Temperature::isr() {
1746 1746
 
1747 1747
       #if ENABLED(FAN_SOFT_PWM)
1748 1748
         #if HAS_FAN0
1749
-          soft_pwm_count_fan[0] = (soft_pwm_count_fan[0] & pwm_mask) + soft_pwm_amount_fan[0] >> 1;
1749
+          soft_pwm_count_fan[0] = ((soft_pwm_count_fan[0] & pwm_mask) + soft_pwm_amount_fan[0]) >> 1;
1750 1750
           WRITE_FAN(soft_pwm_count_fan[0] > pwm_mask ? HIGH : LOW);
1751 1751
         #endif
1752 1752
         #if HAS_FAN1
1753
-          soft_pwm_count_fan[1] = (soft_pwm_count_fan[1] & pwm_mask) + soft_pwm_amount_fan[1] >> 1;
1753
+          soft_pwm_count_fan[1] = ((soft_pwm_count_fan[1] & pwm_mask) + soft_pwm_amount_fan[1]) >> 1;
1754 1754
           WRITE_FAN1(soft_pwm_count_fan[1] > pwm_mask ? HIGH : LOW);
1755 1755
         #endif
1756 1756
         #if HAS_FAN2
1757
-          soft_pwm_count_fan[2] = (soft_pwm_count_fan[2] & pwm_mask) + soft_pwm_amount_fan[2] >> 1;
1757
+          soft_pwm_count_fan[2] = ((soft_pwm_count_fan[2] & pwm_mask) + soft_pwm_amount_fan[2]) >> 1;
1758 1758
           WRITE_FAN2(soft_pwm_count_fan[2] > pwm_mask ? HIGH : LOW);
1759 1759
         #endif
1760 1760
       #endif

Loading…
Cancel
Save