Ver código fonte

上传代码,fpga中开始增加伺服相关代码

l2736 2 semanas atrás
pai
commit
f36f55a59c
36 arquivos alterados com 1007 adições e 245 exclusões
  1. BIN
      Fpga/FPGA/Control/RTStatus.ctl
  2. BIN
      Fpga/FPGA/Control/信号类型.ctl
  3. BIN
      Fpga/FPGA/Fpga_Main.vi
  4. BIN
      Fpga/FPGA/伺服控制/FPGA_Window.vi
  5. BIN
      Fpga/FPGA/伺服控制/Init.vi
  6. BIN
      Fpga/FPGA/伺服控制/RiseTable.vi
  7. BIN
      Fpga/FPGA/伺服控制/SignalGen.vi
  8. BIN
      Fpga/FPGA/伺服控制/WaitRiseTable.vi
  9. BIN
      Fpga/FPGA/伺服控制/WaitingSignalGen.vi
  10. BIN
      Fpga/FPGA/伺服控制/ZeroChange.vi
  11. BIN
      Fpga/FPGA/伺服控制/信号发生初始化.vi
  12. BIN
      Fpga/FPGA/伺服控制/信号发生数据初始化.vi
  13. BIN
      Fpga/FPGA/伺服控制/方波生成.vi
  14. BIN
      Fpga/FPGA/伺服控制/正弦发生.vi
  15. BIN
      Fpga/FPGA/伺服控制/相位更新.vi
  16. BIN
      Fpga/FPGA/通道定义/位移通道定义.vi
  17. BIN
      Fpga/FPGA/通道定义/加速度通道定义.vi
  18. BIN
      Fpga/FPGA/通道定义/压差通道定义.vi
  19. BIN
      Fpga/FPGA/通道定义/寄存器初始化.vi
  20. BIN
      Fpga/FPGA/通道定义/支撑压力通道定义.vi
  21. 1 1
      Fpga/fpga.aliases
  22. 1 1
      Fpga/fpga.lvlps
  23. 0 0
      Fpga/fpga.lvproj
  24. 1 1
      NIFPGA/FPGA.cs
  25. 2 2
      NIFPGA/FPGAArrayFXPReadProperty.cs
  26. 4 4
      NIFPGA/FPGAArrayFXPWriteProperty.cs
  27. 12 12
      NIFPGA/FPGAArrayReadProperty.cs
  28. 23 23
      NIFPGA/FPGAArrayWriteProperty.cs
  29. 3 4
      NIFPGA/FPGABaseProperty.cs
  30. 2 2
      NIFPGA/FPGAFXPReadProperty.cs
  31. 8 8
      NIFPGA/FPGAFXPWriteProperty.cs
  32. 12 12
      NIFPGA/FPGAReadProperty.cs
  33. 23 23
      NIFPGA/FPGAWriteProperty.cs
  34. 2 2
      NIFPGA/lvbitx/Bitfile.cs
  35. 32 30
      Service/ShakerFpga/ShakerFpgaSourceGenerator.cs
  36. 881 120
      Service/ShakerService/Shaker.lvbitx

BIN
Fpga/FPGA/Control/RTStatus.ctl


BIN
Fpga/FPGA/Control/信号类型.ctl


BIN
Fpga/FPGA/Fpga_Main.vi


BIN
Fpga/FPGA/伺服控制/FPGA_Window.vi


BIN
Fpga/FPGA/伺服控制/Init.vi


BIN
Fpga/FPGA/伺服控制/RiseTable.vi


BIN
Fpga/FPGA/伺服控制/SignalGen.vi


BIN
Fpga/FPGA/伺服控制/WaitRiseTable.vi


BIN
Fpga/FPGA/伺服控制/WaitingSignalGen.vi


BIN
Fpga/FPGA/伺服控制/ZeroChange.vi


BIN
Fpga/FPGA/伺服控制/信号发生初始化.vi


BIN
Fpga/FPGA/伺服控制/信号发生数据初始化.vi


BIN
Fpga/FPGA/伺服控制/方波生成.vi


BIN
Fpga/FPGA/伺服控制/正弦发生.vi


BIN
Fpga/FPGA/伺服控制/相位更新.vi


BIN
Fpga/FPGA/通道定义/位移通道定义.vi


BIN
Fpga/FPGA/通道定义/加速度通道定义.vi


BIN
Fpga/FPGA/通道定义/压差通道定义.vi


BIN
Fpga/FPGA/通道定义/寄存器初始化.vi


BIN
Fpga/FPGA/通道定义/支撑压力通道定义.vi


+ 1 - 1
Fpga/fpga.aliases

@@ -2,4 +2,4 @@
 RT CompactRIO终端 = "0.0.0.0"
 
 [我的电脑]
-我的电脑 = "192.168.83.3"
+我的电脑 = "172.30.128.1"

+ 1 - 1
Fpga/fpga.lvlps

@@ -1,2 +1,2 @@
 [ÏîÄ¿´°¿ÚÊý¾Ý(_D)]
-ProjectExplorer.ClassicPosition[String] = "240,1187,1032,1666"
+ProjectExplorer.ClassicPosition[String] = "170,1497,961,1975"

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
Fpga/fpga.lvproj


+ 1 - 1
NIFPGA/FPGA.cs

@@ -153,7 +153,7 @@ namespace NIFPGA
             InitProperies(lv.VI.Registers);
             InitFifo(lv.Project.DMA);
             session.Open(bitfile, lv.SignatureRegister, resource, attribute);
-            var indicator = properties.Select(x => x.Indicator).ToArray();
+            var indicator = properties.Select(x => x.Register).ToArray();
         }
         private void InitProperies(List<lvbitx.Register> registers)
         {

+ 2 - 2
NIFPGA/FPGAArrayFXPReadProperty.cs

@@ -15,7 +15,7 @@ namespace NIFPGA
         private ulong[] tempbuffer = new ulong[0];
         private ulong[] tempvalue = new ulong[0];
         private double[] doubles = new double[0];
-        internal FPGAArrayFXPReadProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator, true)
+        internal FPGAArrayFXPReadProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator)
         {
             _Convert = convert;
             Count = indicator.Size;
@@ -31,7 +31,7 @@ namespace NIFPGA
         {
             lock (_Locker)
             {
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref Unsafe.As<ulong, byte>(ref tempbuffer[0]), bytescount));
+                _Session.CheckResult(Read(_Session.Session, Register, ref Unsafe.As<ulong, byte>(ref tempbuffer[0]), bytescount));
                 for (int i = 0; i < tempbuffer.Length; i++)
                 {
                     tempbuffer[i] = BinaryPrimitives.ReverseEndianness(tempbuffer[i]);

+ 4 - 4
NIFPGA/FPGAArrayFXPWriteProperty.cs

@@ -17,7 +17,7 @@ namespace NIFPGA
         private ulong[] tempbuffer = new ulong[0];
         private double[] doubles = new double[0];
         private ulong[] tempvalue = new ulong[0];
-        internal FPGAArrayFXPWriteProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator,false)
+        internal FPGAArrayFXPWriteProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator)
         {
             _Convert = convert;
             Count = indicator.Size;
@@ -33,7 +33,7 @@ namespace NIFPGA
         {
             lock (_Locker)
             {
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref Unsafe.As <ulong,byte>(ref tempbuffer[0]), bytescount));
+                _Session.CheckResult(Read(_Session.Session, Register, ref Unsafe.As <ulong,byte>(ref tempbuffer[0]), bytescount));
                 for(int i = 0; i < tempbuffer.Length;i++)
                 {
                     tempbuffer[i] = BinaryPrimitives.ReverseEndianness(tempbuffer[i]);
@@ -84,14 +84,14 @@ namespace NIFPGA
                     }
                 }
                 ulong[] oldvalues = new ulong[tempbuffer.Length];
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref Unsafe.As<ulong, byte>(ref oldvalues[0]), bytescount));
+                _Session.CheckResult(Read(_Session.Session, Register, ref Unsafe.As<ulong, byte>(ref oldvalues[0]), bytescount));
                 for (int i = 0; i < tempbuffer.Length; i++)
                 {
                     tempbuffer[i] = BinaryPrimitives.ReverseEndianness(tempbuffer[i]);
                 }
                 bool changed = Enumerable.Range(0, oldvalues.Length).Any(x => oldvalues[x] != tempbuffer[x]);
                 if (!changed) return;
-                _Session.CheckResult(Write(_Session.Session, Indicator, ref Unsafe.As<ulong, byte>(ref tempbuffer[0]), bytescount));
+                _Session.CheckResult(Write(_Session.Session, Register, ref Unsafe.As<ulong, byte>(ref tempbuffer[0]), bytescount));
             }
         }
         public uint Count { get; }

+ 12 - 12
NIFPGA/FPGAArrayReadProperty.cs

@@ -8,7 +8,7 @@ namespace NIFPGA
     {
         private T[] tempvalue = new T[0];
         private object lockObject = new object();
-        internal FPGAArrayReadProperty(FPGASession session, Register indicator) : base(session, indicator, true)
+        internal FPGAArrayReadProperty(FPGASession session, Register indicator) : base(session, indicator)
         {
             Count = indicator.Size;
             tempvalue = new T[Count];
@@ -21,37 +21,37 @@ namespace NIFPGA
                 switch (tempvalue[0])
                 {
                     case (bool):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayBool>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayBool>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
                         break;
                     case (byte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU8>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU8>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
                         break;
                     case (sbyte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI8>()(_Session.Session, Indicator, ref Unsafe.As<T, sbyte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI8>()(_Session.Session, Register, ref Unsafe.As<T, sbyte>(ref tempvalue[0]), Count));
                         break;
                     case short:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI16>()(_Session.Session, Indicator, ref Unsafe.As<T, short>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI16>()(_Session.Session, Register, ref Unsafe.As<T, short>(ref tempvalue[0]), Count));
                         break;
                     case (ushort):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU16>()(_Session.Session, Indicator, ref Unsafe.As<T, ushort>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU16>()(_Session.Session, Register, ref Unsafe.As<T, ushort>(ref tempvalue[0]), Count));
                         break;
                     case (int):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI32>()(_Session.Session, Indicator, ref Unsafe.As<T, int>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI32>()(_Session.Session, Register, ref Unsafe.As<T, int>(ref tempvalue[0]), Count));
                         break;
                     case (uint):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU32>()(_Session.Session, Indicator, ref Unsafe.As<T, uint>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU32>()(_Session.Session, Register, ref Unsafe.As<T, uint>(ref tempvalue[0]), Count));
                         break;
                     case (long):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI64>()(_Session.Session, Indicator, ref Unsafe.As<T, long>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI64>()(_Session.Session, Register, ref Unsafe.As<T, long>(ref tempvalue[0]), Count));
                         break;
                     case (ulong):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU64>()(_Session.Session, Indicator, ref Unsafe.As<T, ulong>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU64>()(_Session.Session, Register, ref Unsafe.As<T, ulong>(ref tempvalue[0]), Count));
                         break;
                     case (float):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArraySgl>()(_Session.Session, Indicator, ref Unsafe.As<T, float>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArraySgl>()(_Session.Session, Register, ref Unsafe.As<T, float>(ref tempvalue[0]), Count));
                         break;
                     case (double):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayDbl>()(_Session.Session, Indicator, ref Unsafe.As<T, double>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayDbl>()(_Session.Session, Register, ref Unsafe.As<T, double>(ref tempvalue[0]), Count));
                         break;
                 }
                 return tempvalue;

+ 23 - 23
NIFPGA/FPGAArrayWriteProperty.cs

@@ -8,7 +8,7 @@ namespace NIFPGA
     {
         private T[] tempvalue = new T[0];
         private object lockObject = new object();
-        internal FPGAArrayWriteProperty(FPGASession session, Register indicator) : base(session, indicator, false)
+        internal FPGAArrayWriteProperty(FPGASession session, Register indicator) : base(session, indicator)
         {
             Count = indicator.Size;
             tempvalue = new T[Count];
@@ -25,37 +25,37 @@ namespace NIFPGA
                 switch (values[0])
                 {
                     case (bool):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayBool>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayBool>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref values[0]), Count));
                         break;
                     case (byte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU8>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU8>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref values[0]), Count));
                         break;
                     case (sbyte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI8>()(_Session.Session, Indicator, ref Unsafe.As<T, sbyte>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI8>()(_Session.Session, Register, ref Unsafe.As<T, sbyte>(ref values[0]), Count));
                         break;
                     case (short):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI16>()(_Session.Session, Indicator, ref Unsafe.As<T, short>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI16>()(_Session.Session, Register, ref Unsafe.As<T, short>(ref values[0]), Count));
                         break;
                     case (ushort):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU16>()(_Session.Session, Indicator, ref Unsafe.As<T, ushort>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU16>()(_Session.Session, Register, ref Unsafe.As<T, ushort>(ref values[0]), Count));
                         break;
                     case (int):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI32>()(_Session.Session, Indicator, ref Unsafe.As<T, int>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI32>()(_Session.Session, Register, ref Unsafe.As<T, int>(ref values[0]), Count));
                         break;
                     case (uint):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU32>()(_Session.Session, Indicator, ref Unsafe.As<T, uint>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU32>()(_Session.Session, Register, ref Unsafe.As<T, uint>(ref values[0]), Count));
                         break;
                     case (long):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI64>()(_Session.Session, Indicator, ref Unsafe.As<T, long>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayI64>()(_Session.Session, Register, ref Unsafe.As<T, long>(ref values[0]), Count));
                         break;
                     case (ulong):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU64>()(_Session.Session, Indicator, ref Unsafe.As<T, ulong>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayU64>()(_Session.Session, Register, ref Unsafe.As<T, ulong>(ref values[0]), Count));
                         break;
                     case (float):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArraySgl>()(_Session.Session, Indicator, ref Unsafe.As<T, float>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArraySgl>()(_Session.Session, Register, ref Unsafe.As<T, float>(ref values[0]), Count));
                         break;
                     case (double):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayDbl>()(_Session.Session, Indicator, ref Unsafe.As<T, double>(ref values[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteArrayDbl>()(_Session.Session, Register, ref Unsafe.As<T, double>(ref values[0]), Count));
                         break;
                 }
             }
@@ -68,37 +68,37 @@ namespace NIFPGA
                 switch (tempvalue[0])
                 {
                     case (bool):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayBool>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayBool>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
                         break;
                     case (byte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU8>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU8>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref tempvalue[0]), Count));
                         break;
                     case (sbyte):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI8>()(_Session.Session, Indicator, ref Unsafe.As<T, sbyte>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI8>()(_Session.Session, Register, ref Unsafe.As<T, sbyte>(ref tempvalue[0]), Count));
                         break;
                     case short:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI16>()(_Session.Session, Indicator, ref Unsafe.As<T, short>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI16>()(_Session.Session, Register, ref Unsafe.As<T, short>(ref tempvalue[0]), Count));
                         break;
                     case (ushort):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU16>()(_Session.Session, Indicator, ref Unsafe.As<T, ushort>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU16>()(_Session.Session, Register, ref Unsafe.As<T, ushort>(ref tempvalue[0]), Count));
                         break;
                     case (int):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI32>()(_Session.Session, Indicator, ref Unsafe.As<T, int>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI32>()(_Session.Session, Register, ref Unsafe.As<T, int>(ref tempvalue[0]), Count));
                         break;
                     case (uint):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU32>()(_Session.Session, Indicator, ref Unsafe.As<T, uint>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU32>()(_Session.Session, Register, ref Unsafe.As<T, uint>(ref tempvalue[0]), Count));
                         break;
                     case (long):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI64>()(_Session.Session, Indicator, ref Unsafe.As<T, long>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayI64>()(_Session.Session, Register, ref Unsafe.As<T, long>(ref tempvalue[0]), Count));
                         break;
                     case (ulong):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU64>()(_Session.Session, Indicator, ref Unsafe.As<T, ulong>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayU64>()(_Session.Session, Register, ref Unsafe.As<T, ulong>(ref tempvalue[0]), Count));
                         break;
                     case (float):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArraySgl>()(_Session.Session, Indicator, ref Unsafe.As<T, float>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArraySgl>()(_Session.Session, Register, ref Unsafe.As<T, float>(ref tempvalue[0]), Count));
                         break;
                     case (double):
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayDbl>()(_Session.Session, Indicator, ref Unsafe.As<T, double>(ref tempvalue[0]), Count));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadArrayDbl>()(_Session.Session, Register, ref Unsafe.As<T, double>(ref tempvalue[0]), Count));
                         break;
                 }
                 return tempvalue;

+ 3 - 4
NIFPGA/FPGABaseProperty.cs

@@ -10,14 +10,13 @@ namespace NIFPGA
     public abstract class FPGABaseProperty : FPGABase
     {
         private protected Register register;
-        internal FPGABaseProperty(FPGASession session,Register register,bool isIndicator) : base(session)
+        internal FPGABaseProperty(FPGASession session,Register register) : base(session)
         {
             this.register = register;
-            IsIndicator= isIndicator;
         }
         public uint SizeInBits => register.SizeInBits;
-        public Boolean IsIndicator { get; }
-        public uint Indicator => register.Offset;
+        public Boolean IsIndicator => register.Indicator;
+        public uint Register => register.Offset;
         public string Name => register.Name;
         public override string ToString()
         {

+ 2 - 2
NIFPGA/FPGAFXPReadProperty.cs

@@ -9,7 +9,7 @@ namespace NIFPGA
         private NiFpga_FxpTypeInfo _TypeInfo;
         private object _Lock = new object();
         private IFxpConvert _Convert;
-        internal FPGAFXPReadProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator, true)
+        internal FPGAFXPReadProperty(FPGASession session, Register indicator, IFxpConvert convert) : base(session, indicator)
         {
             _TypeInfo = indicator.FxpTypeInfo;
             _Convert = convert;
@@ -21,7 +21,7 @@ namespace NIFPGA
             {
                 ulong value = 0;
                 double temp = 0;
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref value));
+                _Session.CheckResult(Read(_Session.Session, Register, ref value));
                 _Convert.FxpConvertToDouble(ref value, _TypeInfo, ref temp, 1);
                 return temp;
             }

+ 8 - 8
NIFPGA/FPGAFXPWriteProperty.cs

@@ -11,7 +11,7 @@ namespace NIFPGA
         private object _Lock = new object();
         private NiFpga_FxpTypeInfo _TypeInfo;
         private IFxpConvert _Convert;
-        internal FPGAFXPWriteProperty(FPGASession session, Register indicator,IFxpConvert convert) : base(session, indicator,false)
+        internal FPGAFXPWriteProperty(FPGASession session, Register indicator,IFxpConvert convert) : base(session, indicator)
         {
             _TypeInfo = indicator.FxpTypeInfo;
             _Convert = convert;
@@ -24,7 +24,7 @@ namespace NIFPGA
             {
                 ulong value = 0;
                 double temp = 0;
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref value));
+                _Session.CheckResult(Read(_Session.Session, Register, ref value));
                 _Convert.FxpConvertToDouble(ref value, _TypeInfo, ref temp, 1);
                 return temp;
             }
@@ -34,17 +34,17 @@ namespace NIFPGA
             lock (_Lock)
             {
                 ulong tempul = 0;
-                _Session.CheckResult(Read(_Session.Session, Indicator, ref tempul));
+                _Session.CheckResult(Read(_Session.Session, Register, ref tempul));
                 ulong temp = 0;
                 _Convert.DoubleConvertToDxp(ref value, _TypeInfo, ref temp, 1);
                 if (temp == tempul) return;
                 var _ = _TypeInfo.wordLength switch
                 {
-                    var x when x <= 8 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU8>()(_Session.Session, Indicator, Unsafe.As<ulong, byte>(ref temp))),
-                    var x when x > 8 && x <= 16 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU16>()(_Session.Session, Indicator, Unsafe.As<ulong, ushort>(ref temp))),
-                    var x when x > 16 && x <= 32 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU32>()(_Session.Session, Indicator, Unsafe.As<ulong, uint>(ref temp))),
-                    var x when x > 32 && x <= 64 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Indicator, temp)),
-                    _ => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Indicator, temp)),
+                    var x when x <= 8 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU8>()(_Session.Session, Register, Unsafe.As<ulong, byte>(ref temp))),
+                    var x when x > 8 && x <= 16 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU16>()(_Session.Session, Register, Unsafe.As<ulong, ushort>(ref temp))),
+                    var x when x > 16 && x <= 32 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU32>()(_Session.Session, Register, Unsafe.As<ulong, uint>(ref temp))),
+                    var x when x > 32 && x <= 64 => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Register, temp)),
+                    _ => _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Register, temp)),
                 };
                 //_Session.CheckResult(Write(_Session.Session, Indicator, temp));
             }

+ 12 - 12
NIFPGA/FPGAReadProperty.cs

@@ -7,7 +7,7 @@ namespace NIFPGA
         where T : unmanaged
     {
         private object lockObject = new object();
-        internal FPGAReadProperty(FPGASession session, Register indicator) : base(session, indicator, true)
+        internal FPGAReadProperty(FPGASession session, Register indicator) : base(session, indicator)
         {
         }
         private T GetValue()
@@ -18,37 +18,37 @@ namespace NIFPGA
                 switch (value)
                 {
                     case Boolean:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadBool>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadBool>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref value)));
                         break;
                     case Byte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU8>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU8>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref value)));
                         break;
                     case SByte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI8>()(_Session.Session, Indicator, ref Unsafe.As<T, sbyte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI8>()(_Session.Session, Register, ref Unsafe.As<T, sbyte>(ref value)));
                         break;
                     case Int16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI16>()(_Session.Session, Indicator, ref Unsafe.As<T, short>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI16>()(_Session.Session, Register, ref Unsafe.As<T, short>(ref value)));
                         break;
                     case UInt16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU16>()(_Session.Session, Indicator, ref Unsafe.As<T, ushort>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU16>()(_Session.Session, Register, ref Unsafe.As<T, ushort>(ref value)));
                         break;
                     case Int32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI32>()(_Session.Session, Indicator, ref Unsafe.As<T, int>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI32>()(_Session.Session, Register, ref Unsafe.As<T, int>(ref value)));
                         break;
                     case UInt32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU32>()(_Session.Session, Indicator, ref Unsafe.As<T, uint>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU32>()(_Session.Session, Register, ref Unsafe.As<T, uint>(ref value)));
                         break;
                     case Int64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI64>()(_Session.Session, Indicator, ref Unsafe.As<T, long>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI64>()(_Session.Session, Register, ref Unsafe.As<T, long>(ref value)));
                         break;
                     case UInt64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU64>()(_Session.Session, Indicator, ref Unsafe.As<T, ulong>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU64>()(_Session.Session, Register, ref Unsafe.As<T, ulong>(ref value)));
                         break;
                     case Single:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadSgl>()(_Session.Session, Indicator, ref Unsafe.As<T, float>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadSgl>()(_Session.Session, Register, ref Unsafe.As<T, float>(ref value)));
                         break;
                     case double:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadDbl>()(_Session.Session, Indicator, ref Unsafe.As<T, double>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadDbl>()(_Session.Session, Register, ref Unsafe.As<T, double>(ref value)));
                         break;
                 }
                 return value;

+ 23 - 23
NIFPGA/FPGAWriteProperty.cs

@@ -12,7 +12,7 @@ namespace NIFPGA
         where T : unmanaged
     {
         private object lockObject = new object();
-        internal FPGAWriteProperty(FPGASession session, Register indicator) : base(session, indicator, false)
+        internal FPGAWriteProperty(FPGASession session, Register indicator) : base(session, indicator)
         {
         }
         private void SetValue(T value)
@@ -24,37 +24,37 @@ namespace NIFPGA
                 switch (value)
                 {
                     case Boolean boolvalue:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteBool>()(_Session.Session, Indicator, Convert.ToByte(boolvalue)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteBool>()(_Session.Session, Register, Convert.ToByte(boolvalue)));
                         break;
                     case Byte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU8>()(_Session.Session, Indicator, Unsafe.As<T, byte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU8>()(_Session.Session, Register, Unsafe.As<T, byte>(ref value)));
                         break;
                     case SByte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI8>()(_Session.Session, Indicator, Unsafe.As<T, sbyte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI8>()(_Session.Session, Register, Unsafe.As<T, sbyte>(ref value)));
                         break;
                     case Int16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI16>()(_Session.Session, Indicator, Unsafe.As<T, short>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI16>()(_Session.Session, Register, Unsafe.As<T, short>(ref value)));
                         break;
                     case UInt16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU16>()(_Session.Session, Indicator, Unsafe.As<T, ushort>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU16>()(_Session.Session, Register, Unsafe.As<T, ushort>(ref value)));
                         break;
                     case Int32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI32>()(_Session.Session, Indicator, Unsafe.As<T, int>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI32>()(_Session.Session, Register, Unsafe.As<T, int>(ref value)));
                         break;
                     case UInt32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU32>()(_Session.Session, Indicator, Unsafe.As<T, uint>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU32>()(_Session.Session, Register, Unsafe.As<T, uint>(ref value)));
                         break;
                     case Int64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI64>()(_Session.Session, Indicator, Unsafe.As<T, long>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteI64>()(_Session.Session, Register, Unsafe.As<T, long>(ref value)));
                         break;
                     case UInt64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Indicator, Unsafe.As<T, ulong>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteU64>()(_Session.Session, Register, Unsafe.As<T, ulong>(ref value)));
                         break;
                     case Single:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteSgl>()(_Session.Session, Indicator, Unsafe.As<T, float>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteSgl>()(_Session.Session, Register, Unsafe.As<T, float>(ref value)));
                         break;
                     case double:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteDbl>()(_Session.Session, Indicator, Unsafe.As<T, double>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_WriteDbl>()(_Session.Session, Register, Unsafe.As<T, double>(ref value)));
                         break;
                 }
             }
@@ -67,37 +67,37 @@ namespace NIFPGA
                 switch (value)
                 {
                     case Boolean:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadBool>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadBool>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref value)));
                         break;
                     case Byte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU8>()(_Session.Session, Indicator, ref Unsafe.As<T, byte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU8>()(_Session.Session, Register, ref Unsafe.As<T, byte>(ref value)));
                         break;
                     case SByte:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI8>()(_Session.Session, Indicator, ref Unsafe.As<T, sbyte>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI8>()(_Session.Session, Register, ref Unsafe.As<T, sbyte>(ref value)));
                         break;
                     case Int16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI16>()(_Session.Session, Indicator, ref Unsafe.As<T, short>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI16>()(_Session.Session, Register, ref Unsafe.As<T, short>(ref value)));
                         break;
                     case UInt16:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU16>()(_Session.Session, Indicator, ref Unsafe.As<T, ushort>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU16>()(_Session.Session, Register, ref Unsafe.As<T, ushort>(ref value)));
                         break;
                     case Int32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI32>()(_Session.Session, Indicator, ref Unsafe.As<T, int>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI32>()(_Session.Session, Register, ref Unsafe.As<T, int>(ref value)));
                         break;
                     case UInt32:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU32>()(_Session.Session, Indicator, ref Unsafe.As<T, uint>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU32>()(_Session.Session, Register, ref Unsafe.As<T, uint>(ref value)));
                         break;
                     case Int64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI64>()(_Session.Session, Indicator, ref Unsafe.As<T, long>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadI64>()(_Session.Session, Register, ref Unsafe.As<T, long>(ref value)));
                         break;
                     case UInt64:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU64>()(_Session.Session, Indicator, ref Unsafe.As<T, ulong>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadU64>()(_Session.Session, Register, ref Unsafe.As<T, ulong>(ref value)));
                         break;
                     case Single:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadSgl>()(_Session.Session, Indicator, ref Unsafe.As<T, float>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadSgl>()(_Session.Session, Register, ref Unsafe.As<T, float>(ref value)));
                         break;
                     case double:
-                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadDbl>()(_Session.Session, Indicator, ref Unsafe.As<T, double>(ref value)));
+                        _Session.CheckResult(_Session.GetDelegate<Interop.NiFpgaDll_ReadDbl>()(_Session.Session, Register, ref Unsafe.As<T, double>(ref value)));
                         break;
                 }
                 return value;

+ 2 - 2
NIFPGA/lvbitx/Bitfile.cs

@@ -33,8 +33,8 @@ namespace NIFPGA.lvbitx
         public string Name { get; set; } = string.Empty;
         public Boolean Hidden { get; set; }
         /// <summary>
-        /// <see cref="true"/>为
-        /// <see cref="false"/>为
+        /// <see cref="true"/>为
+        /// <see cref="false"/>为
         /// </summary>
         public Boolean Indicator { get; set; }
         /// <summary>

+ 32 - 30
Service/ShakerFpga/ShakerFpgaSourceGenerator.cs

@@ -4,13 +4,13 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace ShakerFpga
 {
     [Generator(LanguageNames.CSharp)]
     internal class ShakerFpgaSourceGenerator : IIncrementalGenerator
     {
-
         public void Initialize(IncrementalGeneratorInitializationContext context)
         {
             context.RegisterPostInitializationOutput(c =>
@@ -84,8 +84,7 @@ namespace ShakerFpga
         {
             string protype = GetProType(register);
             string proname = $"{register.Name.Split('_')[0]}";
-            proname = proname.Replace("(", "_").Replace(")", "_").Trim('_');
-            proname = char.ToUpper(proname[0]) + proname.Substring(1);
+            proname = RemovePropertySpecialcharacters(proname);
             stringBuilder.AppendLine($"        private {protype} _{proname};");
             stringBuilder.AppendLine($"        /// <summary>");
             stringBuilder.AppendLine($"        /// {register.Name}");
@@ -106,8 +105,7 @@ namespace ShakerFpga
         {
             string protype = GetFifoType(dma);
             string proname = $"{dma.Name.Split('_')[0]}";
-            proname = proname.Replace("(", "_").Replace(")", "_").Trim('_');
-            proname = char.ToUpper(proname[0]) + proname.Substring(1);
+            proname = RemovePropertySpecialcharacters(proname);
             stringBuilder.AppendLine($"        private {protype} _{proname};");
             stringBuilder.AppendLine($"        /// <summary>");
             stringBuilder.AppendLine($"        /// {dma.Name}");
@@ -171,14 +169,18 @@ namespace ShakerFpga
             }
             return protype;
         }
+        private string RemovePropertySpecialcharacters(string s)
+        {
+            string proname = Regex.Replace(s,@"\((.+?)\)","", RegexOptions.IgnoreCase).Replace("(", "_").Replace(")", "_").Replace("/", "_").Replace("__", "_").Trim('_');
+            return char.ToUpper(proname[0]) + proname.Substring(1);
+        }
         private string GetProType(Register register)
         {
-
             string value = "";
             switch (register.Datatype)
             {
                 case NIFPGA.lvbitx.Datatype.Boolean:
-                    if(register.Indicator)
+                    if(!register.Indicator)
                     {
                         value = "FPGAWriteProperty<bool>";
                     }
@@ -188,7 +190,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Int8:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<sbyte>";
                     }
@@ -198,7 +200,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Uint8:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<byte>";
                     }
@@ -208,7 +210,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Int16:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<short>";
                     }
@@ -218,7 +220,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Uint16:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<ushort>";
                     }
@@ -228,7 +230,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Int32:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<int>";
                     }
@@ -238,7 +240,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Uint32:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<uint>";
                     }
@@ -248,7 +250,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Int64:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<long>";
                     }
@@ -258,7 +260,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Uint64:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<ulong>";
                     }
@@ -268,7 +270,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Float:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<float>";
                     }
@@ -278,7 +280,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.Double:
-                    if (register.Indicator)
+                    if (!register.Indicator)
                     {
                         value = "FPGAWriteProperty<double>";
                     }
@@ -288,7 +290,7 @@ namespace ShakerFpga
                     }
                     break;
                 case NIFPGA.lvbitx.Datatype.FXP:
-                    if(register.Indicator)
+                    if(!register.Indicator)
                     {
                         value = "FPGAFXPWriteProperty";
                     }
@@ -301,7 +303,7 @@ namespace ShakerFpga
                     switch (register.ArrayValueType)
                     {
                         case NIFPGA.lvbitx.Datatype.Boolean:
-                            if(register.Indicator)
+                            if(!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<bool>";
                             }
@@ -311,7 +313,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Int8:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<sbyte>";
                             }
@@ -321,7 +323,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Uint8:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<byte>";
                             }
@@ -331,7 +333,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Int16:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<short>";
                             }
@@ -341,7 +343,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Uint16:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<ushort>";
                             }
@@ -351,7 +353,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Int32:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<int>";
                             }
@@ -361,7 +363,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Uint32:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<uint>";
                             }
@@ -371,7 +373,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Int64:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<long>";
                             }
@@ -381,7 +383,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Uint64:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<ulong>";
                             }
@@ -391,7 +393,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Float:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<float>";
                             }
@@ -401,7 +403,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.Double:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayWriteProperty<double>";
                             }
@@ -411,7 +413,7 @@ namespace ShakerFpga
                             }
                             break;
                         case NIFPGA.lvbitx.Datatype.FXP:
-                            if (register.Indicator)
+                            if (!register.Indicator)
                             {
                                 value = "FPGAArrayFXPWriteProperty";
                             }

Diferenças do arquivo suprimidas por serem muito extensas
+ 881 - 120
Service/ShakerService/Shaker.lvbitx


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff