mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-21 01:01:43 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -20,15 +20,15 @@ static std::atomic<uint64_t> programStartTime{0};
|
||||
static std::atomic<uint64_t> programPauseTime{0};
|
||||
static std::atomic<uint64_t> programStepTime{0};
|
||||
|
||||
namespace hal::init {
|
||||
namespace wpi::hal::init {
|
||||
void InitializeMockHooks() {
|
||||
wpi::SetNowImpl(GetFPGATime);
|
||||
wpi::util::SetNowImpl(GetFPGATime);
|
||||
}
|
||||
} // namespace hal::init
|
||||
} // namespace wpi::hal::init
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
void RestartTiming() {
|
||||
programStartTime = wpi::NowDefault();
|
||||
programStartTime = wpi::util::NowDefault();
|
||||
programStepTime = 0;
|
||||
if (programPauseTime != 0) {
|
||||
programPauseTime = programStartTime.load();
|
||||
@@ -37,13 +37,13 @@ void RestartTiming() {
|
||||
|
||||
void PauseTiming() {
|
||||
if (programPauseTime == 0) {
|
||||
programPauseTime = wpi::NowDefault();
|
||||
programPauseTime = wpi::util::NowDefault();
|
||||
}
|
||||
}
|
||||
|
||||
void ResumeTiming() {
|
||||
if (programPauseTime != 0) {
|
||||
programStartTime += wpi::NowDefault() - programPauseTime;
|
||||
programStartTime += wpi::util::NowDefault() - programPauseTime;
|
||||
programPauseTime = 0;
|
||||
}
|
||||
}
|
||||
@@ -59,7 +59,7 @@ void StepTiming(uint64_t delta) {
|
||||
uint64_t GetFPGATime() {
|
||||
uint64_t curTime = programPauseTime;
|
||||
if (curTime == 0) {
|
||||
curTime = wpi::NowDefault();
|
||||
curTime = wpi::util::NowDefault();
|
||||
}
|
||||
return curTime + programStepTime - programStartTime;
|
||||
}
|
||||
@@ -74,16 +74,16 @@ void SetProgramStarted() {
|
||||
bool GetProgramStarted() {
|
||||
return programStarted;
|
||||
}
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
using namespace hal;
|
||||
using namespace wpi::hal;
|
||||
|
||||
extern "C" {
|
||||
void HALSIM_WaitForProgramStart(void) {
|
||||
int count = 0;
|
||||
while (!programStarted) {
|
||||
count++;
|
||||
wpi::print("Waiting for program start signal: {}\n", count);
|
||||
wpi::util::print("Waiting for program start signal: {}\n", count);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user