josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicting extern/inline declarations 

The functions find_bed_induction_sensor_point_* have conflicting
extern and inline declarations.

These are used outside of the compilation unit only, and thus there's no
point in defining them inline.

This causes a compilation failure at O1 and above, which is strangely
avoided at Os.
This commit is contained in:
Yuri D'Elia 2021-02-04 20:36:06 +01:00 committed by DRracer
parent 80568cfba4
commit e010ca8ceb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/mesh_bed_calibration.cpp
View File

@ -944,7 +944,7 @@ static inline void update_current_position_z()
// At the current position, find the Z stop. // At the current position, find the Z stop.
inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, int bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, int
#ifdef SUPPORT_VERBOSITY #ifdef SUPPORT_VERBOSITY
verbosity_level verbosity_level
#endif //SUPPORT_VERBOSITY #endif //SUPPORT_VERBOSITY
@ -1065,7 +1065,7 @@ error:
} }
#ifdef NEW_XYZCAL #ifdef NEW_XYZCAL
extern bool xyzcal_find_bed_induction_sensor_point_xy(); bool xyzcal_find_bed_induction_sensor_point_xy();
#endif //NEW_XYZCAL #endif //NEW_XYZCAL
// Search around the current_position[X,Y], // Search around the current_position[X,Y],
// look for the induction sensor response. // look for the induction sensor response.
@ -1081,7 +1081,7 @@ extern bool xyzcal_find_bed_induction_sensor_point_xy();
#endif //HEATBED_V2 #endif //HEATBED_V2
#ifdef HEATBED_V2 #ifdef HEATBED_V2
inline bool find_bed_induction_sensor_point_xy(int bool find_bed_induction_sensor_point_xy(int
#if !defined (NEW_XYZCAL) && defined (SUPPORT_VERBOSITY) #if !defined (NEW_XYZCAL) && defined (SUPPORT_VERBOSITY)
verbosity_level verbosity_level
#endif #endif
@ -1335,7 +1335,7 @@ inline bool find_bed_induction_sensor_point_xy(int
#endif //NEW_XYZCAL #endif //NEW_XYZCAL
} }
#else //HEATBED_V2 #else //HEATBED_V2
inline bool find_bed_induction_sensor_point_xy(int verbosity_level) bool find_bed_induction_sensor_point_xy(int verbosity_level)
{ {
#ifdef NEW_XYZCAL #ifdef NEW_XYZCAL
return xyzcal_find_bed_induction_sensor_point_xy(); return xyzcal_find_bed_induction_sensor_point_xy();

6
Firmware/mesh_bed_calibration.h
View File

@ -146,9 +146,9 @@ inline bool world2machine_clamp(float &x, float &y)
return clamped; return clamped;
} }
extern bool find_bed_induction_sensor_point_z(float minimum_z = -10.f, uint8_t n_iter = 3, int verbosity_level = 0); bool find_bed_induction_sensor_point_z(float minimum_z = -10.f, uint8_t n_iter = 3, int verbosity_level = 0);
extern bool find_bed_induction_sensor_point_xy(int verbosity_level = 0); bool find_bed_induction_sensor_point_xy(int verbosity_level = 0);
extern void go_home_with_z_lift(); void go_home_with_z_lift();
/** /**
* @brief Bed skew and offest detection result * @brief Bed skew and offest detection result