Merge

2013-07-22 14:34:50 +08:00
parent 9b5c637ad4
commit 5a8e27e70d
37 changed files with 3405 additions and 1426 deletions
@@ -108,6 +108,13 @@
  const long MAXINTENSITY = 0x3FF;
  #define mvMAXLIGHTVALUE             1024

+enum SETTLE_STATUS
+{
+  NOTSETTLED      = 0,
+  SETTLED,
+  TIMEDOUT
+};
+
 #pragma pack(push)
 #pragma pack(1)
 //****************************************************************************************************
@@ -406,13 +413,6 @@ struct struct_ep_buff
  HANDLE   _event;
 };

-enum SETTLE_STATUS
-{
-  NOTSETTLED      = 0,
-  SETTLED,
-  TIMEDOUT
-};
-
 // CSettleStageParams and CSettleStage are copied from QVI, but QVI is based on millionths of and inch
 // and we will use microns for MV
 class CSettleStageParams