This fixes the series of merges done with various Motoman changes. I think they were done in the wrong order, or a conflict was resolved improperly. Functions like Macro/Arcon/Arcoff were accepted and merged, but were removed by a later unrelated merge.
This fixes the series of merges done with various Motoman changes. I think they were done in the wrong order, or a conflict was resolved improperly. Functions like Macro/Arcon/Arcoff were accepted and merged, but were removed by a later unrelated merge.