Merge branch 'release/release-0.3'

dsmilab · Jun 5, 2017 · 99d5576 · 99d5576
2 parents f259e80 + 805eefd
commit 99d5576
Show file tree

Hide file tree

Showing 38 changed files with 5,964 additions and 15,055 deletions.
diff --git a/0403_1.png b/0403_1.png
diff --git a/0403_1_fan0.csv b/0403_1_fan0.csv
diff --git a/0403_1_fan1.csv b/0403_1_fan1.csv
diff --git a/0403_1_fan2.csv b/0403_1_fan2.csv
diff --git a/0403_1_fan3.csv b/0403_1_fan3.csv
diff --git a/0403_2.png b/0403_2.png
diff --git a/0403_2_fan0.csv b/0403_2_fan0.csv
diff --git a/0403_2_fan1.csv b/0403_2_fan1.csv
diff --git a/0403_2_fan2.csv b/0403_2_fan2.csv
diff --git a/0403_2_fan3.csv b/0403_2_fan3.csv
diff --git a/0403_3.png b/0403_3.png
diff --git a/0403_3_fan0.csv b/0403_3_fan0.csv
diff --git a/0403_3_fan1.csv b/0403_3_fan1.csv
diff --git a/0403_3_fan2.csv b/0403_3_fan2.csv
diff --git a/0403_3_fan3.csv b/0403_3_fan3.csv
diff --git a/WindowsFormUI.exe b/WindowsFormUI.exe
diff --git a/WindowsFormsApp1/.vs/WindowsFormsApp1/v15/.suo b/WindowsFormsApp1/.vs/WindowsFormsApp1/v15/.suo
diff --git a/WindowsFormsApp1/Form1.Designer.cs b/WindowsFormsApp1/Form1.Designer.cs
diff --git a/WindowsFormsApp1/Form1.cs b/WindowsFormsApp1/Form1.cs
@@ -61,7 +61,7 @@ private void ChangeLight(int status)
         }
         private void timer1_Tick(object sender, EventArgs e)
         {
-            int prediction = -1;
+            int prediction = prevMode;
             try
             {
                 StreamReader sr = new StreamReader(@"prediction.txt");
@@ -87,8 +87,8 @@ private void timer1_Tick(object sender, EventArgs e)
                 {
                     ChangeLight(1);
                 }
+                prevMode = prediction;
             }
-            prevMode = prediction;
             switch (prediction)
             {
                 case -1:

diff --git a/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe
diff --git a/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe.config b/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
diff --git a/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb b/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb
diff --git a/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.Cache b/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.Cache
diff --git a/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe b/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe
diff --git a/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb b/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb
diff --git a/WindowsFormsLocal.exe b/WindowsFormsLocal.exe
diff --git a/__pycache__/lib.cpython-36.pyc b/__pycache__/lib.cpython-36.pyc
diff --git a/__pycache__/parser0.cpython-36.pyc b/__pycache__/parser0.cpython-36.pyc