ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-24 07:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include freeze time tics in calculation for websocket data intervals (#1296)

Browse Source
This commit is contained in:
Scott Fennell 2022-06-28 17:20:50 -05:00 committed by GitHub
parent ade5932e87
commit 866c21d5a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trick_sims/Cannon/SIM_cannon_numeric/S_define
View File

@ -16,7 +16,6 @@ class CannonSimObject : public Trick::SimObject {
public: public:
CANNON cannon ; CANNON cannon ;
int foo;
CannonSimObject() { CannonSimObject() {
("default_data") cannon_default_data( &cannon ) ; ("default_data") cannon_default_data( &cannon ) ;
("initialization") cannon_init( &cannon ) ; ("initialization") cannon_init( &cannon ) ;

4
trick_source/web/CivetServer/src/VariableServerSession.cpp
View File

@ -41,7 +41,7 @@ VariableServerSession::~VariableServerSession() {
(The specified period between messages). (The specified period between messages).
*/ */
void VariableServerSession::marshallData() { void VariableServerSession::marshallData() {
long long simulation_time_tics = exec_get_time_tics(); long long simulation_time_tics = exec_get_time_tics() + exec_get_freeze_time_tics();
if ( cyclicSendEnabled && ( simulation_time_tics >= nextTime )) { if ( cyclicSendEnabled && ( simulation_time_tics >= nextTime )) {
stageValues(); stageValues();
nextTime = (simulation_time_tics - (simulation_time_tics % intervalTimeTics) + intervalTimeTics); nextTime = (simulation_time_tics - (simulation_time_tics % intervalTimeTics) + intervalTimeTics);
@ -170,7 +170,7 @@ void VariableServerSession::addVariable(char* vname){
} }
void VariableServerSession::stageValues() { void VariableServerSession::stageValues() {
stageTime = (double)exec_get_time_tics() / exec_get_time_tic_value(); stageTime = (double)(exec_get_time_tics() + exec_get_freeze_time_tics()) / exec_get_time_tic_value();
std::vector<VariableServerVariable*>::iterator it; std::vector<VariableServerVariable*>::iterator it;
for (it = sessionVariables.begin(); it != sessionVariables.end(); it++ ) { for (it = sessionVariables.begin(); it != sessionVariables.end(); it++ ) {
(*it)->stageValue(); (*it)->stageValue();