2020 xii 24 merge fix (bigtreetech#1431)

besser · Dec 25, 2020 · 26fa4ca · 26fa4ca
1 parent 6d87753
commit 26fa4ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/TFT/src/User/API/SpeedControl.c b/TFT/src/User/API/SpeedControl.c
@@ -7,7 +7,6 @@ static uint16_t setPercent[SPEED_NUM]     = {100, 100};  //Speed  Flow
 static uint16_t lastSetPercent[SPEED_NUM] = {100, 100};  //Speed  Flow
 static uint16_t curPercent[SPEED_NUM]  = {100, 100};  //Speed  Flow
 
-static bool sendSpeed_waiting[SPEED_NUM];
 static bool speedQueryWait = false;
 
 static uint32_t nextSpeedTime = 0;
@@ -40,12 +39,8 @@ void loopSpeed(void)
   {
     if (lastSetPercent[i] != setPercent[i]  && (OS_GetTimeMs() > nextSpeedTime))
     {
-      if (sendSpeed_waiting[i] == false)
-      {
-        sendSpeed_waiting[i] = storeCmd("%s S%d D%d\n",speedCmd[i], setPercent[i], heatGetCurrentTool());
-      }
-      if (sendSpeed_waiting[i] == true)
-        curPercent[i] = setPercent[i];
+      if (storeCmd("%s S%d D%d\n",speedCmd[i], setPercent[i], heatGetCurrentTool()))
+        lastSetPercent[i] = setPercent[i];
       nextSpeedTime = OS_GetTimeMs() + NEXT_SPEED_WAIT; // avoid rapid fire, clogging the queue
     }
   }

diff --git a/TFT/src/User/Menu/Speed.c b/TFT/src/User/Menu/Speed.c
@@ -52,8 +52,7 @@ void menuSpeed(void)
 
   percentageItems.items[KEY_ICON_5] = itemPercent[percentSteps_index];
 
-  storeCmd("M220\n");
-  storeCmd("M221 D%d\n", heatGetCurrentTool());
+  storeCmd("M220\nM221 D%d\n", heatGetCurrentTool());
   KEY_VALUES key_num;
   LASTSPEED lastSpeed;
   speedSetPercent(item_index, speedGetCurPercent(item_index));