Diff: System/Process/Process.cpp

Revision:

34:2fce61e3ebc4

Parent:

33:dd598bb23ad1

Child:

35:33c6cdba5630

--- a/System/Process/Process.cpp	Mon Oct 28 21:11:17 2019 +0000
+++ b/System/Process/Process.cpp	Tue Oct 29 08:35:05 2019 +0000
@@ -58,7 +58,6 @@
 
 const int curve[15] = { -204, -150, -104, -66, -38, -17, -4, 0, 4, 17, 38, 66, 104, 150, 204 };
 
-
 uint8_t SetStatus(int);
 uint8_t SetPWM(int);
 
@@ -92,13 +91,12 @@
 
 void LedMode(int num)
 {   
-/* 
+    /* 
     POTENTIOMETER::dio[0]= selectnum[num][0];;
     POTENTIOMETER::dio[1]= selectnum[num][1];;
     POTENTIOMETER::dio[2]= selectnum[num][2];;
     POTENTIOMETER::dio[3]= selectnum[num][3];;
     */
-
 }
 
 bool start_flag = true;
@@ -135,8 +133,6 @@
 int normal = 40;
 int slow = 20;
 
-bool MU_flag = false;
-
 #pragma endregion USER-DEFINED_VARIABLES_AND_PROTOTYPE
 
 #ifdef USE_SUBPROCESS
@@ -254,12 +250,14 @@
     SystemProcessInitialize();
 
     while(1) {
-        //lock = false;
-        
-        for(int i = 0; i < 8; i++) {
-            g[i] = LineHub::GetPara(i);
+        /*
+        if(StertSW){
+            LED_DEBUG0=1;
         }
-        
+        else{
+            LED_DEBUG0=0;
+        }
+        */
         if(EMC==0) {
             fast=40;
             normal=30;
@@ -316,12 +314,12 @@
             if(ZoneSW) {
                 countss=0;
                 mode=1;
-                current = 6;
+                current = 3;
 
             } else {
-                countss=0;
+                countss = 0;
                 mode=1;
-                current = 4;
+                current = 2;
             }
         }
         if(DWSW||DOSW) {
@@ -390,7 +388,7 @@
 
 
 #ifdef USE_ERRORCHECK
-        if(SAFTY::ErrorCheck::Check() & SAFTY::Error::ControllerLost & start_flag) {
+        if(SAFTY::ErrorCheck::Check() & SAFTY::Error::ControllerLost & start_flag){
             CONTROLLER::Controller::DataReset();
             AllActuatorReset();
             lock = true;