Merge pull request #1938 from petterreinholdtsen/real-get-speed-override

jepler · web-flow · commit a0f26c541e2d · 2022-08-18T16:29:43.000-06:00
Make sure get_speed_override() return value
diff --git a/src/emc/rs274ngc/interpmodule.cc b/src/emc/rs274ngc/interpmodule.cc
@@ -306,8 +306,8 @@ static inline bool get_probe_flag (Interp &interp)  {
 static inline void set_probe_flag(Interp &interp, bool value)  {
     interp._setup.probe_flag = value;
 }
-static inline bool get_speed_override (Interp &interp)  {
-    return interp._setup.speed_override;
+static inline bool get_speed_override (Interp &interp, int spindle)  {
+    return interp._setup.speed_override[spindle];
 }
 static inline void set_speed_override(Interp &interp, int spindle, bool value)  {
     interp._setup.speed_override[spindle] = value;

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,8 @@ static inline bool get_probe_flag (Interp &interp) {`
`306`	`306`	`static inline void set_probe_flag(Interp &interp, bool value) {`
`307`	`307`	`interp._setup.probe_flag = value;`
`308`	`308`	`}`
`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];`
`311`	`311`	`}`
`312`	`312`	`static inline void set_speed_override(Interp &interp, int spindle, bool value) {`
`313`	`313`	`interp._setup.speed_override[spindle] = value;`