bump to v24.0.0.1

shinolab · May 20, 2024 · 92e7749 · 92e7749
1 parent f3056f0
commit 92e7749
Show file tree

Hide file tree

Showing 30 changed files with 74 additions and 67 deletions.
diff --git a/derive/AUTD3Sharp.Derive.csproj b/derive/AUTD3Sharp.Derive.csproj
@@ -12,7 +12,7 @@
 
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>24.0.0</Version>
+    <Version>24.0.0.1</Version>
     <Authors>Shun Suzuki</Authors>
     <Company>Shinolab</Company>
     <Description>AUTD3 derive helper for AUTD3Sharp</Description>

diff --git a/derive/GainDerive.cs b/derive/GainDerive.cs
@@ -45,9 +45,9 @@ private GainPtr GainPtr(Geometry geometry)
             });
         }
         
-        [ExcludeFromCodeCoverage] private static Dictionary<int, AUTD3Sharp.Drive[]> Transform(Geometry geometry, Func<Device, Transducer, AUTD3Sharp.Drive> f)
+        [ExcludeFromCodeCoverage] private static Dictionary<int, AUTD3Sharp.Drive[]> Transform(Geometry geometry, Func<Device, Func<Transducer, AUTD3Sharp.Drive>> f)
         {
-            return geometry.Devices().Select(dev => (dev.Idx, dev.Select(tr => f(dev, tr)).ToArray())).ToDictionary(x => x.Idx, x => x.Item2);
+            return geometry.Devices().Select(dev => (dev.Idx, dev.Select(tr => f(dev)(tr)).ToArray())).ToDictionary(x => x.Idx, x => x.Item2);
         }
 
 """ : "";
@@ -75,6 +75,8 @@ private GainPtr GainPtr(Geometry geometry)
             .Replace("global::", "")
             .Replace("<", "_")
             .Replace(">", "_");
+        var nsBegin = ns == "" ? "" : $"{ns} {{";
+        var nsEnd = ns == "" ? "" : "}";
         var code = $$"""
 // <auto-generated/>
 
@@ -88,7 +90,7 @@ private GainPtr GainPtr(Geometry geometry)
 using AUTD3Sharp.Driver.Datagram;
 using AUTD3Sharp.NativeMethods;
 
-{{ns}} {
+{{nsBegin}}
     public partial class {{typeName}} : AUTD3Sharp.Driver.Datagram.Gain.IGain, IDatagramS<GainPtr>, IDatagram
     {
         DatagramPtr IDatagram.Ptr(Geometry geometry) => NativeMethodsBase.AUTDGainIntoDatagram(((AUTD3Sharp.Driver.Datagram.Gain.IGain)this).GainPtr(geometry));
@@ -103,7 +105,7 @@ public partial class {{typeName}} : AUTD3Sharp.Driver.Datagram.Gain.IGain, IData
 {{cacheCode}}
 {{transformCode}}
     }
-}
+{{nsEnd}}
 """;
         context.AddSource($"{fullType}.GainDerive.g.cs", code);
     }

diff --git a/derive/ModulationDerive.cs b/derive/ModulationDerive.cs
@@ -69,6 +69,8 @@ private ModulationPtr ModulationPtr(Geometry geometry)
             .Replace("global::", "")
             .Replace("<", "_")
             .Replace(">", "_");
+        var nsBegin = ns == "" ? "" : $"{ns} {{";
+        var nsEnd = ns == "" ? "" : "}";
         var code = $$"""
 // <auto-generated/>
 
@@ -78,11 +80,12 @@ private ModulationPtr ModulationPtr(Geometry geometry)
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using AUTD3Sharp;
 using AUTD3Sharp.Driver.Datagram;
 using AUTD3Sharp.Driver.Datagram.Modulation;
 using AUTD3Sharp.NativeMethods;
 
-{{ns}} {
+{{nsBegin}}
     partial class {{typeName}} : AUTD3Sharp.Driver.Datagram.Modulation.IModulation, IDatagramST<ModulationPtr>, IDatagram
     {
         DatagramPtr IDatagram.Ptr(Geometry geometry) => NativeMethodsBase.AUTDModulationIntoDatagram(ModulationPtr(geometry));
@@ -111,7 +114,7 @@ [ExcludeFromCodeCoverage] DatagramPtr IDatagramST<ModulationPtr>.IntoSegmentTran
 {{radiationPressureCode}}
 {{transformCode}}
     }
-}
+{{nsEnd}}
 """;
         context.AddSource($"{fullType}.ModulationDerive.g.cs", code);
     }

diff --git a/example/cs/RemoteSOEM/RemoteSOEM.csproj b/example/cs/RemoteSOEM/RemoteSOEM.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/cs/RemoveTwinCAT/RemoveTwinCAT.csproj b/example/cs/RemoveTwinCAT/RemoveTwinCAT.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/cs/SOEM/SOEM.csproj b/example/cs/SOEM/SOEM.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/cs/Samples/Custom.cs b/example/cs/Samples/Custom.cs
@@ -14,7 +14,7 @@ public static void Test<T>(Controller<T> autd)
 
         var m = new Sine(150 * Hz);
         var g = new Custom(
-            (dev, tr) => (dev.Idx, tr.Idx) switch
+            (dev) => (tr) => (dev.Idx, tr.Idx) switch
             {
                 (0, 0) => new Drive(new Phase(0), EmitIntensity.Max),
                 (0, 248) => new Drive(new Phase(0), EmitIntensity.Max),

diff --git a/example/cs/Samples/SampleRunner.cs b/example/cs/Samples/SampleRunner.cs
@@ -25,7 +25,7 @@ public static void Run<T>(Controller<T> autd)
         if (autd.Geometry.NumDevices >= 2) examples.Add((GroupByDeviceTest.Test, "Group (by Device) test"));
 
         Console.WriteLine("======== AUTD3 firmware information ========");
-        Console.WriteLine(string.Join("\n", autd.FirmwareVersionList()));
+        Console.WriteLine(string.Join("\n", autd.FirmwareVersion()));
         Console.WriteLine("============================================");
 
         while (true)

diff --git a/example/cs/Samples/Samples.csproj b/example/cs/Samples/Samples.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/example/cs/Samples/UserDefined.cs b/example/cs/Samples/UserDefined.cs
@@ -11,11 +11,11 @@ partial class MyFocus(Vector3d point)
 {
     private Dictionary<int, Drive[]> Calc(Geometry geometry)
     {
-        return Transform(geometry, (dev, tr) =>
+        return Transform(geometry, dev => tr =>
         {
             var tp = tr.Position;
             var dist = (tp - point).L2Norm;
-            var phase = Phase.FromRad(dist * dev.Wavenumber);
+            var phase = new Phase(dist * dev.Wavenumber * rad);
             return new Drive { Phase = phase, Intensity = EmitIntensity.Max };
         });
     }

diff --git a/example/cs/Simulator/Simulator.csproj b/example/cs/Simulator/Simulator.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/cs/TwinCAT/TwinCAT.csproj b/example/cs/TwinCAT/TwinCAT.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/fs/RemoteSOEM/RemoteSOEM.fsproj b/example/fs/RemoteSOEM/RemoteSOEM.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/fs/RemoveTwinCAT/RemoveTwinCAT.fsproj b/example/fs/RemoveTwinCAT/RemoveTwinCAT.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/fs/SOEM/SOEM.fsproj b/example/fs/SOEM/SOEM.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/fs/Samples/Custom.fs b/example/fs/Samples/Custom.fs
@@ -0,0 +1,17 @@
+namespace Samples
+
+open AUTD3Sharp
+open AUTD3Sharp.Gain
+open AUTD3Sharp.Modulation
+open type AUTD3Sharp.Units
+
+module CustomTest =
+    let Test<'T> (autd : Controller<'T>) = 
+        (Silencer.Default()) |> autd.Send;
+
+        let m = new Sine(150u * Hz);
+        let g = new Custom(fun dev -> new System.Func<Transducer, Drive>(fun tr -> match (dev.Idx, tr.Idx) with
+                                                                                    | (0, 0) -> new Drive(new Phase(byte(0)), EmitIntensity.Max)
+                                                                                    | (0, 248) -> new Drive(new Phase(byte(0)), EmitIntensity.Max)
+                                                                                    | _ ->  Drive.Null));
+        (m, g) |> autd.Send;
diff --git a/example/fs/Samples/SampleRunner.fs b/example/fs/Samples/SampleRunner.fs
@@ -14,15 +14,15 @@ module SampleRunner =
                 (STMTest.GainSTMTest, "GainSTM test");
                 (GainHoloTest.Test, "Multiple foci test");
                 (FlagTest.Test, "Flag test");
-                (TransTest.Test, "TransducerTest test");
+                (CustomTest.Test, "Custom gain test");
                 (GroupByTransducerTest.Test, "Group (by Transducer) test")];
 
         let examples = 
             if autd.Geometry.NumDevices >= 2 then examples @ [(GroupByDeviceTest.Test, "Group (by Device) test")] else examples;
 
 
         printfn "======== AUTD3 firmware information ========"
-        autd.FirmwareVersionList() |> Seq.iter (fun firm -> printfn $"{firm}")
+        autd.FirmwareVersion() |> Seq.iter (fun firm -> printfn $"{firm}")
         printfn "============================================"
 
         let rec run_example () =

diff --git a/example/fs/Samples/Samples.fsproj b/example/fs/Samples/Samples.fsproj
@@ -10,7 +10,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Compile Include="Wav.fs" />
-    <Compile Include="Transtest.fs" />
+    <Compile Include="Custom.fs" />
     <Compile Include="Plane.fs" />
     <Compile Include="Flag.fs" />
     <Compile Include="STMTest.fs" />
@@ -24,7 +24,7 @@
   <ItemGroup />
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/example/fs/Samples/Transtest.fs b/example/fs/Samples/Transtest.fs
diff --git a/example/fs/Simulator/Simulator.fsproj b/example/fs/Simulator/Simulator.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/fs/TwinCAT/TwinCAT.fsproj b/example/fs/TwinCAT/TwinCAT.fsproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AUTD3Sharp" Version="24.0.0" />
+    <PackageReference Include="AUTD3Sharp" Version="24.0.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AUTD3Sharp.csproj b/src/AUTD3Sharp.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>24.0.0</Version>
+    <Version>24.0.0.1</Version>
     <Authors>Shun Suzuki</Authors>
     <Company>Shinolab</Company>
     <Description>AUTD3 library wrapper for .Net</Description>

diff --git a/src/AUTD3Sharp.nuspec b/src/AUTD3Sharp.nuspec
@@ -11,7 +11,7 @@
     <dependencies>
       <group targetFramework=".NETStandard2.1">
         <dependency id="NETStandard.Library" version="2.0.3" exclude="Build,Analyzers" />
-        <dependency id="AUTD3Sharp.Derive" version="24.0.0" >
+        <dependency id="AUTD3Sharp.Derive" version="24.0.0.1" >
         	<OutputItemType>Analyzer</OutputItemType>
 			    <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
         </dependency>

diff --git a/src/Controller/Controller.cs b/src/Controller/Controller.cs
@@ -44,15 +44,15 @@ private static FirmwareVersion GetFirmwareVersion(FirmwareVersionListPtr handle,
             }
         }
 
-        public async Task<FirmwareVersion[]> FirmwareVersionListAsync()
+        public async Task<FirmwareVersion[]> FirmwareVersionAsync()
         {
             var handle = await Task.Run(() => NativeMethodsBase.AUTDControllerFirmwareVersionListPointer(Ptr).Validate());
             var result = Enumerable.Range(0, Geometry.NumDevices).Select(i => GetFirmwareVersion(handle, (uint)i)).ToArray();
             NativeMethodsBase.AUTDControllerFirmwareVersionListPointerDelete(handle);
             return result;
         }
 
-        public FirmwareVersion[] FirmwareVersionList()
+        public FirmwareVersion[] FirmwareVersion()
         {
             var handle = NativeMethodsBase.AUTDControllerFirmwareVersionListPointer(Ptr).Validate();
             var result = Enumerable.Range(0, Geometry.NumDevices).Select(i => GetFirmwareVersion(handle, (uint)i)).ToArray();

diff --git a/src/Driver/Datagram/PhaseFilter.cs b/src/Driver/Datagram/PhaseFilter.cs
@@ -12,16 +12,16 @@ public sealed class PhaseFilter : IDatagram
 
         private readonly PhaseFilterDelegate _f;
 
-        private PhaseFilter(Func<Device, Transducer, Phase> f)
+        private PhaseFilter(Func<Device, Func<Transducer, Phase>> f)
         {
             _f = (context, geometryPtr, devIdx, trIdx) =>
             {
                 var devPtr = NativeMethodsBase.AUTDDevice(geometryPtr, devIdx);
-                return f(new Device((int)devIdx, devPtr), new Transducer(trIdx, devPtr)).Value;
+                return f(new Device((int)devIdx, devPtr))(new Transducer(trIdx, devPtr)).Value;
             };
         }
 
-        public static PhaseFilter Additive(Func<Device, Transducer, Phase> f) => new PhaseFilter(f);
+        public static PhaseFilter Additive(Func<Device, Func<Transducer, Phase>> f) => new PhaseFilter(f);
 
         DatagramPtr IDatagram.Ptr(Geometry geometry) => NativeMethodsBase.AUTDDatagramPhaseFilterAdditive(Marshal.GetFunctionPointerForDelegate(_f), IntPtr.Zero, geometry.Ptr);
     }

diff --git a/src/Driver/Firmware/FPGA/Phase.cs b/src/Driver/Firmware/FPGA/Phase.cs
@@ -13,8 +13,10 @@ public Phase(byte value)
             Value = value;
         }
 
-        public double Radian => NativeMethodsBase.AUTDPhaseToRad(Value);
+        public Phase(Angle value) : this(NativeMethodsBase.AUTDPhaseFromRad(value.Radian))
+        {
+        }
 
-        public static Phase FromRad(double value) => new Phase(NativeMethodsBase.AUTDPhaseFromRad(value));
+        public double Radian => NativeMethodsBase.AUTDPhaseToRad(Value);
     }
 }
diff --git a/src/Gain/TransTest.cs b/src/Gain/TransTest.cs
@@ -12,15 +12,15 @@ public sealed partial class Custom
 
         private readonly TransducerTestDelegate _f;
 
-        public Custom(Func<Device, Transducer, Drive> f)
+        public Custom(Func<Device, Func<Transducer, Drive>> f)
         {
             unsafe
             {
                 _f = (context, geometryPtr, devIdx, trIdx, raw) =>
                 {
                     var dev = new Device((int)devIdx, NativeMethodsBase.AUTDDevice(geometryPtr, devIdx));
                     var tr = new Transducer(trIdx, dev.Ptr);
-                    var d = f(dev, tr);
+                    var d = f(dev)(tr);
                     raw->phase = d.Phase.Value;
                     raw->intensity = d.Intensity.Value;
                 };