瀏覽代碼

Fix for motorXOn and motorYOn

Bartosz Jakubski 2 月之前
父節點
當前提交
dbab6a0091
共有 3 個文件被更改,包括 36823 次插入36820 次删除
  1. 1 1
      OZE_Sensor/Core/Src/position_task.c
  2. 35967 35964
      OZE_Sensor/Debug/OZE_Sensor.list
  3. 855 855
      OZE_Sensor/Debug/OZE_Sensor.map

+ 1 - 1
OZE_Sensor/Core/Src/position_task.c

@@ -107,7 +107,7 @@ void PositionControlTask (void* argument) {
             }
         } else if (queueSatus == osErrorTimeout) {
             if (osMutexAcquire (sensorsInfoMutex, osWaitForever) == osOK) {
-                if ((*posCtrlTaskArg->motorStatus != 0) || (movementPhase == startPhase)) {
+                if (((*posCtrlTaskArg->motorStatus != 0) && (movementPhase != idlePhase)) || (movementPhase == startPhase) ) {
                     if (((*posCtrlTaskArg->switchLimiterDownStat == 1) && (*posCtrlTaskArg->switchLimiterUpStat == 1)) ||
                     ((*posCtrlTaskArg->switchLimiterUpStat == 1) && (*posCtrlTaskArg->switchLimiterCenterStat == 1))) {
                         movementPhase = idlePhase;

File diff suppressed because it is too large
+ 35967 - 35964
OZE_Sensor/Debug/OZE_Sensor.list


File diff suppressed because it is too large
+ 855 - 855
OZE_Sensor/Debug/OZE_Sensor.map