Merge pull request #1936 from petterreinholdtsen/hal-fields-def-typo

jepler · web-flow · commit 2c302c2492a2 · 2022-08-18T16:36:49.000-06:00
Make sure HAL_FIELDS in halui.cc is complete
diff --git a/src/emc/usr_intf/halui.cc b/src/emc/usr_intf/halui.cc
@@ -187,7 +187,7 @@ static int axis_mask = 0;
     FIELD(hal_float_t,ro_value) /* current Feed Override value */ \
     FIELD(hal_bit_t,ro_increase) /* pin ror increasing the FO (+=scale) */ \
     FIELD(hal_bit_t,ro_decrease) /* pin for decreasing the FO (-=scale) */ \
-    FIELD(hal_bit_t,ro_reset) /* pin for resetting Feed Override */ \  
+    FIELD(hal_bit_t,ro_reset) /* pin for resetting Feed Override */ \
 \
     ARRAY(hal_s32_t,so_counts,EMCMOT_MAX_SPINDLES+1) /* pin for the Spindle Speed Override counting */ \
     ARRAY(hal_bit_t,so_count_enable,EMCMOT_MAX_SPINDLES+1) /* pin for the Spindle Speed Override counting enable */ \

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ static int axis_mask = 0;`
`187`	`187`	`FIELD(hal_float_t,ro_value) /* current Feed Override value */ \`
`188`	`188`	`FIELD(hal_bit_t,ro_increase) /* pin ror increasing the FO (+=scale) */ \`
`189`	`189`	`FIELD(hal_bit_t,ro_decrease) /* pin for decreasing the FO (-=scale) */ \`
`190`		`- FIELD(hal_bit_t,ro_reset) /* pin for resetting Feed Override */ \`
	`190`	`+ FIELD(hal_bit_t,ro_reset) /* pin for resetting Feed Override */ \`
`191`	`191`	`\`
`192`	`192`	`ARRAY(hal_s32_t,so_counts,EMCMOT_MAX_SPINDLES+1) /* pin for the Spindle Speed Override counting */ \`
`193`	`193`	`ARRAY(hal_bit_t,so_count_enable,EMCMOT_MAX_SPINDLES+1) /* pin for the Spindle Speed Override counting enable */ \`