diff --git a/.gitignore b/.gitignore
index 20665f6..5e32cf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-Logs/*.log
+*.log
+*.sqlite
+*.sqlite-shm
+*.sqlite-wal
+Cache/*
diff --git a/Al6061T6.WorkpieceMaterial b/Al6061T6.WorkpieceMaterial
new file mode 100644
index 0000000..ccbbe2e
--- /dev/null
+++ b/Al6061T6.WorkpieceMaterial
@@ -0,0 +1,13 @@
+
+
+ Al6061T6
+ 68.9
+ 386
+ 276
+ 0.14
+ 0.896
+ 167
+ 2.7
+ 399.903059643855
+ 620
+
\ No newline at end of file
diff --git a/Al6061T6.mp b/Al6061T6.mp
new file mode 100644
index 0000000..68f8751
--- /dev/null
+++ b/Al6061T6.mp
@@ -0,0 +1,10 @@
+
+
+
+ 141.27
+ 241.1
+ -455.54
+ -1.96
+ 5.54
+ -21.51
+
\ No newline at end of file
diff --git a/EmptyMachine/EmptyMachine.mt b/EmptyMachine/EmptyMachine.mt
deleted file mode 100644
index 63fe7d4..0000000
--- a/EmptyMachine/EmptyMachine.mt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
- [O][Y][X][C][w];[O][Z][B][S][t]
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/HiNC.20210604.exe b/HiNC.20210604.exe
deleted file mode 100644
index ba670a0..0000000
Binary files a/HiNC.20210604.exe and /dev/null differ
diff --git a/HiNC_temp.db b/HiNC_temp.db
deleted file mode 100644
index b20c6ff..0000000
Binary files a/HiNC_temp.db and /dev/null differ
diff --git a/Main.hincproj b/Main.hincproj
new file mode 100644
index 0000000..c931a09
--- /dev/null
+++ b/Main.hincproj
@@ -0,0 +1,365 @@
+
+
+
+
+
+ PmcB1s/PMC_B1.mt
+
+
+
+
+ 0
+ 5.5
+ 5.5
+ 3
+
+
+ 50
+ 50
+ 30
+ 20
+ 15
+ 8
+ 5
+
+
+
+
+
+
+
+ (-40, -40, 0)
+ (40, 40, 10)
+
+
+
+
+
+
+
+
+
+ 0.5
+
+
+ (2, 0, -50)
+ (72, 50, 0)
+
+
+
+
+
+
+
+
+
+
+
+ Design\standard_force_4exp_201902_design.stl
+
+
+
+ 1
+ false
+
+ Al6061T6.mp
+
+
+ Al6061T6.WorkpieceMaterial
+
+
+
+
+
+
+
+ 25
+ 1000
+
+
+
+
+
+
+
+ T1
+
+
+
+ (0,10)
+ (50,10)
+
+
+
+
+
+
+
+
+
+
+ 12
+ 0.5
+ 40
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (40,6)
+ (80,6)
+
+
+
+
+ 0.1
+ 5
+
+
+ 3
+
+
+ 0
+
+
+ 50
+ 15
+ 5
+
+
+
+
+ 50
+ 1.5
+ 15
+ 5
+ 5.5
+
+
+
+
+
+
+
+ WC-Co6-800nm.CutterMaterial
+
+
+ 20
+
+
+ true
+ 3
+ true
+ 0
+ 999
+
+
+
+
+ 8
+ HolderAnc
+ 0
+ 0
+
+
+
+
+
+
+ Fanuc
+ (0, 0, 0)
+ true
+
+
+
+ 6
+ 0
+ 98
+ 0
+
+
+
+ false
+ true
+ false
+
+
+ (INF, INF, INF)
+ (-INF, -INF, -INF)
+
+
+
+
+ (INF, INF, INF)
+ (-INF, -INF, -INF)
+
+
+ (60, 60, 60)
+ 60000
+ 20000
+ PT0S
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+
+
+ true
+ true
+ true
+ false
+
+
+
+
+
+ Feedrate_mmdmin
+
+
+
+
+ Feedrate_mmdmin
+
+
+
+
+
+ Linear
+ 0
+ 1
+
+
+
+
+
+
+
+
+ Fit
+
+ -400
+ 400
+
+ ForceToWorkpieceOnWorkpieceCoordinate
+
+
+
+
+
+ Fit
+
+ -10
+ 10
+
+
+
+
+
+
+
+ Fit
+
+ -10
+ 10
+
+
+
+
+
+
+
+
+
+
+ Fit
+
+ 0
+ 1
+
+
+
+
+
+
+
+
+ true
+ true
+ true
+ 0
+ 0
+ true
+ 1
+ 20000
+ 20000
+ 10
+ 800
+ 1.5
+ 1.5
+ 0
+
+
+
+
+ 260
+
+ true
+ true
+ true
+ false
+ false
+ false
+ 2
+
+
+
+
+
+
+
+ IEnumerable<Action> Run(){
+ foreach(var action in RunNcFile("NC/circle.ptp")) yield return action;
+ foreach(var action in RunNcFile("NC/drill_slot.ptp")) yield return action;
+ foreach(var action in RunNcFile("NC/side.ptp")) yield return action;
+ foreach(var action in RunNcFile("NC/slide.ptp")) yield return action;
+ yield return null;
+}
+return Run();
+
\ No newline at end of file
diff --git a/MillingParaGrids/Al6061T6_201902.mp.xml b/MillingParaGrids/Al6061T6_201902.mp.xml
deleted file mode 100644
index 95d93ce..0000000
--- a/MillingParaGrids/Al6061T6_201902.mp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- 1
- 1
- 1
- true
-
-
-
-
-
-
-
-
- 556.24,1400.07,358.56
-
-
-
-
-
- 556.24,1400.07,358.56
-
- 7.66,7.41,1.28
-
\ No newline at end of file
diff --git a/PmcB1s/PMC_B1.mt b/PmcB1s/PMC_B1.mt
index 42f2800..bb4d363 100644
--- a/PmcB1s/PMC_B1.mt
+++ b/PmcB1s/PMC_B1.mt
@@ -1,5 +1,5 @@
-
+
[O][Y][X][C][w];[O][Z][B][S][t]
@@ -31,299 +31,299 @@
- PmcB1s/base.stl
+ base.stl
- PmcB1s/Y.stl
+ Y.stl
- PmcB1s/X.stl
+ X.stl
- PmcB1s/C.stl
+ C.stl
- PmcB1s/Z.stl
+ Z.stl
- PmcB1s/B.stl
+ B.stl
- PmcB1s/S.stl
+ S.stl
- Y
+ Y
- Z
+ Z
0
- Y
+ Y
- B
+ B
0
- Y
+ Y
- S
+ S
0
- Y
+ Y
- ToolHolder
+ ToolHolder
0
- Y
+ Y
- CutterShank
+ CutterShank
0
- Y
+ Y
- CutterFlute
+ CutterFlute
0
- X
+ X
- Z
+ Z
0
- X
+ X
- B
+ B
0
- X
+ X
- S
+ S
0
- X
+ X
- ToolHolder
+ ToolHolder
0
- X
+ X
- CutterShank
+ CutterShank
0
- X
+ X
- CutterFlute
+ CutterFlute
0
- C
+ C
- Z
+ Z
0
- C
+ C
- B
+ B
0
- C
+ C
- S
+ S
0
- C
+ C
- ToolHolder
+ ToolHolder
0
- C
+ C
- CutterShank
+ CutterShank
0
- C
+ C
- CutterFlute
+ CutterFlute
0
- Fixture
+ Fixture
- Z
+ Z
0
- Fixture
+ Fixture
- B
+ B
0
- Fixture
+ Fixture
- S
+ S
0
- Fixture
+ Fixture
- ToolHolder
+ ToolHolder
0
- Fixture
+ Fixture
- CutterShank
+ CutterShank
0
- Fixture
+ Fixture
- CutterFlute
+ CutterFlute
0
- Workpiece
+ Workpiece
- Z
+ Z
0
- Workpiece
+ Workpiece
- B
+ B
0
- Workpiece
+ Workpiece
- S
+ S
0
- Workpiece
+ Workpiece
- ToolHolder
+ ToolHolder
0
- Workpiece
+ Workpiece
- CutterShank
+ CutterShank
0
diff --git a/Script/Run.cs b/Script/Run.cs
new file mode 100644
index 0000000..0572e0e
--- /dev/null
+++ b/Script/Run.cs
@@ -0,0 +1,8 @@
+IEnumerable Run(){
+ // foreach(var action in RunNcFile("NC/circle.ptp")) yield return action;
+ // foreach(var action in RunNcFile("NC/drill_slot.ptp")) yield return action;
+ foreach(var action in RunNcFile("NC/side.ptp")) yield return action;
+ // foreach(var action in RunNcFile("NC/slide.ptp")) yield return action;
+ yield return null;
+}
+return Run();
\ No newline at end of file
diff --git a/WC-Co6-800nm.CutterMaterial b/WC-Co6-800nm.CutterMaterial
new file mode 100644
index 0000000..b5f6f69
--- /dev/null
+++ b/WC-Co6-800nm.CutterMaterial
@@ -0,0 +1,27 @@
+
+
+
+ 600
+ 1440
+ 6.7
+ 70
+ 0.34
+ 14.95
+ 7
+ 0.01
+ 3143.16
+ 400
+ 0.44
+
+ 17500
+ 14800
+ 12500
+ 10000
+
+
+ 1.19
+ 1.86
+ 7.1
+ 25.7
+
+
\ No newline at end of file
diff --git a/demo.hincproj_gui b/demo.hincproj_gui
deleted file mode 100644
index b510100..0000000
--- a/demo.hincproj_gui
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- false
- -100
- 100
-
-
-
-
-
-
-
- -1000
- 1000
-
-
\ No newline at end of file
diff --git a/demo2.hincproj_gui b/demo2.hincproj_gui
deleted file mode 100644
index c5031a9..0000000
--- a/demo2.hincproj_gui
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- true
- -1000
- 1000
-
-
-
-
-
-
-
- -1000
- 1000
-
-
\ No newline at end of file
diff --git a/D10H10.holder b/deprecated-D10H10.holder
similarity index 100%
rename from D10H10.holder
rename to deprecated-D10H10.holder
diff --git a/MachiningColor.ColorGuide b/deprecated-MachiningColor.ColorGuide
similarity index 100%
rename from MachiningColor.ColorGuide
rename to deprecated-MachiningColor.ColorGuide
diff --git a/csv.player b/deprecated-csv.player
similarity index 100%
rename from csv.player
rename to deprecated-csv.player
diff --git a/demo.hincproj b/deprecated-demo.hincproj
similarity index 100%
rename from demo.hincproj
rename to deprecated-demo.hincproj
diff --git a/demo2.hincproj b/deprecated-demo2.hincproj
similarity index 100%
rename from demo2.hincproj
rename to deprecated-demo2.hincproj
diff --git a/fanuc.player b/deprecated-fanuc.player
similarity index 100%
rename from fanuc.player
rename to deprecated-fanuc.player
diff --git a/monitor.Player b/deprecated-monitor.Player
similarity index 100%
rename from monitor.Player
rename to deprecated-monitor.Player