Merge branch 'merge-replace' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into merge-replace

site_ansto/motor_dmc2280.c

@@ -1972,7 +1972,9 @@ static void DMCState_Idle(pDMC2280Driv self, pEvtEvent event) {
           }
           return;
         case CMD_HALT:
-          /* we are already halted so just reset run_flag*/
+          /* we are already halted so just reset driver_status and run_flag*/
+          if (self->driver_status == HWBusy)
+            self->driver_status = HWIdle;
           self->run_flag = 0;
           return;
       }