sicshipacaba.c

SICS-418 Make sure hnotify sends messages as hdbevents when using the
JSON protocl

site_ansto/instrument/config/hmm/hmm_object.tcl
Initialise the hmm object to make sure the read type is set.

nxscripts_common_1.tcl
Set the read type when saving the hmm data.

server_config.tcl
Fix the autosave command so that you can enable/disable autosave while
the histogram memory is running.

protocol.c
Reduce noise in log files when using the JSON protocol.  Don't log
messages generated during macro execution (ie within a TCL proc).

motor.c:MotorStatus
Abort the current operation, the scan command and batch files when a
motor object returns a hardware fault status value.

motor_dmc2280.c
set driver status to HWFault when the driver is in the error state.

r3251 | ffr | 2011-09-23 08:49:00 +1000 (Fri, 23 Sep 2011) | 25 lines

motor.c

@@ -395,6 +395,10 @@ static void handleMoveCallback(pMotor self, SConnection *pCon)
      {
        handleMoveCallback(self,pCon);
      }
+     if(status == HWFault) {
+       SCSetInterrupt(pCon,eAbortBatch);
+     }
+
      return status;
   }
 /*---------------------------------------------------------------------------*/