Browse Source

Removes some minor GCC warnings

João Brázio 9 years ago
parent
commit
79e7721b76
1 changed files with 9 additions and 9 deletions
  1. 9
    9
      Marlin/Marlin_main.cpp

+ 9
- 9
Marlin/Marlin_main.cpp View File

5325
     if (volumetric_enabled) {
5325
     if (volumetric_enabled) {
5326
       filament_size[target_extruder] = code_value_linear_units();
5326
       filament_size[target_extruder] = code_value_linear_units();
5327
       // make sure all extruders have some sane value for the filament size
5327
       // make sure all extruders have some sane value for the filament size
5328
-      for (int i = 0; i < COUNT(filament_size); i++)
5328
+      for (uint8_t i = 0; i < COUNT(filament_size); i++)
5329
         if (! filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
5329
         if (! filament_size[i]) filament_size[i] = DEFAULT_NOMINAL_FILAMENT_DIA;
5330
     }
5330
     }
5331
   }
5331
   }
6825
             // <0 if the new nozzle is higher, >0 if lower. A bigger raise when lower.
6825
             // <0 if the new nozzle is higher, >0 if lower. A bigger raise when lower.
6826
             float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder],
6826
             float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder],
6827
                   z_raise = 0.3 + (z_diff > 0.0 ? z_diff : 0.0);
6827
                   z_raise = 0.3 + (z_diff > 0.0 ? z_diff : 0.0);
6828
-          
6828
+
6829
             // Always raise by some amount
6829
             // Always raise by some amount
6830
             planner.buffer_line(
6830
             planner.buffer_line(
6831
               current_position[X_AXIS],
6831
               current_position[X_AXIS],
6836
               active_extruder
6836
               active_extruder
6837
             );
6837
             );
6838
             stepper.synchronize();
6838
             stepper.synchronize();
6839
-          
6839
+
6840
             move_extruder_servo(active_extruder);
6840
             move_extruder_servo(active_extruder);
6841
             delay(500);
6841
             delay(500);
6842
-          
6842
+
6843
             // Move back down, if needed
6843
             // Move back down, if needed
6844
             if (z_raise != z_diff) {
6844
             if (z_raise != z_diff) {
6845
               planner.buffer_line(
6845
               planner.buffer_line(
6853
               stepper.synchronize();
6853
               stepper.synchronize();
6854
             }
6854
             }
6855
           #endif
6855
           #endif
6856
-          
6856
+
6857
           /**
6857
           /**
6858
            * Set current_position to the position of the new nozzle.
6858
            * Set current_position to the position of the new nozzle.
6859
            * Offsets are based on linear distance, so we need to get
6859
            * Offsets are based on linear distance, so we need to get
6906
             current_position[Z_AXIS] += offset_vec.z;
6906
             current_position[Z_AXIS] += offset_vec.z;
6907
 
6907
 
6908
           #else // !AUTO_BED_LEVELING_FEATURE
6908
           #else // !AUTO_BED_LEVELING_FEATURE
6909
-  
6909
+
6910
             float xydiff[2] = {
6910
             float xydiff[2] = {
6911
               hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder],
6911
               hotend_offset[X_AXIS][tmp_extruder] - hotend_offset[X_AXIS][active_extruder],
6912
               hotend_offset[Y_AXIS][tmp_extruder] - hotend_offset[Y_AXIS][active_extruder]
6912
               hotend_offset[Y_AXIS][tmp_extruder] - hotend_offset[Y_AXIS][active_extruder]
6930
               }
6930
               }
6931
 
6931
 
6932
             #endif // MESH_BED_LEVELING
6932
             #endif // MESH_BED_LEVELING
6933
-  
6933
+
6934
           #endif // !AUTO_BED_LEVELING_FEATURE
6934
           #endif // !AUTO_BED_LEVELING_FEATURE
6935
 
6935
 
6936
           #if ENABLED(DEBUG_LEVELING_FEATURE)
6936
           #if ENABLED(DEBUG_LEVELING_FEATURE)
6993
         SERIAL_ECHOLNPGM("<<< gcode_T");
6993
         SERIAL_ECHOLNPGM("<<< gcode_T");
6994
       }
6994
       }
6995
     #endif
6995
     #endif
6996
-  
6996
+
6997
     SERIAL_ECHO_START;
6997
     SERIAL_ECHO_START;
6998
     SERIAL_ECHOPGM(MSG_ACTIVE_EXTRUDER);
6998
     SERIAL_ECHOPGM(MSG_ACTIVE_EXTRUDER);
6999
     SERIAL_PROTOCOLLN((int)active_extruder);
6999
     SERIAL_PROTOCOLLN((int)active_extruder);
8695
 }
8695
 }
8696
 
8696
 
8697
 void calculate_volumetric_multipliers() {
8697
 void calculate_volumetric_multipliers() {
8698
-  for (int i = 0; i < COUNT(filament_size); i++)
8698
+  for (uint8_t i = 0; i < COUNT(filament_size); i++)
8699
     volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
8699
     volumetric_multiplier[i] = calculate_volumetric_multiplier(filament_size[i]);
8700
 }
8700
 }

Loading…
Cancel
Save