Skip to content
Permalink
Browse files

03/09/19 changes

  • Loading branch information...
teodor-krastev committed Sep 3, 2019
1 parent f6d4141 commit c09d64343e16560d0910bd4acae5f65eb30a6b2e
Showing with 6,396 additions and 283 deletions.
  1. +1 −2 Axel-data/MainWindow.xaml.cs
  2. +2 −2 Axel-hub/Axel-hub/AssemblyInfo.cs
  3. +5 −1 Axel-hub/Axel-hub/Axel-hub.csproj
  4. +499 −0 Axel-hub/Axel-hub/AxelAxes.cs
  5. +308 −0 Axel-hub/Axel-hub/AxelAxisUC.xaml
  6. +1,000 −0 Axel-hub/Axel-hub/AxelAxisUC.xaml.cs
  7. +1 −1 Axel-hub/Axel-hub/AxelChartUC.xaml
  8. +805 −0 Axel-hub/Axel-hub/AxelChartUC.xaml.cs
  9. +53 −5 Axel-hub/Axel-hub/AxelHMems.cs
  10. +366 −0 Axel-hub/Axel-hub/DataPrimitives.cs
  11. +26 −2 Axel-hub/Axel-hub/DataStackLib.cs
  12. +10 −7 Axel-hub/Axel-hub/MainWindow.xaml
  13. +56 −144 Axel-hub/Axel-hub/MainWindow.xaml.cs
  14. +47 −24 Axel-hub/Axel-hub/Options/Options.xaml
  15. +21 −5 Axel-hub/Axel-hub/Options/Options.xaml.cs
  16. +17 −11 Axel-hub/Axel-hub/Options/OptionsType.cs
  17. BIN Axel-hub/Axel-hub/Properties/TripleBar.bmp
  18. BIN Axel-hub/Axel-hub/Properties/TripleBarGrey.bmp
  19. +10 −0 Axel-hub/Axel-hub/ToDoInMM2.txt
  20. +1 −1 Axel-hub/Axel-hub/scanUC.xaml
  21. +30 −9 Axel-hub/Axel-hub/scanUC.xaml.cs
  22. +120 −0 Axel-hub/Axel-hub/signalUC.xaml
  23. +398 −0 Axel-hub/Axel-hub/signalUC.xaml.cs
  24. +104 −0 Axel-hub/Axel-hub/strobeControl.cs
  25. +129 −0 Axel-hub/DATA/stages.ini
  26. +6 −0 Axel-hub/config/6001.hw
  27. +6 −0 Axel-hub/config/9251.hw
  28. +7 −0 Axel-hub/config/Command_Line.txt
  29. +6 −0 Axel-hub/config/NI-6216.hw
  30. +7 −0 Axel-hub/config/NI-9251.hw
  31. +1 −1 Axel-hub/config/genOptions.cfg
  32. +5 −0 Axel-hub/config/mems.X
  33. +5 −0 Axel-hub/config/mems.Y
  34. +18 −0 Axel-hub/error.txt
  35. +17 −0 Axel-probe/Axel-probe/Kalman.cs
  36. +9 −6 Axel-probe/Axel-probe/MainWindow.xaml
  37. +67 −41 Axel-probe/Axel-probe/MainWindow.xaml.cs
  38. +48 −18 Axel-probe/Axel-probe/ProbeEngine.cs
  39. +1 −0 Axel-probe/Axel-probe/config/axel-hub.bat
  40. +206 −0 Axel-probe/Axel-probe/data/inner scan1.txt
  41. BIN Axel-tilt/data/calibr1.xlsx
  42. +582 −0 Axel-tilt/data/mg2MEMS.html
  43. +21 −0 Axel-tilt/data/mg2MEMS2.dat
  44. +463 −0 Axel-tilt/data/mg2MEMS2.html
  45. +273 −0 Axel-tilt/data/mg2MEMS_B.html
  46. +21 −0 Axel-tilt/data/mg2mems.dat
  47. +21 −0 Axel-tilt/data/mg2memsB.dat
  48. +21 −0 Axel-tilt/data/mg2steps.dat
  49. +405 −0 Axel-tilt/data/mg2stepsTilt.html
  50. BIN Axel-tilt/tilt1.png
  51. BIN Axel-tilt/tilt2.ico
  52. BIN Axel-tilt/xi-win32/bindy.dll
  53. BIN Axel-tilt/xi-win32/keyfile.sqlite
  54. BIN Axel-tilt/xi-win32/libximc.dll
  55. BIN Axel-tilt/xi-win32/testcs.exe
  56. +3 −0 Axel-tilt/xi-win32/testcs.exe.config
  57. BIN Axel-tilt/xi-win32/testcs.vshost.exe
  58. +3 −0 Axel-tilt/xi-win32/testcs.vshost.exe.config
  59. +11 −0 Axel-tilt/xi-win32/testcs.vshost.exe.manifest
  60. BIN Axel-tilt/xi-win32/ximcnet.dll
  61. BIN Axel-tilt/xi-win32/xiwrapper.dll
  62. +1 −1 Utils/RemoteMessaging.cs
  63. +33 −2 Utils/UtilsLib.cs
  64. +1 −0 Utils/UtilsLib.csproj
  65. +18 −0 error.txt
  66. BIN images/Axel Suite.docx
  67. BIN images/AxelShow-1.jpg
  68. +101 −0 images/AxelSuite.md
  69. BIN images/AxelSuite.pdf
  70. BIN images/MotMaster2.jpg
  71. BIN images/TripleBar.bmp
  72. BIN images/dataProc.jpg
  73. BIN images/dataProc.png
  74. BIN images/dataProc1.png
  75. BIN images/dataProc2.ico
  76. BIN images/dataProc2.png
@@ -23,8 +23,7 @@ namespace Axel_data
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{

{
public MainWindow()
{
InitializeComponent();
@@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
@@ -28,7 +28,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>2.0.0.%2a</ApplicationVersion>
<ApplicationVersion>2.2.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
@@ -125,6 +125,7 @@
<Compile Include="signalUC.xaml.cs">
<DependentUpon>signalUC.xaml</DependentUpon>
</Compile>
<Compile Include="strobeControl.cs" />
<Page Include="AxelAxisUC.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -213,6 +214,9 @@
<ItemGroup>
<Resource Include="Properties\speed2.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="ToDoInMM2.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

0 comments on commit c09d643

Please sign in to comment.
You can’t perform that action at this time.