[Simulator] Fix timing issues in all AVR simulators on Windows (MSVC) (#4709)
* [simpgmspace] Fix 2MHz and 16KHz timers on MSVC builds (fixes LCD/key/switch response delay on all AVR simulators); Introduce experimental use of Qt to simplify x-platform code (disabled by default). * Qt timer scaling fix.
This commit is contained in:
committed by
Bertrand Songis
parent
10c6c9a1ec
commit
6709c55fea
@@ -18,6 +18,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if defined(QT_CORE_LIB) && 0 // experimental
|
||||||
|
#define SIMPGMSPC_USE_QT 1
|
||||||
|
#include <QElapsedTimer>
|
||||||
|
#else
|
||||||
|
#define SIMPGMSPC_USE_QT 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
@@ -74,32 +81,17 @@ void toplcdOff()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t getTmr16KHz()
|
U64 microsTimer(void)
|
||||||
{
|
{
|
||||||
#if defined(_MSC_VER)
|
#if SIMPGMSPC_USE_QT
|
||||||
return get_tmr10ms() * 16;
|
|
||||||
#else
|
|
||||||
struct timeval tv;
|
|
||||||
gettimeofday(&tv, NULL);
|
|
||||||
return tv.tv_usec * 2 / 125;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t getTmr2MHz()
|
static QElapsedTimer ticker;
|
||||||
{
|
if (!ticker.isValid())
|
||||||
#if defined(_MSC_VER)
|
ticker.start();
|
||||||
return get_tmr10ms() * 125;
|
return ticker.nsecsElapsed() / 1000;
|
||||||
#else
|
|
||||||
struct timeval tv;
|
#elif defined(_MSC_VER)
|
||||||
gettimeofday(&tv, NULL);
|
|
||||||
return tv.tv_usec * 2;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// return 2ms resolution to match CoOS settings
|
|
||||||
U64 CoGetOSTime(void)
|
|
||||||
{
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
static double freqScale = 0.0;
|
static double freqScale = 0.0;
|
||||||
static LARGE_INTEGER firstTick;
|
static LARGE_INTEGER firstTick;
|
||||||
LARGE_INTEGER newTick;
|
LARGE_INTEGER newTick;
|
||||||
@@ -108,23 +100,41 @@ U64 CoGetOSTime(void)
|
|||||||
LARGE_INTEGER frequency;
|
LARGE_INTEGER frequency;
|
||||||
// get ticks per second
|
// get ticks per second
|
||||||
QueryPerformanceFrequency(&frequency);
|
QueryPerformanceFrequency(&frequency);
|
||||||
// 2ms resolution
|
// 1us resolution
|
||||||
freqScale = 500.0 / frequency.QuadPart;
|
freqScale = 1e6 / frequency.QuadPart;
|
||||||
// init timer
|
// init timer
|
||||||
QueryPerformanceCounter(&firstTick);
|
QueryPerformanceCounter(&firstTick);
|
||||||
TRACE_SIMPGMSPACE("CoGetOSTime() init: first tick = %llu @ %llu Hz", firstTick.QuadPart, frequency.QuadPart);
|
TRACE_SIMPGMSPACE("microsTimer() init: first tick = %llu @ %llu Hz: %g", firstTick.QuadPart, frequency.QuadPart);
|
||||||
}
|
}
|
||||||
// read the timer
|
// read the timer
|
||||||
QueryPerformanceCounter(&newTick);
|
QueryPerformanceCounter(&newTick);
|
||||||
// compute the elapsed time
|
// compute the elapsed time
|
||||||
return U64((newTick.QuadPart - firstTick.QuadPart) * freqScale);
|
return U64((newTick.QuadPart - firstTick.QuadPart) * freqScale);
|
||||||
//return GetTickCount64() / 2; // only 10-16ms typical resolution
|
|
||||||
#else
|
#else // GNUC
|
||||||
|
|
||||||
auto now = std::chrono::steady_clock::now();
|
auto now = std::chrono::steady_clock::now();
|
||||||
return (U64) std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count() / 2;
|
return (U64) std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint16_t getTmr16KHz()
|
||||||
|
{
|
||||||
|
return microsTimer() * 2 / 125;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t getTmr2MHz()
|
||||||
|
{
|
||||||
|
return microsTimer() * 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// return 2ms resolution to match CoOS settings
|
||||||
|
U64 CoGetOSTime(void)
|
||||||
|
{
|
||||||
|
return microsTimer() * 500;
|
||||||
|
}
|
||||||
|
|
||||||
void simuInit()
|
void simuInit()
|
||||||
{
|
{
|
||||||
#if defined(STM32)
|
#if defined(STM32)
|
||||||
@@ -135,11 +145,11 @@ void simuInit()
|
|||||||
simuSetSwitch(i, 0);
|
simuSetSwitch(i, 0);
|
||||||
simuSetKey(i, false); // a little dirty, but setting keys that don't exist is perfectly OK here
|
simuSetKey(i, false); // a little dirty, but setting keys that don't exist is perfectly OK here
|
||||||
}
|
}
|
||||||
for (int i=0; i<(NUM_STICKS+NUM_AUX_TRIMS)*2; i++)
|
for (int i=0; i < (NUM_STICKS+NUM_AUX_TRIMS)*2; i++)
|
||||||
simuSetTrim(i, false);
|
simuSetTrim(i, false);
|
||||||
|
|
||||||
#if defined(ROTARY_ENCODER_NAVIGATION)
|
#if defined(ROTARY_ENCODERS) || defined(ROTARY_ENCODER_NAVIGATION)
|
||||||
for (uint8_t i=0; i<DIM(rotencValue); i++)
|
for (uint8_t i=0; i < DIM(rotencValue); i++)
|
||||||
rotencValue[i] = 0;
|
rotencValue[i] = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -589,7 +599,7 @@ void lcdRefresh()
|
|||||||
TW8823_SendScreen();
|
TW8823_SendScreen();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((bool(isBacklightEnabled()) != lightEnabled) || memcmp(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE)) {
|
if (bool(isBacklightEnabled()) != lightEnabled || memcmp(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE)) {
|
||||||
memcpy(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE);
|
memcpy(simuLcdBuf, displayBuf, DISPLAY_BUFFER_SIZE);
|
||||||
lightEnabled = (bool)isBacklightEnabled();
|
lightEnabled = (bool)isBacklightEnabled();
|
||||||
simuLcdRefresh = true;
|
simuLcdRefresh = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user