Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thrusterStateEffector nameOfKappaState bug #405

Merged
merged 3 commits into from
Aug 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/source/Support/bskKnownIssues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ Basilisk Known Issues

Version |release|
-----------------
- text here
- There was an issue with :ref:`thrusterStateEffector` where if there are multiple instances of the
thruster state effector then the last effector will over-write all the state of the earlier thrusters.
This is corrected in the current release.

Version 2.2.0
-------------
Expand Down
2 changes: 2 additions & 0 deletions docs/source/Support/bskReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Version |release|
- A new integrated example script :ref:`scenarioSmallBodyLandmarks` demonstrates the use of the pinhole camera module
- Created a new example scenario :ref:`scenarioSpinningBodiesTwoDOF` that showcases the different capabilities of the
:ref:`spinningBodyTwoDOFStateEffector` module.
- Corrected an error with :ref:`thrusterStateEffector` where if there are multiple instances of the
thruster state effector then the last effector will over-write all the state of the earlier thrusters.


Version 2.2.0 (June 28, 2023)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ThrusterStateEffector::ThrusterStateEffector()
CallCounts = 0;
this->prevCommandTime = -1.0; // initialize to a negative number to allow an onTime command at t=0
this->mDotTotal = 0.0;
this->nameOfKappaState = "kappaState" + std::to_string(this->effectorID);
this->effectorID++;

// clear all vectors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ DynParamManager::~DynParamManager()
StateData* DynParamManager::registerState(uint32_t nRow, uint32_t nCol,
std::string stateName)
{
if (stateName == "") {
bskLogger.bskLog(BSK_ERROR, "Your state name can't be an empty string. Come on. You get null.");
return nullptr;
}

std::map<std::string, StateData>::iterator it;
it = stateContainer.stateMap.find(stateName);
if(it != stateContainer.stateMap.end())
Expand Down
Loading