Minor misc. fixes (#4729)
* [Simulator] Remove extraneous format value in microsTimer; Better way to delete SimulatorStartupDialog (in case no event loop starts).
* [Simulator] No helpers dependency for SimulatorStartupDialog.
* [simpgmspace] Rename micros timer function and make externally available.
* [Companion] Fix possible uninitialized value in TreeModel (compiler warning).
* [multi_arm] Fix minor compiler warning (MSVC: "unsafe mix of type 'uint8_t' and type 'bool' in operation").
* [lua] Fix compiler warning ("'data' may be used uninitialized in this function").
* [OpenTxSimulator] Fix analogs array range.
* [Simulator] Auto-start simulator when SimulatorMainWindow is first shown (vs. before it was shown).
* [Simulator] DebugOutput: prevent possible mutex deadlock on buffer overflow (force queued connection for Qt < 5.3).
* [Companion] Display calibration data for Horus joysticks (MOUSE1/MOUSE2)
This commit is contained in:
committed by
Bertrand Songis
parent
9c7c8244f4
commit
5dabe53af4
@@ -81,7 +81,7 @@ void toplcdOff()
|
||||
{
|
||||
}
|
||||
|
||||
U64 microsTimer(void)
|
||||
uint64_t simuTimerMicros(void)
|
||||
{
|
||||
#if SIMPGMSPC_USE_QT
|
||||
|
||||
@@ -104,7 +104,7 @@ U64 microsTimer(void)
|
||||
freqScale = 1e6 / frequency.QuadPart;
|
||||
// init timer
|
||||
QueryPerformanceCounter(&firstTick);
|
||||
TRACE_SIMPGMSPACE("microsTimer() init: first tick = %llu @ %llu Hz: %g", firstTick.QuadPart, frequency.QuadPart);
|
||||
TRACE_SIMPGMSPACE("microsTimer() init: first tick = %llu @ %llu Hz", firstTick.QuadPart, frequency.QuadPart);
|
||||
}
|
||||
// read the timer
|
||||
QueryPerformanceCounter(&newTick);
|
||||
@@ -121,18 +121,18 @@ U64 microsTimer(void)
|
||||
|
||||
uint16_t getTmr16KHz()
|
||||
{
|
||||
return microsTimer() * 2 / 125;
|
||||
return simuTimerMicros() * 2 / 125;
|
||||
}
|
||||
|
||||
uint16_t getTmr2MHz()
|
||||
{
|
||||
return microsTimer() * 2;
|
||||
return simuTimerMicros() * 2;
|
||||
}
|
||||
|
||||
// return 2ms resolution to match CoOS settings
|
||||
U64 CoGetOSTime(void)
|
||||
{
|
||||
return microsTimer() / 2000;
|
||||
return simuTimerMicros() / 2000;
|
||||
}
|
||||
|
||||
void simuInit()
|
||||
|
||||
Reference in New Issue
Block a user