sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Correct a few missed time values from the tick rate change (#874)

Browse Source 
* Pass over all refs to xTaskGetTickCount()

* That wasn't a second 😓

* Update FreeRTOSConfig.h

* Fix warning in usb code; style; fix slow description
This commit is contained in:
Ben V. Brown
2021-03-15 21:01:09 +11:00
committed by GitHub
parent 2796f095af
commit 7fbfde7b33
12 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/Core/Threads/GUIThread.cpp
View File

@@ -256,7 +256,7 @@ static void gui_solderingTempAdjust() {
systemSettings.SolderingTemp = 10;
}
if (xTaskGetTickCount() - lastChange > 2000)
if (xTaskGetTickCount() - lastChange > (TICKS_SECOND * 2))
return; // exit if user just doesn't press anything for a bit
#ifdef OLED_FLIP
@@ -645,11 +645,11 @@ void showDebugMenu(void) {
break;
case 4:
// system up time stamp
OLED::printNumber(xTaskGetTickCount() / 100, 5);
OLED::printNumber(xTaskGetTickCount() / TICKS_100MS, 5);
break;
case 5:
// Movement time stamp
OLED::printNumber(lastMovementTime / 100, 5);
OLED::printNumber(lastMovementTime / TICKS_100MS, 5);
break;
case 6:
// Raw Tip
@@ -774,7 +774,7 @@ void startGUITask(void const *argument __unused) {
getTipRawTemp(1); // reset filter
OLED::setRotation(systemSettings.OrientationMode & 1);
uint32_t ticks = xTaskGetTickCount();
ticks += 4000; // 4 seconds from now
ticks += (TICKS_SECOND * 4); // 4 seconds from now
while (xTaskGetTickCount() < ticks) {
if (showBootLogoIfavailable() == false)
ticks = xTaskGetTickCount();
@@ -912,7 +912,7 @@ void startGUITask(void const *argument __unused) {
// If we have a tip connected draw the temp, if not we leave it blank
if (!tipDisconnectedDisplay) {
// draw in the temp
if (!(systemSettings.coolingTempBlink && (xTaskGetTickCount() % 26 < 16)))
if (!(systemSettings.coolingTempBlink && (xTaskGetTickCount() % 260 < 160)))
gui_drawTipTemp(false); // draw in the temp
} else {
// Draw in missing tip symbol

2
source/Core/Threads/MOVThread.cpp
View File

@@ -170,6 +170,6 @@ void startMOVTask(void const *argument __unused) {
lastMovementTime = xTaskGetTickCount();
}
osDelay(TICKS_100MS); // Slow down update rate
vTaskDelay(TICKS_100MS); // Slow down update rate
}
}

4
source/Core/Threads/PIDThread.cpp
View File

@@ -14,8 +14,8 @@
#include "main.hpp"
#include "power.hpp"
#include "task.h"
static TickType_t powerPulseRate = 10000;
static TickType_t powerPulseDuration = 250;
static TickType_t powerPulseRate = 10 * TICKS_SECOND;
static TickType_t powerPulseDuration = 3 * TICKS_100MS;
TaskHandle_t pidTaskNotification = NULL;
uint32_t currentTempTargetDegC = 0; // Current temperature target in C