Skip to content

Commit 615d9aa

Browse files
Make sure get_speed_override() return value
The method do not return the override value, but always true. It need information on which spindle to return value for, similar to set_speed_override, to give a sensible value. Fixes this warning from building with clang: emc/rs274ngc/interpmodule.cc:310:26: warning: address of array 'interp._setup.speed_override' will always evaluate to 'true' [-Wpointer-bool-conversion] return interp._setup.speed_override; ~~~~~~ ~~~~~~~~~~~~~~^~~~~~~~~~~~~~
1 parent f2b30ac commit 615d9aa

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/emc/rs274ngc/interpmodule.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ static inline bool get_probe_flag (Interp &interp) {
306306
static inline void set_probe_flag(Interp &interp, bool value) {
307307
interp._setup.probe_flag = value;
308308
}
309-
static inline bool get_speed_override (Interp &interp) {
310-
return interp._setup.speed_override;
309+
static inline bool get_speed_override (Interp &interp, int spindle) {
310+
return interp._setup.speed_override[spindle];
311311
}
312312
static inline void set_speed_override(Interp &interp, int spindle, bool value) {
313313
interp._setup.speed_override[spindle] = value;

0 commit comments

Comments
 (0)