Revision 55:844ac0974740, committed 2019-11-18

Comitter:

yabahiro

Date:

Mon Nov 18 04:18:06 2019 +0000

Parent:

54:4167f10ecad0

Commit message:

aaa;

Changed in this revision

diff -r 4167f10ecad0 -r 844ac0974740 System/Process/Process.cpp
--- a/System/Process/Process.cpp	Sun Nov 17 13:02:26 2019 +0000
+++ b/System/Process/Process.cpp	Mon Nov 18 04:18:06 2019 +0000
@@ -89,6 +89,7 @@
 int cross=0;//十字数える用
 int cros=0;
 int countss=100000;//wait代替え
+int num=0;
 
 ///*********PWM調整用*********///
 
@@ -96,6 +97,14 @@
 int normal = 40;
 int slow = 25;
 
+/*
+void Count();
+Ticker bunzin;
+*/
+
+//Timer time;
+//int value;
+
 #pragma endregion USER-DEFINED_VARIABLES_AND_PROTOTYPE
 
 #ifdef USE_SUBPROCESS
@@ -135,6 +144,7 @@
 {
     #pragma region USER-DEFINED_VARIABLE_INIT
     /*Replace here with the initialization code of your variables.*/
+    //bunzin.attach(Count,0.001);
 
     #pragma endregion USER-DEFINED_VARIABLE_INIT
 
@@ -210,6 +220,7 @@
 int point1;
 void SystemProcess()
 {
+    
     SystemProcessInitialize();
 
     while(1) {
@@ -266,6 +277,7 @@
         if(StertSW && start_flag == true) {
             start_flag = false;
             lock = false;
+            //time.start();
             if(ZoneSW) {
                 countss=0;
                 mode=1;
@@ -502,9 +514,9 @@
             if(g[1]==0) {
                 mode=10;
                 countss=100000;
-                fast=60;
-                normal=40;
-                slow=30;
+                fast=80;
+                normal=60;
+                slow=40;
             }
             break;
         case 10:
@@ -1611,9 +1623,9 @@
                 cross=0;
                 countss=0;
                 mode=40;
-                fast=60;
-                normal=40;
-                slow=30;
+                fast=70;
+                normal=50;
+                slow=40;
             }
             break;
         case 40:
@@ -1778,9 +1790,9 @@
             if(g[1]==0) {
                 countss=0;
                 mode=70;
-                normal=60;
-                fast=70;
-                slow=40;
+                normal=120;
+                fast=140;
+                slow=100;
             }
             break;
         case 42:
@@ -4739,5 +4751,9 @@
     if (pwmVal == 0 || pwmVal >  255 || pwmVal < -255) return 255;
     else return abs(pwmVal);
 }
-
+/*
+void Count(){
+    num++;
+}
+*/
 #pragma endregion