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

All Ticks as the right TickType

Browse Source 
Update usb-pd
This commit is contained in:
Ben V. Brown
2022-07-25 16:42:16 +10:00
parent 138e3260da
commit dd239375b1
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Core/Drivers/Buttons.cpp
View File

@@ -8,7 +8,7 @@
#include "settingsGUI.hpp"
#include "task.h"
#include <Buttons.hpp>
uint32_t lastButtonTime = 0;
TickType_t lastButtonTime = 0;
ButtonState getButtonState() {
/*
@@ -22,10 +22,10 @@ ButtonState getButtonState() {
* press (buttons still down), or if release we trigger press
* (downtime>filter)
*/
static uint8_t previousState = 0;
static uint32_t previousStateChange = 0;
const uint16_t timeout = TICKS_100MS * 4;
uint8_t currentState;
static uint8_t previousState = 0;
static TickType_t previousStateChange = 0;
const TickType_t timeout = TICKS_100MS * 4;
uint8_t currentState;
currentState = (getButtonA()) << 0;
currentState |= (getButtonB()) << 1;
@@ -95,7 +95,7 @@ void waitForButtonPress() {
}
}
void waitForButtonPressOrTimeout(uint32_t timeout) {
void waitForButtonPressOrTimeout(TickType_t timeout) {
timeout += xTaskGetTickCount();
// calculate the exit point